This commit is contained in:
Vojtěch Sajdl
2018-01-03 14:15:45 +01:00
parent e7df74cad8
commit 9820686776
9 changed files with 50 additions and 36 deletions
+11 -9
View File
@@ -5,6 +5,17 @@ function mb_ucfirst($string)
return mb_strtoupper(mb_substr($string, 0, 1)).mb_strtolower(mb_substr($string, 1));
}
$accepted_langs = glob(__DIR__ . '/locale/*' , GLOB_ONLYDIR);
$lang_names = array();
foreach ($accepted_langs as $key => $value) {
$accepted_langs[$key] = basename($value);
}
foreach ($accepted_langs as $lang) {
$lang_names[$lang] = mb_ucfirst(locale_get_display_language($lang, $lang));
}
if (!isset($_SESSION['locale'])||isset($_GET['lang']))
{
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
@@ -29,11 +40,6 @@ if (!isset($_SESSION['locale'])||isset($_GET['lang']))
$langs = array_flip($langs);
$accepted_langs = glob(__DIR__ . '/locale/*' , GLOB_ONLYDIR);
$lang_names = array();
foreach ($accepted_langs as $key => $value) {
$accepted_langs[$key] = basename($value);
}
$best_match = false;
@@ -56,10 +62,6 @@ if (!isset($_SESSION['locale'])||isset($_GET['lang']))
}
}
foreach ($accepted_langs as $lang) {
$lang_names[$lang] = mb_ucfirst(locale_get_display_language($lang, $lang));
}
if ($best_match === false){
$best_match = DEFAULT_LANGUAGE;
}