From: Mathieu Lutfy <mathieu@bidon.ca>
Date: Fri, 2 May 2014 00:27:51 +0000 (-0400)
Subject: CRM-13068: load .mo files from l10n/xx_XX/LC_MESSAGES/civicrm.mo
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b395e3c0ecca40ab0e03efe161ae81fcd3b4510e;p=civicrm-core.git

CRM-13068: load .mo files from l10n/xx_XX/LC_MESSAGES/civicrm.mo

Since 4.3, CiviCRM supports two gettext implementations: phpgettext
(default) and native gettext. The performance of native gettext is
much better, but requires a specific file hierarchy and that the
operating system has support for the locale (dpkg-reconfigure locale).

Now that the release scripts package the files as:
l10n/xx_XX/LC_MESSAGES/civicrm.mo, instead of
l10n/xx_XX/civicrm.mo, we needed to modify phpgettext to load the
files from the new directory. However, we also support the old
hierarchy as a fallback, so that we do not break the build scripts
of people who do not use phpgettext.
---

diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index 3daf48efc3..e1ca11a95e 100644
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -78,10 +78,20 @@ class CRM_Core_I18n {
       }
 
       // Otherwise, use PHP-gettext
+      // we support both the old file hierarchy format and the new:
+      // pre-4.5:  civicrm/l10n/xx_XX/civicrm.mo
+      // post-4.5: civicrm/l10n/xx_XX/LC_MESSAGES/civicrm.mo
       require_once 'PHPgettext/streams.php';
       require_once 'PHPgettext/gettext.php';
 
-      $streamer = new FileReader($config->gettextResourceDir . $locale . DIRECTORY_SEPARATOR . 'civicrm.mo');
+      $mo_file = $config->gettextResourceDir . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR . 'civicrm.mo';
+
+      if (! file_exists($mo_file)) {
+        // fallback to pre-4.5 mode
+        $mo_file = $config->gettextResourceDir . $locale . DIRECTORY_SEPARATOR . 'civicrm.mo';
+      }
+
+      $streamer = new FileReader($mo_file);
       $this->_phpgettext = new gettext_reader($streamer);
     }
   }