From 009c480413910e8c1a18f4d1420f4a517ea606e6 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 14 Oct 2015 12:18:40 +0100 Subject: Make sure we load translations on the main thread. BUG: 346188 REVIEW: 123726 --- tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po | 22 ++++++++++++++++++++++ tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po create mode 100644 tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po (limited to 'tests/ECMPoQmToolsTest/tr_test-po') diff --git a/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po new file mode 100644 index 00000000..2a7b6d28 --- /dev/null +++ b/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.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 "english text" + +#: main.cpp:13 +#, qt-format +#| msgid "test plural" +msgctxt "testcontext|" +msgid "test plural %n" +msgid_plural "test plural %n" +msgstr[0] "english singular form %n" +msgstr[1] "english plural form %n" diff --git a/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po new file mode 100644 index 00000000..ec5ad857 --- /dev/null +++ b/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.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_GB\n" +"X-Qt-Contexts: true\n" + +#: main.cpp:12 +msgctxt "testcontext|" +msgid "test string" +msgstr "british english text" + +#: main.cpp:13 +#, qt-format +#| msgid "test plural" +msgctxt "testcontext|" +msgid "test plural %n" +msgid_plural "test plural %n" +msgstr[0] "british english singular form %n" +msgstr[1] "british english plural form %n" -- cgit v1.2.1 From 0496f8ae020c497b5f65234063150781d023f8ba Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Tue, 3 Nov 2015 17:13:00 +0000 Subject: Change ecm_create_po_loader test language to German. This is easier to distinguish from "english" in the test output than "british english". --- tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po | 22 ++++++++++++++++++++++ tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po delete mode 100644 tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po (limited to 'tests/ECMPoQmToolsTest/tr_test-po') diff --git a/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po new file mode 100644 index 00000000..6f3e328f --- /dev/null +++ b/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.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 "german text" + +#: main.cpp:13 +#, qt-format +#| msgid "test plural" +msgctxt "testcontext|" +msgid "test plural %n" +msgid_plural "test plural %n" +msgstr[0] "german singular form %n" +msgstr[1] "german plural form %n" diff --git a/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po deleted file mode 100644 index ec5ad857..00000000 --- a/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po +++ /dev/null @@ -1,22 +0,0 @@ -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_GB\n" -"X-Qt-Contexts: true\n" - -#: main.cpp:12 -msgctxt "testcontext|" -msgid "test string" -msgstr "british english text" - -#: main.cpp:13 -#, qt-format -#| msgid "test plural" -msgctxt "testcontext|" -msgid "test plural %n" -msgid_plural "test plural %n" -msgstr[0] "british english singular form %n" -msgstr[1] "british english plural form %n" -- cgit v1.2.1 From 9d4be698a3a9a0b81730d2d54de5dd33b7dc61dc Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 8 Nov 2015 19:23:14 +0000 Subject: Revert "Change ecm_create_po_loader test language to German." This commit is dependent on 009c480413910e8c1a18f4d1420f4a517ea606e6, which is the primary commit to be reverted. This reverts commit 0496f8ae020c497b5f65234063150781d023f8ba. --- tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po | 22 ---------------------- tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po create mode 100644 tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po (limited to 'tests/ECMPoQmToolsTest/tr_test-po') diff --git a/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po deleted file mode 100644 index 6f3e328f..00000000 --- a/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po +++ /dev/null @@ -1,22 +0,0 @@ -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 "german text" - -#: main.cpp:13 -#, qt-format -#| msgid "test plural" -msgctxt "testcontext|" -msgid "test plural %n" -msgid_plural "test plural %n" -msgstr[0] "german singular form %n" -msgstr[1] "german plural form %n" diff --git a/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po new file mode 100644 index 00000000..ec5ad857 --- /dev/null +++ b/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.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_GB\n" +"X-Qt-Contexts: true\n" + +#: main.cpp:12 +msgctxt "testcontext|" +msgid "test string" +msgstr "british english text" + +#: main.cpp:13 +#, qt-format +#| msgid "test plural" +msgctxt "testcontext|" +msgid "test plural %n" +msgid_plural "test plural %n" +msgstr[0] "british english singular form %n" +msgstr[1] "british english plural form %n" -- cgit v1.2.1 From 6745bd7e4796560959bb67e33b7c7f86f96a5a94 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 8 Nov 2015 19:23:22 +0000 Subject: Revert "Make sure we load translations on the main thread." This broke the build for projects which used ecm_create_qm_loader in unusual ways. A better approach is coming, but won't be in e-c-m 5.16. This reverts commit 009c480413910e8c1a18f4d1420f4a517ea606e6. CCBUG: 346188 CCMAIL: release-team@kde.org CCMAIL: kde-buildsystem@kde.org --- tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po | 22 ---------------------- tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po | 22 ---------------------- 2 files changed, 44 deletions(-) delete mode 100644 tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po delete mode 100644 tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po (limited to 'tests/ECMPoQmToolsTest/tr_test-po') diff --git a/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po deleted file mode 100644 index 2a7b6d28..00000000 --- a/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po +++ /dev/null @@ -1,22 +0,0 @@ -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 "english text" - -#: main.cpp:13 -#, qt-format -#| msgid "test plural" -msgctxt "testcontext|" -msgid "test plural %n" -msgid_plural "test plural %n" -msgstr[0] "english singular form %n" -msgstr[1] "english plural form %n" diff --git a/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po deleted file mode 100644 index ec5ad857..00000000 --- a/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po +++ /dev/null @@ -1,22 +0,0 @@ -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_GB\n" -"X-Qt-Contexts: true\n" - -#: main.cpp:12 -msgctxt "testcontext|" -msgid "test string" -msgstr "british english text" - -#: main.cpp:13 -#, qt-format -#| msgid "test plural" -msgctxt "testcontext|" -msgid "test plural %n" -msgid_plural "test plural %n" -msgstr[0] "british english singular form %n" -msgstr[1] "british english plural form %n" -- cgit v1.2.1 From c88bc78e0ca3834c46b89ca9d14b404751da5d4a Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 14 Oct 2015 12:18:40 +0100 Subject: Add unit test for ecm_create_qm_loader. This is based on commit 6745bd7e4796560959bb67e33b7c7f86f96a5a94 (and the subsequent fix-up commits). --- tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po | 22 ++++++++++++++++++++++ tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po create mode 100644 tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po (limited to 'tests/ECMPoQmToolsTest/tr_test-po') diff --git a/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po new file mode 100644 index 00000000..6f3e328f --- /dev/null +++ b/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.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 "german text" + +#: main.cpp:13 +#, qt-format +#| msgid "test plural" +msgctxt "testcontext|" +msgid "test plural %n" +msgid_plural "test plural %n" +msgstr[0] "german singular form %n" +msgstr[1] "german plural form %n" diff --git a/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.po new file mode 100644 index 00000000..2a7b6d28 --- /dev/null +++ b/tests/ECMPoQmToolsTest/tr_test-po/en/catalog.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 "english text" + +#: main.cpp:13 +#, qt-format +#| msgid "test plural" +msgctxt "testcontext|" +msgid "test plural %n" +msgid_plural "test plural %n" +msgstr[0] "english singular form %n" +msgstr[1] "english plural form %n" -- cgit v1.2.1