Commit 53d46849 authored by sunil's avatar sunil

reverted setlocale related changes

parent 89f6a90f
......@@ -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)
......
......@@ -602,9 +602,8 @@ class CRM_Core_I18n {
}
// for sql queries
global $dbLocale, $tsLocale;
global $dbLocale;
$dbLocale = "_{$language}";
$tsLocale = $language;
}
......
......@@ -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;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment