make .ts file naming follow the usual pattern

this makes it easier to integrate ifw into the surrounding
infrastructure.

Change-Id: I7918830b7a6c29d8556911eec83a3b6530478d84
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

12 files changed, 18 insertions, 18 deletions

diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 043d7beca..ffcd8b388 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -257,7 +257,7 @@ int InstallerBase::run()
                     QCoreApplication::instance()->installTranslator(qtTranslator.take());
 
                 QScopedPointer<QTranslator> ifwTranslator(new QTranslator(QCoreApplication::instance()));
-                if (ifwTranslator->load(locale, QString(), QString(), directory))
+                if (ifwTranslator->load(locale, QLatin1String("ifw"), QLatin1String("_"), directory))
                     QCoreApplication::instance()->installTranslator(ifwTranslator.take());
 
                 // To stop loading other translations it's sufficient that
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro
index 6af36feb2..677f187a7 100644
--- a/src/sdk/sdk.pro
+++ b/src/sdk/sdk.pro
@@ -22,16 +22,16 @@ CONFIG(static, static|shared) {
 DESTDIR = $$IFW_APP_PATH
 
 exists($$LRELEASE) {
-    IB_TRANSLATIONS = $$files($$PWD/translations/??.ts) $$files($$PWD/translations/??_??.ts)
-    IB_TRANSLATIONS -= $$PWD/translations/en.ts
+    IB_TRANSLATIONS = $$files($$PWD/translations/*_??.ts)
+    IB_TRANSLATIONS -= $$PWD/translations/ifw_en.ts
 
     wd = $$toNativeSeparators($$IFW_SOURCE_TREE)
     sources = src
     lupdate_opts = -locations relative -no-ui-lines -no-sort
 
-    IB_ALL_TRANSLATIONS = $$IB_TRANSLATIONS $$PWD/translations/untranslated.ts
+    IB_ALL_TRANSLATIONS = $$IB_TRANSLATIONS $$PWD/translations/ifw_untranslated.ts
     for(file, IB_ALL_TRANSLATIONS) {
-        lang = $$replace(file, .*/([^/]*)\\.ts, \\1)
+        lang = $$replace(file, .*_([^/]*)\\.ts, \\1)
         v = ts-$${lang}.commands
         $$v = cd $$wd && $$LUPDATE $$lupdate_opts $$sources -ts $$file
         QMAKE_EXTRA_TARGETS += ts-$$lang
@@ -42,31 +42,31 @@ exists($$LRELEASE) {
     isEqual(QMAKE_DIR_SEP, /) {
         commit-ts.commands = \
             cd $$wd; \
-            git add -N src/sdk/translations/??.ts src/sdk/translations/??_??.ts && \
-            for f in `git diff-files --name-only src/sdk/translations/??.ts src/sdk/translations/??_??.ts`; do \
+            git add -N src/sdk/translations/*_??.ts && \
+            for f in `git diff-files --name-only src/sdk/translations/*_??.ts`; do \
                 $$LCONVERT -locations none -i \$\$f -o \$\$f; \
             done; \
-            git add src/sdk/translations/??.ts src/sdk/translations/??_??.ts && git commit
+            git add src/sdk/translations/*_??.ts && git commit
     } else {
         commit-ts.commands = \
             cd $$wd && \
-            git add -N src/sdk/translations/??.ts src/sdk/translations/??_??.ts && \
-            for /f usebackq %%f in (`git diff-files --name-only src/sdk/translations/??.ts src/sdk/translations/??_??.ts`) do \
+            git add -N src/sdk/translations/*_??.ts && \
+            for /f usebackq %%f in (`git diff-files --name-only src/sdk/translations/*_??.ts`) do \
                 $$LCONVERT -locations none -i %%f -o %%f $$escape_expand(\\n\\t) \
-            cd $$wd && git add src/sdk/translations/??.ts src/sdk/translations/??_??.ts && git commit
+            cd $$wd && git add src/sdk/translations/*_??.ts && git commit
     }
     QMAKE_EXTRA_TARGETS += commit-ts
 
     empty_ts = "<TS></TS>"
-    write_file($$OUT_PWD/translations/en.ts, empty_ts)|error("Aborting.")
-    IB_TRANSLATIONS += $$OUT_PWD/translations/en.ts
-    QMAKE_DISTCLEAN += translations/en.ts
+    write_file($$OUT_PWD/translations/ifw_en.ts, empty_ts)|error("Aborting.")
+    IB_TRANSLATIONS += $$OUT_PWD/translations/ifw_en.ts
+    QMAKE_DISTCLEAN += translations/ifw_en.ts
 
     qrc_cont = \
         "<RCC>" \
         "    <qresource prefix=\"/\">"
     for (file, IB_TRANSLATIONS) {
-        lang = $$replace(file, .*/([^/]*)\\.ts, \\1)
+        lang = $$replace(file, .*_([^/]*)\\.ts, \\1)
         qfile = $$[QT_INSTALL_TRANSLATIONS]/qtbase_$${lang}.qm
         !exists($$qfile) {
             qfile = $$[QT_INSTALL_TRANSLATIONS]/qt_$${lang}.qm
@@ -76,10 +76,10 @@ exists($$LRELEASE) {
             }
         }
         qrc_cont += \
-            "        <file>translations/$${lang}.qm</file>" \
+            "        <file>translations/ifw_$${lang}.qm</file>" \
             "        <file alias=\"translations/qt_$${lang}.qm\">$$qfile</file>"
         ACTIVE_IB_TRANSLATIONS += $$file
-        RESOURCE_DEPS += $$qfile translations/$${lang}.qm
+        RESOURCE_DEPS += $$qfile translations/ifw_$${lang}.qm
     }
     qrc_cont += \
         "    </qresource>" \
diff --git a/src/sdk/translations/README b/src/sdk/translations/README
index 2bade2c54..e43b99382 100644
--- a/src/sdk/translations/README
+++ b/src/sdk/translations/README
@@ -4,7 +4,7 @@ otherwise your language won't be loaded at runtime.
 To add a new language:
 1) Run 'cd src/sdk' (change to the parent directory of this file)
 2) Run 'make ts-untranslated'
