Merge branch 'master' into develop

This commit is contained in:
Pierre Rudloff 2017-10-12 23:49:51 +02:00
commit a665422e53
2 changed files with 5 additions and 2 deletions

View file

@ -63,7 +63,9 @@ class LocaleManager
$process->run();
$installedLocales = explode(PHP_EOL, trim($process->getOutput()));
foreach ($this->supportedLocales as $supportedLocale) {
if (in_array($supportedLocale, $installedLocales)) {
if (in_array($supportedLocale, $installedLocales)
|| in_array($supportedLocale.'.utf8', $installedLocales)
) {
$return[] = new Locale($supportedLocale);
}
}