nupplaPhil/friendica-directory
1
0
Fork 0
forked from friendica/friendica-directory
Code Issues Pull requests Releases Wiki Activity

Restore full local name in settings

Browse source 
- Fallback to two-letter language code for translation if locale isn't found
- Rename L10n::langToString to L10n::localeToLanguageString
- Use setlocale() with the selected locale
This commit is contained in:
Hypolite Petovan 2018-11-18 10:38:17 -05:00
commit e8752c7631
7 changed files with 75 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/middleware.php
View file

@ -14,6 +14,12 @@ $middleware = new LocalizationMiddleware(
);
$middleware->setLocaleCallback(function (string $locale) use ($container) {
setlocale(LC_ALL, $locale);
setlocale(LC_ALL, $locale . '.utf8');
setlocale(LC_ALL, $locale . '.UTF8');
setlocale(LC_ALL, $locale . '.utf-8');
setlocale(LC_ALL, $locale . '.UTF-8');
$langPath = $container->get('settings')['i18n']['path'];
$translator = $container->get('l10n');
@ -27,11 +33,19 @@ $middleware->setLocaleCallback(function (string $locale) use ($container) {
$translator->loadDomain('strings', $langPath);
} else {
$lang = substr($locale, 0, 2);
/** @var $translator \Gettext\Translator */
if (file_exists($langPath . '/' . $locale . '/LC_MESSAGES/strings.mo')) {
$translator->loadTranslations(Gettext\Translations::fromMoFile($langPath . '/' . $locale . '/LC_MESSAGES/strings.mo'));
} elseif (file_exists($langPath . '/' . $locale . '/LC_MESSAGES/strings.po')) {
$translator->loadTranslations(Gettext\Translations::fromPoFile($langPath . '/' . $locale . '/LC_MESSAGES/strings.po'));
} elseif (file_exists($langPath . '/' . $lang . '/LC_MESSAGES/strings.mo')) {
// Defaulting to language superset
$translator->loadTranslations(Gettext\Translations::fromMoFile($langPath . '/' . $lang . '/LC_MESSAGES/strings.mo'));
} elseif (file_exists($langPath . '/' . $lang . '/LC_MESSAGES/strings.po')) {
// Defaulting to language superset
$translator->loadTranslations(Gettext\Translations::fromPoFile($langPath . '/' . $lang . '/LC_MESSAGES/strings.po'));
}
}
});