Indicator Location

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

  1. lp-1318980-fix-translation-install-dir
  2. Merge into trunk.14.04
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 77
Merged at revision: 77
Proposed branch: lp:~charlesk/indicator-location/lp-1318980-fix-translation-install-dir
Merge into: lp:indicator-location/14.04
Diff against target: 12 lines (+1/-1)
1 file modified
cmake/Translations.cmake (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-location/lp-1318980-fix-translation-install-dir
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+220458@code.launchpad.net

Commit message

Install translations into the correct directories.

Description of the change

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

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/unity/indicators/com.canonical.indicator.location
-- Installing: /tmp/test-install/share/locale/it/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/sl/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/ms/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/ckb/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/fa/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/ug/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/ca/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/nb/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/es/LC_MESSAGES/indicator-location.mo
-- Installing: /tmp/test-install/share/locale/cs/LC_MESSAGES/indicator-location.mo

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/Translations.cmake'
2--- cmake/Translations.cmake 2013-08-26 20:38:29 +0000
3+++ cmake/Translations.cmake 2014-05-21 14:17:15 +0000
4@@ -10,7 +10,7 @@
5 add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
6
7 install (FILES ${MO_OUTPUT} DESTINATION
8- ${CMAKE_INSTALL_LOCALEDIR}/LC_MESSAGES
9+ ${CMAKE_INSTALL_LOCALEDIR}/${PO_INPUT_BASE}/LC_MESSAGES
10 RENAME ${NLS_PACKAGE}.mo)
11 endforeach (PO_INPUT ${PO_FILES})
12 endmacro(add_translations_directory)

Subscribers

People subscribed via source and target branches