aboutsummaryrefslogtreecommitdiffstats
path: root/upgrade.php
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-03-04 10:41:36 +0000
committerpatdenice <patdenice@piwigo.org>2011-03-04 10:41:36 +0000
commit2e44cc79de44f10abc217becac00a3b76e3079bb (patch)
treef596b26b7fd6b57fcc63ba505e689293f3dae03d /upgrade.php
parent5b9f42b785d0fe97b8645aaa3eb69e898f6eb7fb (diff)
feature:2210
Improve language management. git-svn-id: http://piwigo.org/svn/trunk@9518 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--upgrade.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/upgrade.php b/upgrade.php
index 391119303..ef2476e3a 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -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);