nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Factor out code for getting language name.

Browse Source
This commit is contained in:
Michal Čihař
2010-04-09 15:14:54 +02:00
parent f5a11a3f64
commit 7337fe5a0c
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/display_select_lang.lib.php
View File

@@ -62,13 +62,7 @@ function PMA_select_language($use_fieldset = FALSE, $show_doc = TRUE) {
uasort($GLOBALS['available_languages'], 'PMA_language_cmp');
foreach ($GLOBALS['available_languages'] as $id => $tmplang) {
$lang_name = ucfirst(substr(strrchr($tmplang[0], '|'), 1));
// Include native name if non empty
if (!empty($tmplang[2])) {
$lang_name = $tmplang[2] . ' - '
. $lang_name;
}
$lang_name = PMA_langName($tmplang);
//Is current one active?
if ($lang == $id) {

14
libraries/select_lang.lib.php
View File

@@ -10,6 +10,20 @@ if (! defined('PHPMYADMIN')) {
exit;
}
/**
* Returns language name
*/
function PMA_langName($tmplang) {
$lang_name = ucfirst(substr(strrchr($tmplang[0], '|'), 1));
// Include native name if non empty
if (!empty($tmplang[2])) {
$lang_name = $tmplang[2] . ' - ' . $lang_name;
}
return $lang_name;
}
/**
* tries to find the language to use
*

14
setup/frames/index.inc.php
View File

@@ -74,13 +74,7 @@ if (!$is_https) {
// create language list
$lang_list = array();
foreach ($all_languages as $each_lang_key => $each_lang) {
$lang_name = ucfirst(substr(strrchr($each_lang[0], '|'), 1));
// Include native name if non empty
if (!empty($each_lang[2])) {
$lang_name = $each_lang[2] . ' - ' . $lang_name;
}
$lang_name = PMA_langName($each_lang);
//Is current one active?
$selected = ($GLOBALS['lang'] == $each_lang_key) ? ' selected="selected"' : '';
echo '<option value="' . $each_lang_key . '"' . $selected . '>' . $lang_name
@@ -172,11 +166,7 @@ $opts = array(
'values' => array(),
'values_escaped' => true);
foreach ($all_languages as $each_lang_key => $each_lang) {
$lang_name = ucfirst(substr(strrchr($each_lang[0], '|'), 1));
// Include native name if non empty
if (!empty($each_lang[2])) {
$lang_name = $each_lang[2] . ' - ' . $lang_name;
}
$lang_name = PMA_langName($each_lang);
$opts['values'][$each_lang_key] = $lang_name;
}
display_input('DefaultLang', $GLOBALS['strSetupDefaultLanguage'], '', 'select',