diff options
| author | Alex Merry <alex.merry@kde.org> | 2015-11-08 19:23:14 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2015-11-08 19:26:29 +0000 |
| commit | 9d4be698a3a9a0b81730d2d54de5dd33b7dc61dc (patch) | |
| tree | f1d05e74ddaecbc43ec09b9d9238b25883a805b9 | |
| parent | 994940ae780a860935f5321830fab1955a687b44 (diff) | |
| download | extra-cmake-modules-9d4be698a3a9a0b81730d2d54de5dd33b7dc61dc.tar.gz extra-cmake-modules-9d4be698a3a9a0b81730d2d54de5dd33b7dc61dc.tar.bz2 | |
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.
| -rw-r--r-- | tests/ECMPoQmToolsTest/check.cmake.in | 6 | ||||
| -rw-r--r-- | tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po (renamed from tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po) | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/ECMPoQmToolsTest/check.cmake.in b/tests/ECMPoQmToolsTest/check.cmake.in index 8089db6e..2f0cc205 100644 --- a/tests/ECMPoQmToolsTest/check.cmake.in +++ b/tests/ECMPoQmToolsTest/check.cmake.in @@ -23,7 +23,7 @@ set(exp_files "share/locale/es/LC_MESSAGES/install-test.qm" "share/locale/fr/LC_MESSAGES/install-test.qm" "share/locale/en/LC_MESSAGES/catalog.qm" - "share/locale/de/LC_MESSAGES/catalog.qm" + "share/locale/en_GB/LC_MESSAGES/catalog.qm" "custom-dir1/es/LC_MESSAGES/custom-dir1-install-test.qm" "custom-dir1/fr/LC_MESSAGES/custom-dir1-install-test.qm" "custom-dir2/es/LC_MESSAGES/custom-dir2-install-test.qm" @@ -55,11 +55,11 @@ endif() # we know we can modify the executable environment on Linux if("@CMAKE_SYSTEM_NAME@" STREQUAL "Linux") set(exp_output_en "english text:english plural form 5") - set(exp_output_de "german text:german plural form 5") + set(exp_output_en_GB "british english text:british english plural form 5") # no french translation provided -> english fallback set(exp_output_fr "${exp_output_en}") foreach(exec TR_TEST TR_THREAD_TEST) - foreach(lang en de fr) + foreach(lang en en_GB fr) execute_process( COMMAND "${CMAKE_COMMAND}" -E env "XDG_DATA_DIRS=${ACTUAL_TREE}/share" LC_ALL=${lang} "${${exec}_EXEC}" diff --git a/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po b/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po index 6f3e328f..ec5ad857 100644 --- a/tests/ECMPoQmToolsTest/tr_test-po/de/catalog.po +++ b/tests/ECMPoQmToolsTest/tr_test-po/en_GB/catalog.po @@ -4,13 +4,13 @@ msgstr "" "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-Language: en_GB\n" "X-Qt-Contexts: true\n" #: main.cpp:12 msgctxt "testcontext|" msgid "test string" -msgstr "german text" +msgstr "british english text" #: main.cpp:13 #, qt-format @@ -18,5 +18,5 @@ msgstr "german text" msgctxt "testcontext|" msgid "test plural %n" msgid_plural "test plural %n" -msgstr[0] "german singular form %n" -msgstr[1] "german plural form %n" +msgstr[0] "british english singular form %n" +msgstr[1] "british english plural form %n" |