cleanup
This commit is contained in:
@@ -29,31 +29,18 @@ function PMA_select_language($use_fieldset = FALSE) {
|
|||||||
|
|
||||||
<form method="post" action="index.php" target="_parent">
|
<form method="post" action="index.php" target="_parent">
|
||||||
<?php
|
<?php
|
||||||
if (isset($GLOBALS['collation_connection'])) {
|
$_form_params = array(
|
||||||
echo ' <input type="hidden" name="collation_connection" value="'
|
'db' => $GLOBALS['db'],
|
||||||
. htmlspecialchars($GLOBALS['collation_connection']) . '" />' . "\n";
|
'table' => $GLOBALS['table'],
|
||||||
}
|
);
|
||||||
if (isset($GLOBALS['convcharset'])) {
|
echo PMA_generate_common_hidden_inputs($_form_params);
|
||||||
echo ' <input type="hidden" name="convcharset" value="'
|
|
||||||
. htmlspecialchars($GLOBALS['convcharset']) . '" />' . "\n";
|
|
||||||
}
|
|
||||||
if (strlen($GLOBALS['db'])) {
|
|
||||||
echo ' <input type="hidden" name="db" value="'
|
|
||||||
. htmlspecialchars($GLOBALS['db']) . '" />' . "\n";
|
|
||||||
}
|
|
||||||
if (strlen($GLOBALS['table'])) {
|
|
||||||
echo ' <input type="hidden" name="table" value="'
|
|
||||||
. htmlspecialchars($GLOBALS['table']) . '" />' . "\n";
|
|
||||||
}
|
|
||||||
if (isset($GLOBALS['server'])) {
|
|
||||||
echo ' <input type="hidden" name="server" value="'
|
|
||||||
. ((int)$GLOBALS['server']) . '" />' . "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
$language_title = $GLOBALS['strLanguage'] . ($GLOBALS['strLanguage'] != 'Language' ? ' - Language' : '') . ' <a href="./translators.html" target="documentation">' .
|
$language_title = $GLOBALS['strLanguage']
|
||||||
($cfg['ReplaceHelpImg'] ?
|
. ($GLOBALS['strLanguage'] != 'Language' ? ' - Language' : '')
|
||||||
'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />' :
|
. ' <a href="./translators.html" target="documentation">' .
|
||||||
'(*)') . '</a>';
|
($cfg['ReplaceHelpImg']
|
||||||
|
? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />'
|
||||||
|
: '(*)') . '</a>';
|
||||||
if ($use_fieldset) {
|
if ($use_fieldset) {
|
||||||
echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>';
|
echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>';
|
||||||
} else {
|
} else {
|
||||||
@@ -65,7 +52,7 @@ function PMA_select_language($use_fieldset = FALSE) {
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
uasort($GLOBALS['available_languages'], 'PMA_language_cmp');
|
uasort($GLOBALS['available_languages'], 'PMA_language_cmp');
|
||||||
foreach ($GLOBALS['available_languages'] AS $id => $tmplang) {
|
foreach ($GLOBALS['available_languages'] as $id => $tmplang) {
|
||||||
$lang_name = ucfirst(substr(strrchr($tmplang[0], '|'), 1));
|
$lang_name = ucfirst(substr(strrchr($tmplang[0], '|'), 1));
|
||||||
|
|
||||||
// Include native name if non empty
|
// Include native name if non empty
|
||||||
@@ -74,12 +61,6 @@ function PMA_select_language($use_fieldset = FALSE) {
|
|||||||
. $lang_name;
|
. $lang_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Include charset if it makes sense
|
|
||||||
// (no longer need this I guess)
|
|
||||||
//if (!defined('PMA_REMOVED_NON_UTF_8')) {
|
|
||||||
// $lang_name .= ' (' . substr($id, strpos($id, '-') + 1) . ')';
|
|
||||||
//}
|
|
||||||
|
|
||||||
//Is current one active?
|
//Is current one active?
|
||||||
if ($lang == $id) {
|
if ($lang == $id) {
|
||||||
$selected = ' selected="selected"';
|
$selected = ' selected="selected"';
|
||||||
|
Reference in New Issue
Block a user