diff options
Diffstat (limited to 'tests/auto/linguist/lupdate')
62 files changed, 512 insertions, 56 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result index d3a5fdf9e..08a240684 100644 --- a/tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/ts/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/cmdline_deeppath/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/cmdline_deeppath/project.ts.result index 5c3c21c34..cb3714eae 100644 --- a/tests/auto/linguist/lupdate/testdata/good/cmdline_deeppath/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/cmdline_deeppath/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FindDialog</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/cmdline_order/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/cmdline_order/project.ts.result index 6028cbbe0..f52b771fe 100644 --- a/tests/auto/linguist/lupdate/testdata/good/cmdline_order/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/cmdline_order/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>aaa</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/cmdline_recurse/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/cmdline_recurse/project.ts.result index 95a34fa80..7a64ac17a 100644 --- a/tests/auto/linguist/lupdate/testdata/good/cmdline_recurse/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/cmdline_recurse/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FindDialog</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result index b1a40ade8..4741f5843 100644 --- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QObject</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/from_subdir/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/from_subdir/project.ts.result index 7167cf33c..16d91d722 100644 --- a/tests/auto/linguist/lupdate/testdata/good/from_subdir/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/from_subdir/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp b/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp index d3d693668..7d508faff 100644 --- a/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/from_subdir/src/main.cpp @@ -44,7 +44,7 @@ #include "main.h" -int main(char **argv, int argc) +int main(int argc, char **argv) { return QApplication::tr("string in main.cpp"); } diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.result index 402ad9a9b..08d237371 100644 --- a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>A</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.ts.result index bc876cdb1..002c58541 100644 --- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>B</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result index 5104860c3..c47a9a489 100644 --- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>Foo</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result index f9d26df2a..51a15683d 100644 --- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FindDialog</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.result index 776238db8..2ed439289 100644 --- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QObject</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before index 6adc539dd..591c95508 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before @@ -39,12 +39,12 @@ <message> <location filename="finddialog.cpp" line="58"/> <source>Search reached start of the document</source> - <translation type="unfinished"></translation> + <translation type="obsolete"></translation> </message> <message> <location filename="finddialog.cpp" line="59"/> <source>Text not found</source> - <translation type="unfinished"></translation> + <translation type="vanished">text not found (in chinese)</translation> </message> <message numerus="yes"> <location filename="finddialog.cpp" line="64"/> diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result index aa25d42b0..b1000d0aa 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="zh_CN"> +<TS version="2.1" language="zh_CN"> <context> <name></name> <message id="xx_hello"> @@ -48,7 +48,7 @@ <message> <location filename="finddialog.cpp" line="59"/> <source>Text not found</source> - <translation type="unfinished"></translation> + <translation>text not found (in chinese)</translation> </message> <message numerus="yes"> <location filename="finddialog.cpp" line="64"/> diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result index ee3d0f69b..e40b35f20 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name></name> <message id="keep_id"> diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.before b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.before index 2bc60491c..2af303be4 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.before +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.before @@ -18,7 +18,7 @@ <message> <location filename="finddialog.cpp" line="85"/> <source>Enter the text you are looking for.</source> - <translation type="unfinished">Skriv inn teksten du soker etter</translation> + <translation>Skriv inn teksten du soker etter</translation> </message> <message> <location filename="finddialog.cpp" line="135"/> diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result index f442cbcc9..cd1f2fa18 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name></name> <message id="keep_id"> @@ -17,7 +17,7 @@ <name>FindDialog</name> <message> <source>Enter the text you are looking for.</source> - <translation type="obsolete">Skriv inn teksten du soker etter</translation> + <translation type="vanished">Skriv inn teksten du soker etter</translation> </message> <message> <location filename="finddialog.cpp" line="88"/> diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result index 1a2244b1f..3c4e28014 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FindDialog</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.result index 6bc565c1e..2636ae075 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FindDialog</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result index b3dde9607..4554fc9c2 100644 --- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name></name> <message id="lollipop"> diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result index 94df9d3f8..01f732529 100644 --- a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>A1::B::Test</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.ts.result index 0394bea0e..24c3eeb6c 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>Dialog2</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.ts.result index 53d7a2581..98e6e16b0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>A1::AB</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/excluded.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/excluded.cpp index 8056a6f3c..2d1b1443b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/excluded.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/excluded.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -int main(char **argv, int argc) +int main(int argc, char **argv) { QString fake = QApplication::tr("fake", "This message will not be collected"); } diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp index b09a47f6e..62ececc58 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp @@ -41,7 +41,7 @@ // IMPORTANT!!!! If you want to add testdata to this file, // always add it to the end in order to not change the linenumbers of translations!!! -int main(char **argv, int argc) +int main(int argc, char **argv) { Size size = QSize(1,1); } 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 db908d987..9c7d9df6b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name></name> <message id="this_a_id"> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt index d4ebe4992..dfbd4b759 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt @@ -5,3 +5,4 @@ .*/lupdate/testdata/good/parsecpp2/main.cpp:120: //% cannot be used with tr\(\) / QT_TR_NOOP\(\)\. Ignoring .*/lupdate/testdata/good/parsecpp2/main.cpp:123: //% cannot be used with translate\(\) / QT_TRANSLATE_NOOP\(\)\. Ignoring .*/lupdate/testdata/good/parsecpp2/main.cpp:126: Discarding unconsumed meta data +lupdate warning: Message with id 'no_source' has no source\. diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp index 99fe293dd..fecfa9a3c 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/main.cpp @@ -125,3 +125,8 @@ QApplication::translate("QObject", "Hello World"); //% "Baz" clear = me; QObject::tr("Hello World"); + + + +// QTBUG-11843: complain about missing source in id-based messages +qtTrId("no_source"); diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.ts.result index 806f56f99..f001d036d 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.ts.result @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> +<context> + <name></name> + <message id="no_source"> + <location filename="main.cpp" line="132"/> + <source></source> + <translation type="unfinished"></translation> + </message> +</context> <context> <name>NameSpace::ToBeUsed</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.ts.result index 0ce600c1b..3de2fbfa4 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>Plurals, QCoreApplication</name> <message numerus="yes"> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.ts.result index 5dcc30c38..8df655fec 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejs/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name></name> <message id="qtn_foo_bar"> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.ts.result index bfa1b3d61..f7aa9a732 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FooContext</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.ts.result index ac36dbfad..7c28edfb8 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name></name> <message id="qtn_foo_bar"> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.ts.result index 83c6d3f12..c0546571c 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FooContext</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.ts.result index 18407b2f8..e36dbe4fa 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name></name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result index 475305d68..ce57bd44d 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name></name> <message id="qtn_foo_bar"> diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.ts.result index fa4f41824..0ab9081b6 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FooContext</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result index d53c6d8e4..38f47356c 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FindDialog</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result index e3569218e..d1f96b2ab 100644 --- a/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/prefix/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>Foo</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.ts.result index 4d695e84c..1bba59b45 100644 --- a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/main.qml b/tests/auto/linguist/lupdate/testdata/good/proparsing/main.qml new file mode 100644 index 000000000..36cc5f0fc --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/main.qml @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +QtObject { + function translate() { + qsTr("From QML file in root"); + } +} diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro index a63c4e311..7c6ad99dd 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro @@ -28,4 +28,7 @@ if (exists($$member($$(PATH), 0))) { SOURCES += main_dependpath.cpp } +inst.files = qml *.qml +INSTALLS += inst + TRANSLATIONS = project.ts diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result index 9b48d7841..391f2f919 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> @@ -61,4 +61,20 @@ <translation type="unfinished"></translation> </message> </context> +<context> + <name>main</name> + <message> + <location filename="main.qml" line="46"/> + <source>From QML file in root</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>notmain</name> + <message> + <location filename="qml/notmain.qml" line="46"/> + <source>From QML file in qml</source> + <translation type="unfinished"></translation> + </message> +</context> </TS> diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/qml/excluded.cpp b/tests/auto/linguist/lupdate/testdata/good/proparsing/qml/excluded.cpp new file mode 100644 index 000000000..2d1b1443b --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/qml/excluded.cpp @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +int main(int argc, char **argv) +{ + QString fake = QApplication::tr("fake", "This message will not be collected"); +} diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/qml/notmain.qml b/tests/auto/linguist/lupdate/testdata/good/proparsing/qml/notmain.qml new file mode 100644 index 000000000..1a402212c --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/qml/notmain.qml @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +QtObject { + function translate() { + qsTr("From QML file in qml"); + } +} diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.ts.result index 3714d9bd8..0a845e76e 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QLineEdit</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.ts.result index edc2fcb81..564660182 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.ts.result index e01c53310..202fd08e2 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.ts.result index a6972bd03..3940866f2 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.ts.result index 6621de99c..fd30574d0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/recurse_full/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/recurse_full/project.ts.result index 7d9a6f484..4ffa96f1d 100644 --- a/tests/auto/linguist/lupdate/testdata/good/recurse_full/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/recurse_full/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>subdir1</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/recurse_full/project_sub.ts.result b/tests/auto/linguist/lupdate/testdata/good/recurse_full/project_sub.ts.result index ca9504eb5..df878e473 100644 --- a/tests/auto/linguist/lupdate/testdata/good/recurse_full/project_sub.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/recurse_full/project_sub.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>subsub2</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/recurse_full_ts/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/recurse_full_ts/project.ts.result index 7d9a6f484..4ffa96f1d 100644 --- a/tests/auto/linguist/lupdate/testdata/good/recurse_full_ts/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/recurse_full_ts/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>subdir1</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/recurse_full_ts_join/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/recurse_full_ts_join/project.ts.result index 7d9a6f484..4ffa96f1d 100644 --- a/tests/auto/linguist/lupdate/testdata/good/recurse_full_ts_join/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/recurse_full_ts_join/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>subdir1</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/recurse_part/project_sub.ts.result b/tests/auto/linguist/lupdate/testdata/good/recurse_part/project_sub.ts.result index ca9504eb5..df878e473 100644 --- a/tests/auto/linguist/lupdate/testdata/good/recurse_part/project_sub.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/recurse_part/project_sub.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>subsub2</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/recurse_part_ts/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/recurse_part_ts/project.ts.result index 7d9a6f484..4ffa96f1d 100644 --- a/tests/auto/linguist/lupdate/testdata/good/recurse_part_ts/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/recurse_part_ts/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>subdir1</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/reloutput/translations/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/reloutput/translations/project.ts.result index e398701c9..91abc3e40 100644 --- a/tests/auto/linguist/lupdate/testdata/good/reloutput/translations/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/translations/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>QApplication</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/respfile/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/respfile/project.ts.result index 3a864a214..53432772c 100644 --- a/tests/auto/linguist/lupdate/testdata/good/respfile/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/respfile/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>Dialog2</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.ts.result index 6bc565c1e..2636ae075 100644 --- a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.ts.result @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0"> +<TS version="2.1"> <context> <name>FindDialog</name> <message> diff --git a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/lupdatecmd b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/lupdatecmd new file mode 100644 index 000000000..7996a444a --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/lupdatecmd @@ -0,0 +1 @@ +lupdate main.cpp -tr-function-alias QT_TRANSLATE_NOOP+=QT_TRANSLATE_NOOP_ALIAS,QT_TRANSLATE_NOOP_UTF8+=QT_TRANSLATE_NOOP_UTF8_ALIAS,QT_TRANSLATE_NOOP3+=QT_TRANSLATE_NOOP3_ALIAS,QT_TRANSLATE_NOOP3_UTF8+=QT_TRANSLATE_NOOP3_UTF8_ALIAS,QT_TRID_NOOP+=QT_TRID_NOOP_ALIAS,Q_DECLARE_TR_FUNCTIONS+=Q_DECLARE_TR_FUNCTIONS_ALIAS,qtTrId+=qtTrId_alias,QT_TR_NOOP+=QT_TR_NOOP_ALIAS,QT_TR_NOOP_UTF8+=QT_TR_NOOP_UTF8_ALIAS,tr+=tr_alias,trUtf8+=trUtf8_alias,translate+=translate_alias -ts project.ts diff --git a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.cpp b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.cpp new file mode 100644 index 000000000..8d7d53ab5 --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.cpp @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com> +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MYOBJECT_H +#define MYOBJECT_H + +#include <QtCore/QObject> + +QT_TRANSLATE_NOOP("scope", "string") +QT_TRANSLATE_NOOP_ALIAS("scope", "string_alias") +QT_TRANSLATE_NOOP_UTF8("scope", "utf8_string") +QT_TRANSLATE_NOOP_UTF8_ALIAS("scope", "utf8_string_alias") +QT_TRANSLATE_NOOP3("scope", "string_with_comment", "comment") +QT_TRANSLATE_NOOP3_ALIAS("scope", "string_with_comment_alias", "comment") +QT_TRANSLATE_NOOP3_UTF8("scope", "utf8_string_with_comment", "comment") +QT_TRANSLATE_NOOP3_UTF8_ALIAS("scope", "utf8_string_with_comment_alias", "comment") +QT_TRID_NOOP("this_a_id") +QT_TRID_NOOP_ALIAS("this_a_id_alias") +QString test = qtTrId("yet_another_id"); +QString test_alias = qtTrId_alias("yet_another_id_alias"); + +class Bogus : QObject { + Q_OBJECT + + static const char * const s_strings[]; +}; + +const char * const Bogus::s_strings[] = { + QT_TR_NOOP("this should be in Bogus"), + QT_TR_NOOP_ALIAS("this should be in Bogus Alias"), + QT_TR_NOOP_UTF8("this should be utf8 in Bogus") + QT_TR_NOOP_UTF8_ALIAS("this should be utf8 in Bogus Alias") +}; + +class MyObject : public QObject +{ + Q_OBJECT + explicit MyObject(QObject *parent = 0) + { + tr("Boo", "nsF::D"); + tr_alias("Boo_alias", "nsB::C"); + trUtf8("utf8_Boo", "nsF::D"); + trUtf8_alias("utf8_Boo_alias", "nsF::D"); + translate("QTranslator", "Simple"); + translate_alias("QTranslator", "Simple with comment alias", "with comment") + } +}; + +struct NonQObject +{ + Q_DECLARE_TR_FUNCTIONS_ALIAS(NonQObject) + + NonQObject() + { + tr("NonQObject_Boo", "nsF::NonQObject_D"); + tr_alias("NonQObject_Boo_alias", "nsB::NonQObject_C"); + trUtf8("utf_NonQObject_Boo", "nsF::D"); + trUtf8_alias("utf8_NonQObject_Boo_alias", "nsF::D"); + translate("NonQObject_QTranslator", "Simple"); + translate_alias("NonQObject_QTranslator", "Simple with comment alias", "with comment") + } +}; + +#endif diff --git a/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/project.ts.result new file mode 100644 index 000000000..c168f8527 --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/tr_function_alias/project.ts.result @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1"> +<context> + <name></name> + <message id="this_a_id"> + <location filename="main.cpp" line="55"/> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="this_a_id_alias"> + <location filename="main.cpp" line="56"/> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="yet_another_id"> + <location filename="main.cpp" line="57"/> + <source></source> + <translation type="unfinished"></translation> + </message> + <message id="yet_another_id_alias"> + <location filename="main.cpp" line="58"/> + <source></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Bogus</name> + <message> + <location filename="main.cpp" line="67"/> + <source>this should be in Bogus</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="68"/> + <source>this should be in Bogus Alias</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="69"/> + <source>this should be utf8 in Bogus</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="70"/> + <source>this should be utf8 in Bogus Alias</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MyObject</name> + <message> + <location filename="main.cpp" line="78"/> + <source>Boo</source> + <comment>nsF::D</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="79"/> + <source>Boo_alias</source> + <comment>nsB::C</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="80"/> + <source>utf8_Boo</source> + <comment>nsF::D</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="81"/> + <source>utf8_Boo_alias</source> + <comment>nsF::D</comment> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>NonQObject</name> + <message> + <location filename="main.cpp" line="93"/> + <source>NonQObject_Boo</source> + <comment>nsF::NonQObject_D</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="94"/> + <source>NonQObject_Boo_alias</source> + <comment>nsB::NonQObject_C</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="95"/> + <source>utf_NonQObject_Boo</source> + <comment>nsF::D</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="96"/> + <source>utf8_NonQObject_Boo_alias</source> + <comment>nsF::D</comment> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>NonQObject_QTranslator</name> + <message> + <location filename="main.cpp" line="97"/> + <source>Simple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="98"/> + <source>Simple with comment alias</source> + <comment>with comment</comment> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTranslator</name> + <message> + <location filename="main.cpp" line="82"/> + <source>Simple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="83"/> + <source>Simple with comment alias</source> + <comment>with comment</comment> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>scope</name> + <message> + <location filename="main.cpp" line="47"/> + <source>string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="48"/> + <source>string_alias</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="49"/> + <source>utf8_string</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="50"/> + <source>utf8_string_alias</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="51"/> + <source>string_with_comment</source> + <comment>comment</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="52"/> + <source>string_with_comment_alias</source> + <comment>comment</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="53"/> + <source>utf8_string_with_comment</source> + <comment>comment</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="main.cpp" line="54"/> + <source>utf8_string_with_comment_alias</source> + <comment>comment</comment> + <translation type="unfinished"></translation> + </message> +</context> +</TS> |