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

[Alexandre Abreu]

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

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

[Chris Coulson (chrisccoulson)]

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

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-05 23:19:31 +0000
+++ CMakeLists.txt	2014-09-15 21:03:18 +0000
@@ -65,6 +65,10 @@
   enable_testing()
 endif()
 
+# for dh_translations to extract the domain
+# (regarding syntax consistency, see http://pad.lv/1181187)
+set(GETTEXT_PACKAGE "oxide-${OXIDE_BUILD}")
+
 # Import the configuration for this build
 include(${CMAKE_SOURCE_DIR}/${OXIDE_BUILD}/config.cmake)
 
@@ -129,6 +133,7 @@
 else()
   list(APPEND _GYP_COMMAND -Denable_chromedriver_build=0)
 endif()
+list(APPEND GYP_COMMAND -Doxide_gettext_domain=${GETTEXT_PACKAGE})
 
 if(CMAKE_CROSSCOMPILING)
   if(NOT CHROMIUM_C_HOST_COMPILER OR NOT CHROMIUM_CXX_HOST_COMPILER OR NOT CHROMIUM_HOST_AR)
@@ -176,9 +181,6 @@
      ${OXIDE_BUILD}/**.cc shared/**.cc)
 list(SORT I18N_SRC_FILES)
 
-# for dh_translations to extract the domain
-# (regarding syntax consistency, see http://pad.lv/1181187)
-set(GETTEXT_PACKAGE "oxide-${OXIDE_BUILD}")
 add_subdirectory(po)
 
 add_subdirectory(${OXIDE_BUILD})
 
=== modified file 'shared/browser/oxide_browser_context.cc'
--- shared/browser/oxide_browser_context.cc	2014-09-11 20:15:31 +0000
+++ shared/browser/oxide_browser_context.cc	2014-09-15 21:03:18 +0000
@@ -213,7 +213,7 @@
         popup_blocker_enabled(true),
         host_mapping_rules(params.host_mapping_rules) {
 
-   accept_langs = dgettext("oxide", "AcceptLanguage");
+   accept_langs = dgettext(OXIDE_GETTEXT_DOMAIN, "AcceptLanguage");
    if (accept_langs == "AcceptLanguage") {
      accept_langs = kDefaultAcceptLanguage;
    }
 
=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2014-09-02 10:34:20 +0000
+++ shared/shared.gyp	2014-09-15 21:03:18 +0000
@@ -173,7 +173,8 @@
         '<(DEPTH)/ui/accessibility/accessibility.gyp:accessibility',
       ],
       'defines': [
-        'OXIDE_SUBPROCESS_PATH=\"<(oxide_subprocess_path)\"'
+        'OXIDE_SUBPROCESS_PATH=\"<(oxide_subprocess_path)\"',
+        'OXIDE_GETTEXT_DOMAIN=\"<(oxide_gettext_domain)\"'
       ],
       'dependencies': [
         'oxide_packed_resources',