From 55c55808298986d13ca461d571069f4214d8174d Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 14 Oct 2015 12:18:40 +0100 Subject: Fix multiple calls to ecm_create_qm_loader. Multiple ecm_create_qm_loader() with different catalog names would overwrite each other's generated files, causing the wrong catalog to be loaded at runtime for some targets. This puts the catalog name into the generated filename. Since the catalog name is the only difference between the generated files, this is sufficient to fix the runtime behaviour. REVIEW: 125999 --- tests/ECMPoQmToolsTest/tr_test-po/de/catalog2.po | 22 ++++++++++++++++++++++ tests/ECMPoQmToolsTest/tr_test-po/en/catalog2.po | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 tests/ECMPoQmToolsTest/tr_test-po/de/catalog2.po create mode 100644 tests/ECMPoQmToolsTest/tr_test-po/en/catalog2.po (limited to 'tests/ECMPoQmToolsTest/tr_test-po') diff --git a/tests/ECMPoQmToolsTest/tr_test-po/de/catalog2.po b/tests/ECMPoQmToolsTest/tr_test-po/de/catalog2.po new file mode 100644 index 00000000..04631f32 --- /dev/null +++ b/tests/ECMPoQmToolsTest/tr_test-po/de/catalog2.po @@ -0,0 +1,22 @@ +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Language: de\n" +"X-Qt-Contexts: true\n" + +#: main.cpp:12 +msgctxt "testcontext|" +msgid "test string" +msgstr "2nd german text" + +#: main.cpp:13 +#, qt-format +#| msgid "test plural" +msgctxt "testcontext|" +msgid "test plural %n" +msgid_plural "test plural %n" +msgstr[0] "2nd german singular form %n" +msgstr[1] "2nd german plural form %n" diff --git a/tests/ECMPoQmToolsTest/tr_test-po/en/catalog2.po b/tests/ECMPoQmToolsTest/tr_test-po/en/catalog2.po new file mode 100644 index 00000000..bd17bbf8 --- /dev/null +++ b/tests/ECMPoQmToolsTest/tr_test-po/en/catalog2.po @@ -0,0 +1,22 @@ +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Language: en\n" +"X-Qt-Contexts: true\n" + +#: main.cpp:12 +msgctxt "testcontext|" +msgid "test string" +msgstr "2nd english text" + +#: main.cpp:13 +#, qt-format +#| msgid "test plural" +msgctxt "testcontext|" +msgid "test plural %n" +msgid_plural "test plural %n" +msgstr[0] "2nd english singular form %n" +msgstr[1] "2nd english plural form %n" -- cgit v1.2.1