Move localizations to new folder, remove lrelease prebuild step.

martinrotter · Nov 7, 2017 · 8eb640b · 8eb640b
1 parent b6e5cfe
commit 8eb640b
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@
 *.autosave
 *.user*
 resources/localizations/*rssguard*
+localization/rssguard*qm
diff --git a/resources/localizations/qt_bg.qm → localization/qt_bg.qm b/resources/localizations/qt_bg.qm → localization/qt_bg.qm
diff --git a/resources/localizations/qt_ca.qm → localization/qt_ca.qm b/resources/localizations/qt_ca.qm → localization/qt_ca.qm
diff --git a/resources/localizations/qt_cs.qm → localization/qt_cs.qm b/resources/localizations/qt_cs.qm → localization/qt_cs.qm
diff --git a/resources/localizations/qt_da.qm → localization/qt_da.qm b/resources/localizations/qt_da.qm → localization/qt_da.qm
diff --git a/resources/localizations/qt_de.qm → localization/qt_de.qm b/resources/localizations/qt_de.qm → localization/qt_de.qm
diff --git a/resources/localizations/qt_en.qm → localization/qt_en.qm b/resources/localizations/qt_en.qm → localization/qt_en.qm
diff --git a/resources/localizations/qt_es.qm → localization/qt_es.qm b/resources/localizations/qt_es.qm → localization/qt_es.qm
diff --git a/resources/localizations/qt_fi.qm → localization/qt_fi.qm b/resources/localizations/qt_fi.qm → localization/qt_fi.qm
diff --git a/resources/localizations/qt_fr.qm → localization/qt_fr.qm b/resources/localizations/qt_fr.qm → localization/qt_fr.qm
diff --git a/resources/localizations/qt_gd.qm → localization/qt_gd.qm b/resources/localizations/qt_gd.qm → localization/qt_gd.qm
diff --git a/resources/localizations/qt_he.qm → localization/qt_he.qm b/resources/localizations/qt_he.qm → localization/qt_he.qm
diff --git a/resources/localizations/qt_hu.qm → localization/qt_hu.qm b/resources/localizations/qt_hu.qm → localization/qt_hu.qm
diff --git a/resources/localizations/qt_it.qm → localization/qt_it.qm b/resources/localizations/qt_it.qm → localization/qt_it.qm
diff --git a/resources/localizations/qt_ja.qm → localization/qt_ja.qm b/resources/localizations/qt_ja.qm → localization/qt_ja.qm
diff --git a/resources/localizations/qt_ko.qm → localization/qt_ko.qm b/resources/localizations/qt_ko.qm → localization/qt_ko.qm
diff --git a/resources/localizations/qt_lv.qm → localization/qt_lv.qm b/resources/localizations/qt_lv.qm → localization/qt_lv.qm
diff --git a/resources/localizations/qt_pl.qm → localization/qt_pl.qm b/resources/localizations/qt_pl.qm → localization/qt_pl.qm
diff --git a/resources/localizations/qt_ru.qm → localization/qt_ru.qm b/resources/localizations/qt_ru.qm → localization/qt_ru.qm
diff --git a/resources/localizations/qt_sk.qm → localization/qt_sk.qm b/resources/localizations/qt_sk.qm → localization/qt_sk.qm
diff --git a/resources/localizations/qt_uk.qm → localization/qt_uk.qm b/resources/localizations/qt_uk.qm → localization/qt_uk.qm
diff --git a/resources/binaries b/resources/binaries
diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc
@@ -1516,44 +1516,44 @@
         <file>skins/vergilius/metadata.xml</file>
         <file>skins/vergilius/theme.css</file>
         <file>initial_feeds/feeds-en.opml</file>
-        <file>localizations/rssguard_cs.qm</file>
-        <file>localizations/rssguard_da.qm</file>
-        <file>localizations/rssguard_de.qm</file>
-        <file>localizations/rssguard_en.qm</file>
-        <file>localizations/rssguard_en_GB.qm</file>
-        <file>localizations/rssguard_es.qm</file>
-        <file>localizations/rssguard_fr.qm</file>
-        <file>localizations/rssguard_he.qm</file>
-        <file>localizations/rssguard_id.qm</file>
-        <file>localizations/rssguard_it.qm</file>
-        <file>localizations/rssguard_ja.qm</file>
-        <file>localizations/rssguard_lt.qm</file>
-        <file>localizations/rssguard_nl.qm</file>
-        <file>localizations/rssguard_pl.qm</file>
-        <file>localizations/rssguard_pt.qm</file>
-        <file>localizations/rssguard_sv.qm</file>
-        <file>localizations/rssguard_zh.qm</file>
+        <file>../localization/rssguard_cs.qm</file>
+        <file>../localization/rssguard_da.qm</file>
+        <file>../localization/rssguard_de.qm</file>
+        <file>../localization/rssguard_en.qm</file>
+        <file>../localization/rssguard_en_GB.qm</file>
+        <file>../localization/rssguard_es.qm</file>
+        <file>../localization/rssguard_fr.qm</file>
+        <file>../localization/rssguard_he.qm</file>
+        <file>../localization/rssguard_id.qm</file>
+        <file>../localization/rssguard_it.qm</file>
+        <file>../localization/rssguard_ja.qm</file>
+        <file>../localization/rssguard_lt.qm</file>
+        <file>../localization/rssguard_nl.qm</file>
+        <file>../localization/rssguard_pl.qm</file>
+        <file>../localization/rssguard_pt.qm</file>
+        <file>../localization/rssguard_sv.qm</file>
+        <file>../localization/rssguard_zh.qm</file>
         <file>desktop/com.github.rssguard.desktop</file>
         <file>desktop/com.github.rssguard.desktop.autostart</file>
-        <file>localizations/qt_bg.qm</file>
-        <file>localizations/qt_ca.qm</file>
-        <file>localizations/qt_cs.qm</file>
-        <file>localizations/qt_da.qm</file>
-        <file>localizations/qt_de.qm</file>
-        <file>localizations/qt_en.qm</file>
-        <file>localizations/qt_es.qm</file>
-        <file>localizations/qt_fi.qm</file>
-        <file>localizations/qt_fr.qm</file>
-        <file>localizations/qt_gd.qm</file>
-        <file>localizations/qt_he.qm</file>
-        <file>localizations/qt_hu.qm</file>
-        <file>localizations/qt_it.qm</file>
-        <file>localizations/qt_ja.qm</file>
-        <file>localizations/qt_ko.qm</file>
-        <file>localizations/qt_lv.qm</file>
-        <file>localizations/qt_pl.qm</file>
-        <file>localizations/qt_ru.qm</file>
-        <file>localizations/qt_sk.qm</file>
-        <file>localizations/qt_uk.qm</file>
+        <file>../localization/qt_bg.qm</file>
+        <file>../localization/qt_ca.qm</file>
+        <file>../localization/qt_cs.qm</file>
+        <file>../localization/qt_da.qm</file>
+        <file>../localization/qt_de.qm</file>
+        <file>../localization/qt_en.qm</file>
+        <file>../localization/qt_es.qm</file>
+        <file>../localization/qt_fi.qm</file>
+        <file>../localization/qt_fr.qm</file>
+        <file>../localization/qt_gd.qm</file>
+        <file>../localization/qt_he.qm</file>
+        <file>../localization/qt_hu.qm</file>
+        <file>../localization/qt_it.qm</file>
+        <file>../localization/qt_ja.qm</file>
+        <file>../localization/qt_ko.qm</file>
+        <file>../localization/qt_lv.qm</file>
+        <file>../localization/qt_pl.qm</file>
+        <file>../localization/qt_ru.qm</file>
+        <file>../localization/qt_sk.qm</file>
+        <file>../localization/qt_uk.qm</file>
     </qresource>
 </RCC>
diff --git a/rssguard.pro b/rssguard.pro
@@ -599,18 +599,11 @@ INCLUDEPATH +=  $$PWD/. \
                 $$PWD/src/gui/dialogs \
                 $$PWD/src/dynamic-shortcuts
 
-# Make sure QM translations are gnerated.
-lrelease.input = TRANSLATIONS
-lrelease.output = $$PWD/resources/localizations/${QMAKE_FILE_BASE}.qm
-lrelease.commands = $$LRELEASE_EXECUTABLE -compress ${QMAKE_FILE_IN} -qm $$PWD/resources/localizations/${QMAKE_FILE_BASE}.qm
-lrelease.CONFIG += no_link target_predeps
-
 # Create new "make lupdate" target.
 lupdate.target = lupdate
 lupdate.commands = lupdate $$shell_path($$PWD/rssguard.pro)
 
 QMAKE_EXTRA_TARGETS += lupdate
-QMAKE_EXTRA_COMPILERS += lrelease
 
 # Create new "make 7zip" target and "make zip" target.
 win32 {

diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h
@@ -225,7 +225,7 @@
 #define APP_ICON_PLAIN_PATH QSL(":/graphics/rssguard_plain.png")
 #define APP_SKIN_PATH QSL(":/skins")
 #define APP_INITIAL_FEEDS_PATH QSL(":/initial_feeds")
-#define APP_LANG_PATH QSL(":/localizations")
+#define APP_LANG_PATH QSL(":/localization")
 
 #if defined(Q_OS_LINUX)
 #define APP_DESKTOP_SOURCE_ENTRY_FILE "com.github.rssguard.desktop.autostart"