fix: translations are not being installed via make install

jasonbu · May 12, 2015 · f251d11 · f251d11
1 parent b5796d5
commit f251d11
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,6 +128,7 @@ set(SQLB_FORMS
 set(SQLB_RESOURCES
 	src/icons/icons.qrc
 	src/translations/flags/flags.qrc
+	src/translations/translations.qrc
 )
 
 set(SQLB_MISC
@@ -144,25 +145,25 @@ set(SQLB_TSS
 
 if(USE_QT5)
     qt5_wrap_ui(SQLB_FORM_HDR ${SQLB_FORMS})
-    qt5_add_resources(SQLB_RESOURCES_RCC ${SQLB_RESOURCES})
     if(SQLB_TSS)
         # add translations
         foreach(SQLB_TS ${SQLB_TSS})
-            SET_SOURCE_FILES_PROPERTIES("${SQLB_TS}" PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/translations")
+            SET_SOURCE_FILES_PROPERTIES("${SQLB_TS}" PROPERTIES OUTPUT_LOCATION "${CMAKE_SOURCE_DIR}/src/translations")
         endforeach(SQLB_TS ${SQLB_TSS})
         qt5_add_translation(SQLB_QMS ${SQLB_TSS})
     endif(SQLB_TSS)
+    qt5_add_resources(SQLB_RESOURCES_RCC ${SQLB_RESOURCES})
 else()
     QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR})
     QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
-    QT4_ADD_RESOURCES(SQLB_RESOURCES_RCC ${SQLB_RESOURCES})
     if(SQLB_TSS)
         # add translations
         foreach(SQLB_TS ${SQLB_TSS})
-            SET_SOURCE_FILES_PROPERTIES("${SQLB_TS}" PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/translations")
+            SET_SOURCE_FILES_PROPERTIES("${SQLB_TS}" PROPERTIES OUTPUT_LOCATION "${CMAKE_SOURCE_DIR}/src/translations")
         endforeach(SQLB_TS ${SQLB_TSS})
         QT4_ADD_TRANSLATION(SQLB_QMS ${SQLB_TSS})
     endif(SQLB_TSS)
+    QT4_ADD_RESOURCES(SQLB_RESOURCES_RCC ${SQLB_RESOURCES})
 endif()
 
 
@@ -227,8 +228,7 @@ add_executable(${PROJECT_NAME}
 		${SQLB_FORM_HDR}
 		${SQLB_MOC}
 		${SQLB_RESOURCES_RCC}
-                ${SQLB_QMS}
-                ${SQLB_MISC})
+		${SQLB_MISC})
 
 if(USE_QT5)
     qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)

diff --git a/src/Application.cpp b/src/Application.cpp
@@ -32,6 +32,10 @@ Application::Application(int& argc, char** argv) :
     m_translatorApp = new QTranslator(this);
     ok = m_translatorApp->load("sqlb_" + name,
                                QCoreApplication::applicationDirPath() + "/translations");
+    // If failed then try to load .qm file from resources
+    if (ok == false) {
+        ok = m_translatorApp->load("sqlb_" + name, ":/translations");
+    }
 
     if (ok == true) {
         PreferencesDialog::setSettingsValue("General", "language", name);

diff --git a/src/PreferencesDialog.cpp b/src/PreferencesDialog.cpp
@@ -394,6 +394,7 @@ void PreferencesDialog::fillLanguageBox()
                                       "en_US");
     }
 
+    // append availeble *.qm files from translation dir near executable
     foreach(const QFileInfo &file, translationsDir.entryInfoList())
     {
         QLocale locale(file.baseName().remove("sqlb_"));
@@ -411,6 +412,28 @@ void PreferencesDialog::fillLanguageBox()
         ui->languageComboBox->addItem(QIcon(":/flags/" + locale.name()), language, locale.name());
     }
 
+    // append *.qm files from resources
+    foreach (const QFileInfo &file, QDir(":/translations").entryInfoList())
+    {
+        QLocale locale(file.baseName().remove("sqlb_"));
+
+        // Skip invalid locales
+        if(locale.name() == "C")
+            continue;
+
+        // Translation for this locale already loaded in previous foreach
+        if (ui->languageComboBox->findData(locale.name(), Qt::UserRole, Qt::MatchExactly) != -1)
+            continue;
+
+        QString language = QLocale::languageToString(locale.language()) + " (" +
+                           QLocale::countryToString(locale.country()) + ")";
+
+        if (locale == systemLocale)
+            language += " [System language]";
+
+        ui->languageComboBox->addItem(QIcon(":/flags/" + locale.name()), language, locale.name());
+    }
+
     ui->languageComboBox->model()->sort(0);
 
     // Try to select the language for the stored locale

diff --git a/src/src.pro b/src/src.pro
@@ -81,7 +81,8 @@ SOURCES += \
     FileDialog.cpp
 
 RESOURCES += icons/icons.qrc \
-             translations/flags/flags.qrc
+             translations/flags/flags.qrc \
+             translations/translations.qrc
 
 FORMS += \
     MainWindow.ui \

diff --git a/src/translations/translations.qrc b/src/translations/translations.qrc
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/translations">
+        <file alias="sqlb_ru">sqlb_ru.qm</file>
+        <file alias="sqlb_de">sqlb_de.qm</file>
+        <file alias="sqlb_fr">sqlb_fr.qm</file>
+        <file alias="sqlb_zh">sqlb_zh.qm</file>
+    </qresource>
+</RCC>