projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15422 from artfulrobot/queue-parallel
[civicrm-core.git]
/
CRM
/
Core
/
I18n.php
diff --git
a/CRM/Core/I18n.php
b/CRM/Core/I18n.php
index 357dc2f936715ea8d00db74362c962431a52e0a3..b41f89c3372f95cba1d313b1abaa190e46062546 100644
(file)
--- a/
CRM/Core/I18n.php
+++ b/
CRM/Core/I18n.php
@@
-611,6
+611,17
@@
class CRM_Core_I18n {
return (in_array($short, $rtl));
}
return (in_array($short, $rtl));
}
+ /**
+ * If you switch back/forth between locales/drivers, it may be necessary
+ * to reset some options.
+ */
+ protected function reactivate() {
+ if ($this->_nativegettext) {
+ $this->setNativeGettextLocale($this->locale);
+ }
+
+ }
+
/**
* Change the processing language without changing the current user language
*
/**
* Change the processing language without changing the current user language
*
@@
-623,15
+634,6
@@
class CRM_Core_I18n {
// Change the language of the CMS as well, for URLs.
CRM_Utils_System::setUFLocale($locale);
// Change the language of the CMS as well, for URLs.
CRM_Utils_System::setUFLocale($locale);
- // change the gettext ressources
- if ($this->_nativegettext) {
- $this->setNativeGettextLocale($locale);
- }
- else {
- // phpgettext
- $this->setPhpGettextLocale($locale);
- }
-
// For sql queries, if running in DB multi-lingual mode.
global $dbLocale;
// For sql queries, if running in DB multi-lingual mode.
global $dbLocale;
@@
-642,6
+644,8
@@
class CRM_Core_I18n {
// For self::getLocale()
global $tsLocale;
$tsLocale = $locale;
// For self::getLocale()
global $tsLocale;
$tsLocale = $locale;
+
+ CRM_Core_I18n::singleton()->reactivate();
}
/**
}
/**