reverted setlocale related changes

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 39506c65b72534c124ee956b86714fb114131ff7..e2a708c3dc74c1c089a0a554c05bb93e6a22c5b4 100644 (file)
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -212,7 +212,8 @@ class CRM_Core_BAO_ConfigSetting {
     $dbLocale = $multiLang ? "_{$chosenLocale}" : '';
 
     // FIXME: an ugly hack to fix CRM-4041
-    CRM_Core_I18n::setLocale($chosenLocale);
+    global $tsLocale;
+    $tsLocale = $chosenLocale;
 
     // FIXME: as bad aplace as any to fix CRM-5428
     // (to be moved to a sane location along with the above)

diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index 18601e287ca4698ebc61ed52cfe97708171d2044..8cde4f692fee48bce06021ba51c6b857e94ac309 100644 (file)
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -602,9 +602,8 @@ class CRM_Core_I18n {
     }
 
     // for sql queries
-    global $dbLocale, $tsLocale;
+    global $dbLocale;
     $dbLocale = "_{$language}";
-    $tsLocale = $language;
 
   }
 

diff --git a/Civi/API/Subscriber/I18nSubscriber.php b/Civi/API/Subscriber/I18nSubscriber.php
index b87f8fbed792edcab1eb8d7dfe0c7dbd23bac9b4..11b72e9cecc656681f9e46872d18086612a20a36 100644 (file)
--- a/Civi/API/Subscriber/I18nSubscriber.php
+++ b/Civi/API/Subscriber/I18nSubscriber.php
@@ -102,7 +102,8 @@ class I18nSubscriber implements EventSubscriberInterface {
         $dbLocale = $multiLang && $lcMessages ? "_{$lcMessages}" : '';
 
         // FIXME: an ugly hack to fix CRM-4041
-        \CRM_Core_I18n::setLocale($lcMessages);
+        global $tsLocale;
+        $tsLocale = $lcMessages;
       }
     }
   }