Merge lp:~charlesk/indicator-session/lp-1318980-fix-translation-install-dir into lp:indicator-session/14.04

[Charles Kerr]

Install translations into the correct directories.

(This is identical to the indicator-location change at https://code.launchpad.net/~charlesk/indicator-location/lp-1318980-fix-translation-install-dir/+merge/220458)

Copy indicator-datetime/cmake/Translations.cmake into this package so that .mo files will be installed into the correct directory.

After applying this patch, "cmake -DCMAKE_INSTALL_PREFIX=/tmp/test-install" + "make install" looks like:

-- Installing: /tmp/test-install/share/locale/sc/LC_MESSAGES/indicator-session.mo
-- Installing: /tmp/test-install/share/locale/ur/LC_MESSAGES/indicator-session.mo
-- Installing: /tmp/test-install/share/locale/si/LC_MESSAGES/indicator-session.mo
-- Installing: /tmp/test-install/share/locale/lv/LC_MESSAGES/indicator-session.mo
-- Installing: /tmp/test-install/share/locale/ro/LC_MESSAGES/indicator-session.mo
-- Installing: /tmp/test-install/share/locale/pt/LC_MESSAGES/indicator-session.mo
-- Installing: /tmp/test-install/share/locale/gu/LC_MESSAGES/indicator-session.mo

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/137/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

Unmerged revisions

=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2013-07-02 00:26:11 +0000
+++ cmake/Translations.cmake	2014-05-21 14:10:32 +0000
@@ -10,7 +10,7 @@
         add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
 
         install (FILES ${MO_OUTPUT} DESTINATION
-            ${CMAKE_INSTALL_LOCALEDIR}/LC_MESSAGES
+            ${CMAKE_INSTALL_LOCALEDIR}/${PO_INPUT_BASE}/LC_MESSAGES
             RENAME ${NLS_PACKAGE}.mo)
     endforeach (PO_INPUT ${PO_FILES})
 endmacro(add_translations_directory)