Fixed #75.

martinrotter · Feb 8, 2017 · bac6f09 · bac6f09
1 parent ed3f8b3
commit bac6f09
Show file tree

Hide file tree

Showing 27 changed files with 57 additions and 114,153 deletions.
diff --git a/localization/qtbase-cs.ts b/localization/qtbase-cs.ts
diff --git a/localization/qtbase-da.ts b/localization/qtbase-da.ts
diff --git a/localization/qtbase-de.ts b/localization/qtbase-de.ts
diff --git a/localization/qtbase-fr.ts b/localization/qtbase-fr.ts
diff --git a/localization/qtbase-he.ts b/localization/qtbase-he.ts
diff --git a/localization/qtbase-it.ts b/localization/qtbase-it.ts
diff --git a/localization/qtbase-ja.ts b/localization/qtbase-ja.ts
diff --git a/localization/qtbase-sv.ts b/localization/qtbase-sv.ts
diff --git a/localization/rssguard-cs.ts b/localization/rssguard-cs.ts
diff --git a/localization/rssguard-da.ts b/localization/rssguard-da.ts
diff --git a/localization/rssguard-de.ts b/localization/rssguard-de.ts
diff --git a/localization/rssguard-en.ts b/localization/rssguard-en.ts
diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts
diff --git a/localization/rssguard-fr.ts b/localization/rssguard-fr.ts
diff --git a/localization/rssguard-he.ts b/localization/rssguard-he.ts
diff --git a/localization/rssguard-id.ts b/localization/rssguard-id.ts
diff --git a/localization/rssguard-it.ts b/localization/rssguard-it.ts
diff --git a/localization/rssguard-ja.ts b/localization/rssguard-ja.ts
diff --git a/localization/rssguard-lt.ts b/localization/rssguard-lt.ts
diff --git a/localization/rssguard-nl.ts b/localization/rssguard-nl.ts
diff --git a/localization/rssguard-pl.ts b/localization/rssguard-pl.ts
diff --git a/localization/rssguard-pt.ts b/localization/rssguard-pt.ts
diff --git a/localization/rssguard-sv.ts b/localization/rssguard-sv.ts
diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
@@ -1,3 +1,10 @@
+3.4.0
+—————
+
+Changed:
+▪ RSS Guard now uses "_" character as localization file names separator. (issue #75)
+▪ Localizations are now placed in "translations" subfolder instead of "l10n" subfolder. (issue #75)
+
 3.3.8
 —————
 

diff --git a/rssguard.pro b/rssguard.pro
@@ -489,45 +489,45 @@ else {
                 src/gui/newspaperpreviewer.ui
 }
 
-TRANSLATIONS += localization/qtbase-cs.ts \
-                localization/qtbase-da.ts \
-                localization/qtbase-de.ts \
-                localization/qtbase-fr.ts \
-                localization/qtbase-he.ts \
-                localization/qtbase-it.ts \
-                localization/qtbase-ja.ts \
-                localization/qtbase-sv.ts \
-                localization/rssguard-cs.ts \
-                localization/rssguard-da.ts \
-                localization/rssguard-de.ts \
-                localization/rssguard-en_GB.ts \
-                localization/rssguard-en.ts \
-                localization/rssguard-fr.ts \
-                localization/rssguard-he.ts \
-                localization/rssguard-id.ts \
-                localization/rssguard-it.ts \
-                localization/rssguard-ja.ts \
-                localization/rssguard-lt.ts \
-                localization/rssguard-nl.ts \
-                localization/rssguard-pl.ts \
-                localization/rssguard-pt.ts \
-                localization/rssguard-sv.ts
-
-TRANSLATIONS_WO_QT += $$PWD/localization/rssguard-cs.ts \
-                      $$PWD/localization/rssguard-da.ts \
-                      $$PWD/localization/rssguard-de.ts \
-                      $$PWD/localization/rssguard-en_GB.ts \
-                      $$PWD/localization/rssguard-en.ts \
-                      $$PWD/localization/rssguard-fr.ts \
-                      $$PWD/localization/rssguard-he.ts \
-                      $$PWD/localization/rssguard-id.ts \
-                      $$PWD/localization/rssguard-it.ts \
-                      $$PWD/localization/rssguard-ja.ts \
-                      $$PWD/localization/rssguard-lt.ts \
-                      $$PWD/localization/rssguard-nl.ts \
-                      $$PWD/localization/rssguard-pl.ts \
-                      $$PWD/localization/rssguard-pt.ts \
-                      $$PWD/localization/rssguard-sv.ts
+TRANSLATIONS += localization/qtbase_cs.ts \
+                localization/qtbase_da.ts \
+                localization/qtbase_de.ts \
+                localization/qtbase_fr.ts \
+                localization/qtbase_he.ts \
+                localization/qtbase_it.ts \
+                localization/qtbase_ja.ts \
+                localization/qtbase_sv.ts \
+                localization/rssguard_cs.ts \
+                localization/rssguard_da.ts \
+                localization/rssguard_de.ts \
+                localization/rssguard_en_GB.ts \
+                localization/rssguard_en.ts \
+                localization/rssguard_fr.ts \
+                localization/rssguard_he.ts \
+                localization/rssguard_id.ts \
+                localization/rssguard_it.ts \
+                localization/rssguard_ja.ts \
+                localization/rssguard_lt.ts \
+                localization/rssguard_nl.ts \
+                localization/rssguard_pl.ts \
+                localization/rssguard_pt.ts \
+                localization/rssguard_sv.ts
+
+TRANSLATIONS_WO_QT += $$PWD/localization/rssguard_cs.ts \
+                      $$PWD/localization/rssguard_da.ts \
+                      $$PWD/localization/rssguard_de.ts \
+                      $$PWD/localization/rssguard_en_GB.ts \
+                      $$PWD/localization/rssguard_en.ts \
+                      $$PWD/localization/rssguard_fr.ts \
+                      $$PWD/localization/rssguard_he.ts \
+                      $$PWD/localization/rssguard_id.ts \
+                      $$PWD/localization/rssguard_it.ts \
+                      $$PWD/localization/rssguard_ja.ts \
+                      $$PWD/localization/rssguard_lt.ts \
+                      $$PWD/localization/rssguard_nl.ts \
+                      $$PWD/localization/rssguard_pl.ts \
+                      $$PWD/localization/rssguard_pt.ts \
+                      $$PWD/localization/rssguard_sv.ts
 
 INCLUDEPATH +=  $$PWD/. \
                 $$PWD/src \
@@ -542,8 +542,8 @@ TEXTS = resources/text/CHANGELOG \
 
 # Make sure QM translations are generated.
 lrelease.input = TRANSLATIONS
-lrelease.output = $$OUT_PWD/lang/${QMAKE_FILE_BASE}.qm
-lrelease.commands = $$LRELEASE_EXECUTABLE -compress ${QMAKE_FILE_IN} -qm $$OUT_PWD/lang/${QMAKE_FILE_BASE}.qm
+lrelease.output = $$OUT_PWD/translations/${QMAKE_FILE_BASE}.qm
+lrelease.commands = $$LRELEASE_EXECUTABLE -compress ${QMAKE_FILE_IN} -qm $$OUT_PWD/translations/${QMAKE_FILE_BASE}.qm
 lrelease.CONFIG += no_link target_predeps
 
 # Create new "make lupdate" target.
@@ -661,7 +661,7 @@ win32 {
   app_plain_icon.files = resources/graphics/$${TARGET}_plain.png
   app_plain_icon.path = $$quote($$PREFIX/)
 
-  translations.files = $$OUT_PWD/lang
+  translations.files = $$OUT_PWD/translations
   translations.path = $$quote($$PREFIX/)
 
   INSTALLS += target misc_sql qt_dlls_root qt_dlls_bearer qt_dlls_iconengines \
@@ -721,7 +721,7 @@ unix:!mac {
   desktop_file_autostart.files = resources/desktop/$${TARGET}.desktop.autostart
   desktop_file_autostart.path = $$quote($$PREFIX/share/$${TARGET}/autostart/)
 
-  translations.files = $$OUT_PWD/lang
+  translations.files = $$OUT_PWD/translations
   translations.path = $$quote($$PREFIX/share/$$TARGET/)
 
   INSTALLS += target misc_sql misc_icons misc_feeds \
@@ -765,7 +765,7 @@ mac {
   misc_texts.files = $$TEXTS
   misc_texts.path = Contents/Resources/information
 
-  translations.files = $$OUT_PWD/lang
+  translations.files = $$OUT_PWD/translations
   translations.path =  Contents/Resources
 
   QMAKE_BUNDLE_DATA += misc_sql misc_icons faenza misc_feeds skins \

diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h
@@ -212,7 +212,7 @@
 #define APP_DESKTOP_ENTRY_FILE "rssguard.desktop"
 
 #define APP_DESKTOP_ENTRY_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/autostart")
-#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/lang")
+#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/translations")
 #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/skins")
 #define APP_INFO_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/information")
 #define APP_THEME_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/icons")
@@ -223,7 +223,7 @@
 
 #elif defined(Q_OS_OSX)
 
-#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../Resources/lang")
+#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../Resources/translations")
 #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/../Resources/skins")
 #define APP_INFO_PATH QApplication::applicationDirPath() + QString("/../Resources/information")
 #define APP_THEME_PATH QApplication::applicationDirPath() + QString("/../Resources/icons")
@@ -235,7 +235,7 @@
 
 #elif defined(Q_OS_WIN)
 
-#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/lang")
+#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/translations")
 #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/skins")
 #define APP_INFO_PATH QApplication::applicationDirPath()
 #define APP_THEME_PATH QApplication::applicationDirPath() + QString("/icons")

diff --git a/src/miscellaneous/localization.cpp b/src/miscellaneous/localization.cpp
@@ -43,7 +43,7 @@ void Localization::loadActiveLanguage() {
 
   qDebug("Starting to load active localization. Desired localization is '%s'.", qPrintable(desired_localization));
 
-  if (app_translator->load(QLocale(desired_localization), "rssguard", QSL("-"), APP_LANG_PATH)) {
+  if (app_translator->load(QLocale(desired_localization), "rssguard", QSL("_"), APP_LANG_PATH)) {
     const QString real_loaded_locale = app_translator->translate("QObject", "LANG_ABBREV");
 
     Application::installTranslator(app_translator);
@@ -59,7 +59,7 @@ void Localization::loadActiveLanguage() {
     desired_localization = DEFAULT_LOCALE;
   }
 
-  if (qt_translator->load(QLocale(desired_localization), "qtbase", QSL("-"), APP_LANG_PATH)) {
+  if (qt_translator->load(QLocale(desired_localization), "qtbase", QSL("_"), APP_LANG_PATH)) {
     Application::installTranslator(qt_translator);
     qDebug("Qt localization '%s' loaded successfully.", qPrintable(desired_localization));
   }
@@ -78,7 +78,7 @@ QList<Language> Localization::installedLanguages() const {
   QTranslator translator;
 
   // Iterate all found language files.
-  foreach (const QFileInfo &file, file_dir.entryInfoList(QStringList() << "rssguard-*.qm", QDir::Files, QDir::Name)) {
+  foreach (const QFileInfo &file, file_dir.entryInfoList(QStringList() << "rssguard_*.qm", QDir::Files, QDir::Name)) {
     if (translator.load(file.absoluteFilePath())) {
       Language new_language;
       new_language.m_code = translator.translate("QObject", "LANG_ABBREV");