diff options
author | Albert Astals Cid <aacid@kde.org> | 2014-11-24 23:57:48 +0100 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2015-03-06 18:53:33 +0000 |
commit | ccbae6677e52f2b02cbd43608777f93c2b663a80 (patch) | |
tree | 11d8c1e4edb683f09b783a6f480844855279e240 /tests/auto/linguist/lupdate/testdata | |
parent | 568140bbe19f0a95620bf7c294087ee88b07f8e6 (diff) |
Fix warning in correct uses of QCoreApplication::translate
It was emitting the warning for "Unsupported Latin1" in the case it was
a valid plural form too
Change-Id: I22c9c15d50488810e3ff5d7b132aebd994b08ebf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tests/auto/linguist/lupdate/testdata')
3 files changed, 14 insertions, 1 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/parsecpp/expectedoutput.txt new file mode 100644 index 000000000..c35c086c8 --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/expectedoutput.txt @@ -0,0 +1,5 @@ +.*/lupdate/testdata/good/parsecpp/finddialog.cpp:77: Qualifying with unknown namespace/class ::FindDialog +.*/lupdate/testdata/good/parsecpp/finddialog.cpp:127: Qualifying with unknown namespace/class ::FindDialog +.*/lupdate/testdata/good/parsecpp/finddialog.cpp:167: Qualifying with unknown namespace/class ::FindDialog +.*/lupdate/testdata/good/parsecpp/finddialog.cpp:173: Unsupported encoding Latin1 +lupdate warning: Message with id 'yet_another_id' has no source. diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp index 3b1556a29..3833fac3b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp @@ -170,7 +170,7 @@ void FindDialog::reset() QString s = QApplication::translate("QCoreApplication", "encoding, using QApplication", 0, QApplication::UnicodeUTF8); QString s = QApplication::translate("Kåntekst", "encoding, using QApplication", 0, QApplication::UnicodeUTF8); - + QString s = QApplication::translate("QTranslator", "Key", "disambiguation", QCoreApplication::Latin1); } diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result index 8bb7fadd8..c0a4a83b2 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result @@ -259,6 +259,14 @@ backslashed \ stuff.</source> </context> <context> <name>QTranslator</name> + <message numerus="yes"> + <location filename="finddialog.cpp" line="173"/> + <source>Key</source> + <comment>disambiguation</comment> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> <message> <location filename="main.cpp" line="85"/> <location filename="main.cpp" line="86"/> |