Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 17:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* auto detected browser language in select language on install

Browse Source
This commit is contained in:
slawkens 2019-04-19 23:04:16 +02:00
parent 0d5b9c2f98
commit 162777bb46
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install/includes/locale.php
View File

@ -8,9 +8,9 @@ if(isset($_POST['lang']))
if(isset($_COOKIE['locale']))
{
$locale_ = $_COOKIE['locale'];
$lang_size = strlen($locale_);
if(!$lang_size || $lang_size > 4 || !preg_match("/[a-z]/", $locale_)) // validate locale
$detected_locale = $_COOKIE['locale'];
$lang_size = strlen($detected_locale);
if(!$lang_size || $lang_size > 4 || !preg_match("/[a-z]/", $detected_locale)) // validate locale
$_COOKIE['locale'] = "en";
}
else
@ -18,7 +18,7 @@ else
// detect locale
$locale_s = get_browser_languages();
if(!count($locale_s))
$locale_ = 'en';
$detected_locale = 'en';
else
{
foreach($locale_s as $id => $tmp)
@ -26,27 +26,26 @@ else
$tmp_file = LOCALE . $tmp;
if(@file_exists($tmp_file))
{
$locale_ = $tmp;
$detected_locale = $tmp;
break;
}
}
}
if(!isset($locale_))
$locale_ = 'en';
if(!isset($detected_locale))
$detected_locale = 'en';
}
require LOCALE . 'en/main.php';
require LOCALE . 'en/install.php';
$file_main = LOCALE . $locale_ . '/main.php';
$file_main = LOCALE . $detected_locale . '/main.php';
if(!file_exists($file_main))
$file_main = LOCALE . 'en/main.php';
$file_install = LOCALE . $locale_ . '/install.php';
$file_install = LOCALE . $detected_locale . '/install.php';
if(!file_exists($file_install))
$file_install = LOCALE . 'en/install.php';
require $file_main;
require $file_install;
?>

1
install/steps/1-welcome.php
View File

@ -23,6 +23,7 @@ else {
'locales' => $locales,
'locale' => $locale,
'cookie_locale' => @$_COOKIE['locale'],
'detected_locale' => @$detected_locale,
'buttons' => next_buttons(false, true)
));
}

2
system/templates/install.welcome.html.twig
View File

@ -3,7 +3,7 @@
<div class="input"><p>{{ locale.step_welcome_desc }}</p>
<select name="lang">
{% for locale_ in locales %}
<option value="{{ locale_.id }}"{% if cookie_locale == locale_.id %} selected{% endif %}>{{ locale_.name }}</option>
<option value="{{ locale_.id }}"{% if (detected_locale is not null and locale_.id == detected_locale) or cookie_locale == locale_.id %} selected{% endif %}>{{ locale_.name }}</option>
{% endfor %}
</select>
</div>