Merge lp:~artmello/gallery-app/gallery-app-load_translations into lp:gallery-app

Proposed by Arthur Mello
Status: Merged
Merged at revision: 1038
Proposed branch: lp:~artmello/gallery-app/gallery-app-load_translations
Merge into: lp:gallery-app
Diff against target: 27 lines (+4/-4)
1 file modified
CMakeLists.txt (+4/-4)
To merge this branch: bzr merge lp:~artmello/gallery-app/gallery-app-load_translations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+230186@code.launchpad.net

Commit message

Fix definition on GETTEXT_PACKAGE on CMakeLists to make translations works for click pkgs

Description of the change

Fix definition on GETTEXT_PACKAGE on CMakeLists to make translations works for click pkgs

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

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 2014-05-06 18:52:41 +0000
3+++ CMakeLists.txt 2014-08-08 21:29:39 +0000
4@@ -63,13 +63,9 @@
5 set(CMAKE_INSTALL_PREFIX /)
6 set(CMAKE_INSTALL_BINDIR /)
7 set(GALLERY_DIR "")
8- set(GETTEXT_PACKAGE "${APP_PACKAGE_NAME}")
9 add_definitions("-DCLICK_MODE=1")
10 else(CLICK_MODE)
11 set(GALLERY_DIR ${CMAKE_INSTALL_DATADIR}/${GALLERY})
12- # for dh_translations to extract the domain
13- # (regarding syntax consistency, see http://pad.lv/1181187)
14- set (GETTEXT_PACKAGE "${GALLERY}")
15 endif(CLICK_MODE)
16
17 file(GLOB_RECURSE I18N_SRC_FILES
18@@ -77,6 +73,10 @@
19 rc/**.qml desktop/**.desktop.in)
20 list(SORT I18N_SRC_FILES)
21
22+# for dh_translations to extract the domain
23+# (regarding syntax consistency, see http://pad.lv/1181187)
24+set (GETTEXT_PACKAGE "${GALLERY}")
25+
26 # Tests
27 enable_testing()
28

Subscribers

People subscribed via source and target branches