Merge lp:~pete-woods/indicator-sound/gettext into lp:indicator-sound/13.10

Proposed by Pete Woods on 2013-10-01
Status: Merged
Approved by: Charles Kerr on 2013-10-01
Approved revision: 385
Merged at revision: 386
Proposed branch: lp:~pete-woods/indicator-sound/gettext
Merge into: lp:indicator-sound/13.10
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~pete-woods/indicator-sound/gettext
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-10-01
Charles Kerr (community) 2013-10-01 Approve on 2013-10-01
Review via email: mp+188618@code.launchpad.net

Commit message

Fix translation support

dh_translations doesn't perform variable substitution when parsing the CMakeLists.txt file

Description of the change

Fix translation support

dh_translations doesn't perform variable substitution when parsing the CMakeLists.txt file

To post a comment you must log in.
Charles Kerr (charlesk) wrote :

Pete, indicator-network, indicator-location, and indicator-session all use "set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})" too.

Is this fix a one-off workaround only for i-sound, or should it be copied to these other packages too?

Pete Woods (pete-woods) wrote :

> Pete, indicator-network, indicator-location, and indicator-session all use
> "set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})" too.
>
> Is this fix a one-off workaround only for i-sound, or should it be copied to
> these other packages too?

You're absolutely correct - it should be copied to the others.

Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-09-25 21:07:05 +0000
3+++ CMakeLists.txt 2013-10-01 14:47:42 +0000
4@@ -4,7 +4,7 @@
5 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
6
7 set(PACKAGE ${CMAKE_PROJECT_NAME})
8-set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
9+set(GETTEXT_PACKAGE indicator-sound)
10 set(GNOMELOCALEDIR "${CMAKE_INSTALL_FULL_DATADIR}/locale")
11
12 add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" )

Subscribers

People subscribed via source and target branches