add appinfo metadata source dependency

qgis · Sep 28, 2018 · a6c3b812e6a01a6669dcc45713a063d505c7c539 · a6c3b81
1 parent f58cc38
commit a6c3b812e6a01a6669dcc45713a063d505c7c539
Unified Split

Showing with 2 additions and 3 deletions.

+1 −2 i18n/CMakeLists.txt

+1 −1 scripts/ts2appinfo.py
diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
@@ -1,7 +1,6 @@
 FIND_PROGRAM(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
 
 MACRO(ADD_TRANSLATION_FILES _sources )
-
     FOREACH (_current_FILE ${ARGN})
       GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
       GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
@@ -33,7 +32,7 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     COMMAND ${PYTHON_EXECUTABLE}
     ARGS ${CMAKE_SOURCE_DIR}/scripts/ts2appinfo.py "${CMAKE_BINARY_DIR}"
     COMMENT "Updating appinfo files..."
-    DEPENDS ${QM_FILES}
+    DEPENDS ${QM_FILES} ${CMAKE_SOURCE_DIR}/linux/org.qgis.qgis.desktop.in ${CMAKE_SOURCE_DIR}/linux/org.qgis.qgis.appdata.xml.in
   )
 
   SET(MD_FILES ${CMAKE_BINARY_DIR}/org.qgis.qgis.desktop ${CMAKE_BINARY_DIR}/org.qgis.qgis.appdata.xml)

diff --git a/scripts/ts2appinfo.py b/scripts/ts2appinfo.py
@@ -96,7 +96,7 @@
 
             t = line.strip()[len(prefix) + 1:]
             for lang in strings[t]:
-                f.write("{}[{}]={}\n".format(prefix, lang, strings[t][lang]))
+                f.write("{}[{}]={}\n".format(prefix, lang, strings[t][lang].decode("utf-8")))
 
         elif line.startswith(prefix + "["):
             skip = True