feature:2210

Improve language management.

git-svn-id: http://piwigo.org/svn/trunk@9518 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2011-03-04 10:41:36 +00:00
parent 5b9f42b785
commit 2e44cc79de
7 changed files with 91 additions and 33 deletions

View file

@ -159,7 +159,7 @@ else
{
$language = 'en_UK';
// Try to get browser language
foreach ($languages->fs_languages as $language_code => $language_name)
foreach ($languages->fs_languages as $language_code => $fs_language)
{
if (substr($language_code,0,2) == @substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2))
{
@ -400,13 +400,13 @@ else
include_once(PHPWG_ROOT_PATH.'admin/include/languages.class.php');
$languages = new languages();
foreach ($languages->fs_languages as $language_code => $language_name)
foreach ($languages->fs_languages as $language_code => $fs_language)
{
if ($language == $language_code)
{
$template->assign('language_selection', $language_code);
}
$languages_options[$language_code] = $language_name;
$languages_options[$language_code] = $fs_language['name'];
}
$template->assign('language_options', $languages_options);