Merge lp:~paulliu/unity/i18n-po-msgmerge into lp:unity/phablet

[Ying-Chun Liu]

Don't update(msgmerge) *.po files everytime when build.

Don't update(msgmerge) *.po files everytime when build.

[Michał Sawicz (saviq)]

46 + COMMAND install -D ${_gmoFile} ${CMAKE_CURRENT_BINARY_DIR}/locale/${_lang}/LC_MESSAGES/unity8.mo

50 + INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION ${CMAKE_INSTALL_PREFIX}/share/locale/${_lang}/LC_MESSAGES/ RENAME unity8.mo)

Can we make "unity8" a variable please?

review: Needs Fixing

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'main.cpp'
--- main.cpp	2013-05-24 16:35:19 +0000
+++ main.cpp	2013-05-28 10:40:31 +0000
@@ -83,9 +83,7 @@
         }
     }
 
-    if (!isRunningInstalled()) {
-        bindtextdomain("unity8", translationDirectory().toUtf8().data());
-    }
+    bindtextdomain("unity8", translationDirectory().toUtf8().data());
 
     QQuickView* view = new QQuickView();
     view->setResizeMode(QQuickView::SizeRootObjectToView);
 
=== modified file 'paths.h.in'
--- paths.h.in	2013-05-24 08:00:04 +0000
+++ paths.h.in	2013-05-28 10:40:31 +0000
@@ -28,7 +28,11 @@
 }
 
 inline QString translationDirectory() {
-    return QString("@CMAKE_INSTALL_PREFIX@/share/locale");
+    if (isRunningInstalled()) {
+        return QString("@CMAKE_INSTALL_PREFIX@/share/locale");
+    } else {
+        return QString("@CMAKE_BINARY_DIR@/po/locale");
+    }
 }
 
 inline QString shellAppDirectory() {
 
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2013-05-24 08:00:04 +0000
+++ po/CMakeLists.txt	2013-05-28 10:40:31 +0000
@@ -9,7 +9,22 @@
   *.po
 )
 
-GETTEXT_CREATE_TRANSLATIONS(${POT_FILE} ALL ${PO_FILES})
+SET(MO_FILE unity8.mo)
+
+FOREACH(_file ${PO_FILES})
+  GET_FILENAME_COMPONENT(_lang ${_file} NAME_WE)
+  SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
+  ADD_CUSTOM_COMMAND(OUTPUT ${_gmoFile}
+    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_file}
+    COMMAND install -D ${_gmoFile} ${CMAKE_CURRENT_BINARY_DIR}/locale/${_lang}/LC_MESSAGES/${MO_FILE}
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    DEPENDS ${_file}
+  )
+  INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION ${CMAKE_INSTALL_PREFIX}/share/locale/${_lang}/LC_MESSAGES/ RENAME ${MO_FILE})
+  _GETTEXT_GET_UNIQUE_TARGET_NAME( pofiles uniqueTargetName)
+  ADD_CUSTOM_TARGET(${uniqueTargetName} ALL DEPENDS ${_gmoFile})
+ENDFOREACH(_file)
+
 ADD_CUSTOM_COMMAND(OUTPUT ${POT_FILE}
   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/update-unity-pot
 )