-3) Rename translations/untranslated.ts to translations/<lang>.ts
+3) Rename translations/ifw_untranslated.ts to translations/ifw_<lang>.ts
 4) Run 'make qmake'
 5) Do your translation. Just run 'make' whenever you want to test it.
 6) Run 'make commit-ts'
diff --git a/src/sdk/translations/da.ts b/src/sdk/translations/ifw_da.ts
index 42a742217..42a742217 100644
--- a/src/sdk/translations/da.ts
+++ b/src/sdk/translations/ifw_da.ts
diff --git a/src/sdk/translations/de.ts b/src/sdk/translations/ifw_de.ts
index 23aa045b1..23aa045b1 100644
--- a/src/sdk/translations/de.ts
+++ b/src/sdk/translations/ifw_de.ts
diff --git a/src/sdk/translations/es.ts b/src/sdk/translations/ifw_es.ts
index 1ce64b86e..1ce64b86e 100644
--- a/src/sdk/translations/es.ts
+++ b/src/sdk/translations/ifw_es.ts
diff --git a/src/sdk/translations/fr.ts b/src/sdk/translations/ifw_fr.ts
index c0351120f..c0351120f 100644
--- a/src/sdk/translations/fr.ts
+++ b/src/sdk/translations/ifw_fr.ts
diff --git a/src/sdk/translations/it.ts b/src/sdk/translations/ifw_it.ts
index 514013f57..514013f57 100644
--- a/src/sdk/translations/it.ts
+++ b/src/sdk/translations/ifw_it.ts
diff --git a/src/sdk/translations/ja.ts b/src/sdk/translations/ifw_ja.ts
index d994bcd72..d994bcd72 100644
--- a/src/sdk/translations/ja.ts
+++ b/src/sdk/translations/ifw_ja.ts
diff --git a/src/sdk/translations/pl.ts b/src/sdk/translations/ifw_pl.ts
index 98af6f62d..98af6f62d 100644
--- a/src/sdk/translations/pl.ts
+++ b/src/sdk/translations/ifw_pl.ts
diff --git a/src/sdk/translations/ru.ts b/src/sdk/translations/ifw_ru.ts
index 2783f3eef..2783f3eef 100644
--- a/src/sdk/translations/ru.ts
+++ b/src/sdk/translations/ifw_ru.ts
diff --git a/src/sdk/translations/zh_CN.ts b/src/sdk/translations/ifw_zh_CN.ts
index a826448d9..a826448d9 100644
--- a/src/sdk/translations/zh_CN.ts
+++ b/src/sdk/translations/ifw_zh_CN.ts