diff --git a/src/ChurchCRM/Bootstrapper.php b/src/ChurchCRM/Bootstrapper.php index f0cb6c953f..b4f339e67d 100644 --- a/src/ChurchCRM/Bootstrapper.php +++ b/src/ChurchCRM/Bootstrapper.php @@ -105,7 +105,7 @@ private static function ConfigureLocale() $localeInfo = Bootstrapper::GetCurrentLocale(); self::$bootStrapLogger->debug("Setting locale to: " . $localeInfo->getLocale()); - setlocale(LC_ALL, $localeInfo->getLocale()); + setlocale(LC_ALL, $localeInfo->getLocale(), $localeInfo->getLocale().'.UTF-8', $localeInfo->getLocale().'.utf8'); // Get numeric and monetary locale settings. $aLocaleInfo = $localeInfo->getLocaleInfo(); diff --git a/src/SystemSettings.php b/src/SystemSettings.php index a614784652..626162c630 100644 --- a/src/SystemSettings.php +++ b/src/SystemSettings.php @@ -67,7 +67,7 @@ // If changing the locale, translate the menu options if ($id == 39 && $value != Bootstrapper::GetCurrentLocale()->getLocale()) { $localeInfo = new LocaleInfo($value, AuthenticationManager::GetCurrentUser()->getSetting("ui.locale")); - setlocale(LC_ALL, $localeInfo->getLocale()); + setlocale(LC_ALL, $localeInfo->getLocale(), $localeInfo->getLocale().'.UTF-8', $localeInfo->getLocale().'.utf8'); $aLocaleInfo = $localeInfo->getLocaleInfo(); }