Oxide

Merge lp:~abreu-alexandre/oxide/gettext-domain-oxide-qt into lp:~oxide-developers/oxide/oxide.trunk

  1. gettext-domain-oxide-qt
  2. Merge into oxide.trunk
Proposed by Alexandre Abreu
Status: Merged
Merged at revision: 754
Proposed branch: lp:~abreu-alexandre/oxide/gettext-domain-oxide-qt
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 59 lines (+8/-5)
3 files modified
CMakeLists.txt (+5/-3)
shared/browser/oxide_browser_context.cc (+1/-1)
shared/shared.gyp (+2/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/oxide/gettext-domain-oxide-qt
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+234744@code.launchpad.net

Commit message

Make the gexttext domain, "oxide-qt", a proper preprocessor variable instead of a hardcoded constant.

Description of the change

Make the gexttext domain, "oxide-qt", a proper preprocessor variable instead of a hardcoded constant.

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) wrote :

Thanks, feel free to merge this (and in to the 1.2 branch)

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 2014-09-05 23:19:31 +0000
3+++ CMakeLists.txt 2014-09-15 21:03:18 +0000
4@@ -65,6 +65,10 @@
5 enable_testing()
6 endif()
7
8+# for dh_translations to extract the domain
9+# (regarding syntax consistency, see http://pad.lv/1181187)
10+set(GETTEXT_PACKAGE "oxide-${OXIDE_BUILD}")
11+
12 # Import the configuration for this build
13 include(${CMAKE_SOURCE_DIR}/${OXIDE_BUILD}/config.cmake)
14
15@@ -129,6 +133,7 @@
16 else()
17 list(APPEND _GYP_COMMAND -Denable_chromedriver_build=0)
18 endif()
19+list(APPEND GYP_COMMAND -Doxide_gettext_domain=${GETTEXT_PACKAGE})
20
21 if(CMAKE_CROSSCOMPILING)
22 if(NOT CHROMIUM_C_HOST_COMPILER OR NOT CHROMIUM_CXX_HOST_COMPILER OR NOT CHROMIUM_HOST_AR)
23@@ -176,9 +181,6 @@
24 ${OXIDE_BUILD}/**.cc shared/**.cc)
25 list(SORT I18N_SRC_FILES)
26
27-# for dh_translations to extract the domain
28-# (regarding syntax consistency, see http://pad.lv/1181187)
29-set(GETTEXT_PACKAGE "oxide-${OXIDE_BUILD}")
30 add_subdirectory(po)
31
32 add_subdirectory(${OXIDE_BUILD})
33
34=== modified file 'shared/browser/oxide_browser_context.cc'
35--- shared/browser/oxide_browser_context.cc 2014-09-11 20:15:31 +0000
36+++ shared/browser/oxide_browser_context.cc 2014-09-15 21:03:18 +0000
37@@ -213,7 +213,7 @@
38 popup_blocker_enabled(true),
39 host_mapping_rules(params.host_mapping_rules) {
40
41- accept_langs = dgettext("oxide", "AcceptLanguage");
42+ accept_langs = dgettext(OXIDE_GETTEXT_DOMAIN, "AcceptLanguage");
43 if (accept_langs == "AcceptLanguage") {
44 accept_langs = kDefaultAcceptLanguage;
45 }
46
47=== modified file 'shared/shared.gyp'
48--- shared/shared.gyp 2014-09-02 10:34:20 +0000
49+++ shared/shared.gyp 2014-09-15 21:03:18 +0000
50@@ -173,7 +173,8 @@
51 '<(DEPTH)/ui/accessibility/accessibility.gyp:accessibility',
52 ],
53 'defines': [
54- 'OXIDE_SUBPROCESS_PATH=\"<(oxide_subprocess_path)\"'
55+ 'OXIDE_SUBPROCESS_PATH=\"<(oxide_subprocess_path)\"',
56+ 'OXIDE_GETTEXT_DOMAIN=\"<(oxide_gettext_domain)\"'
57 ],
58 'dependencies': [
59 'oxide_packed_resources',

Subscribers

People subscribed via source and target branches