File solarus-quest-editor-v1.6.1-install-translation... of Package solarus-quest-editor

Overview Repositories Revisions Requests Users Attributes Meta

File solarus-quest-editor-v1.6.1-install-translations.patch of Package solarus-quest-editor (Revision c7e3053f37ea6ec157beab6b4fdcb91e)

Currently displaying revision c7e3053f37ea6ec157beab6b4fdcb91e , Show latest

From e0898a84ca755ad0e68905198a19023750140d67 Mon Sep 17 00:00:00 2001
From: Antoine Belvire <antoine.belvire@opensuse.org>
Date: Sun, 11 Aug 2019 16:02:51 +0200
Subject: [PATCH] Add install target for translations

This adds a CMake install target for qm files and allows the application to
load them from installation path.
---
 cmake/AddInstallTargets.cmake | 3 +++
 src/main.cpp                  | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cmake/AddInstallTargets.cmake b/cmake/AddInstallTargets.cmake
index eaa54e17..3dee926e 100644
--- a/cmake/AddInstallTargets.cmake
+++ b/cmake/AddInstallTargets.cmake
@@ -5,3 +5,6 @@ install(TARGETS solarus-quest-editor
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/assets/"
   DESTINATION "${SOLARUS_INSTALL_DATADIR}/assets"
 )
+install(FILES ${solarus_quest_editor_TRANSLATIONS_QM}
+  DESTINATION "${SOLARUS_INSTALL_DATADIR}/translations"
+)
diff --git a/src/main.cpp b/src/main.cpp
index 45b7e922..66a09439 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -65,7 +65,11 @@ int run_editor_gui(int argc, char* argv[]) {
   application.installTranslator(&qt_translator);
 
   QTranslator translator;
-  translator.load("solarus_editor_" + QLocale::system().name());
+  QString filename = "solarus_editor_" + QLocale::system().name();
+  bool translation_loaded = translator.load(filename);
+  if (!translation_loaded) {
+    translator.load(filename, SOLARUSEDITOR_DATADIR_PATH "/translations");
+  }
   application.installTranslator(&translator);
 
   MainWindow window(nullptr);
-- 
2.22.0

Places

File solarus-quest-editor-v1.6.1-install-translations.patch of Package solarus-quest-editor (Revision c7e3053f37ea6ec157beab6b4fdcb91e)

Places