diff options
| author | patdenice <patdenice@piwigo.org> | 2011-03-04 10:41:36 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2011-03-04 10:41:36 +0000 |
| commit | 2e44cc79de44f10abc217becac00a3b76e3079bb (patch) | |
| tree | f596b26b7fd6b57fcc63ba505e689293f3dae03d /install | |
| parent | 5b9f42b785d0fe97b8645aaa3eb69e898f6eb7fb (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-- | install.php | 8 | ||||
| -rw-r--r-- | install/db/90-database.php | 2 | ||||
| -rw-r--r-- | install/php5_apache_configuration.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/install.php b/install.php index d613b8c95..c74780dea 100644 --- a/install.php +++ b/install.php @@ -192,7 +192,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)) { @@ -340,7 +340,7 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment) pwg_query($query); // fill languages table - foreach ($languages->get_fs_languages() as $language_code => $language_name) + foreach ($languages->get_fs_languages() as $language_code => $fs_language) { $languages->perform_action('activate', $language_code); } @@ -417,13 +417,13 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment) //------------------------------------------------------ start template output $dbengines = available_engines(); -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); diff --git a/install/db/90-database.php b/install/db/90-database.php index c908c4fd5..e911cc879 100644 --- a/install/db/90-database.php +++ b/install/db/90-database.php @@ -49,7 +49,7 @@ include_once(PHPWG_ROOT_PATH.'admin/include/languages.class.php'); $languages = new languages(PWG_CHARSET); -foreach ($languages->fs_languages as $language_code => $language_name) +foreach ($languages->fs_languages as $language_code => $fs_language) { $languages->perform_action('activate', $language_code); } diff --git a/install/php5_apache_configuration.php b/install/php5_apache_configuration.php index f3768be32..8fc7f8021 100644 --- a/install/php5_apache_configuration.php +++ b/install/php5_apache_configuration.php @@ -174,10 +174,10 @@ else <td>'.l10n('Language').'</td> <td> <select name="language" onchange="document.location = \''.$script.'.php?language=\'+this.options[this.selectedIndex].value;">'; - foreach ($languages->fs_languages as $code => $name) + foreach ($languages->fs_languages as $code => $fs_language) { echo ' - <option label="'.$name.'" value="'.$code.'" '.($code == $language ? 'selected="selected"' : '') .'>'.$name.'</option>'; + <option label="'.$fs_language['name'].'" value="'.$code.'" '.($code == $language ? 'selected="selected"' : '') .'>'.$fs_language['name'].'</option>'; } echo ' </select> |