diff --git a/browse_foreigners.php b/browse_foreigners.php index 5e55f81d8..0b389da3b 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -73,10 +73,7 @@ if (is_array($foreignData['disp_row'])) { } ?> - + phpMyAdmin diff --git a/index.php b/index.php index b4a12029c..840ccf57c 100644 --- a/index.php +++ b/index.php @@ -92,10 +92,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1]; include ('./libraries/header_http.inc.php'); ?> - + diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 93b567a56..0738e0344 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -213,13 +213,6 @@ if (top != self) { PMA_Message::rawError($conn_error)->display(); } - // Displays the languages form - if (empty($GLOBALS['cfg']['Lang'])) { - require_once './libraries/display_select_lang.lib.php'; - // use fieldset, don't show doc link - PMA_select_language(true, false); - } - ?>
diff --git a/libraries/config.default.php b/libraries/config.default.php index d7a4373f4..354818e06 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2061,8 +2061,10 @@ $cfg['DefaultConnectionCollation'] = 'utf8_general_ci'; /** * Force: always use this language - * $cfg['Lang'] = 'en'; - * + */ +$cfg['Lang'] = 'en'; + +/** * Regular expression to limit listed languages, e.g. '^(cs|en)' for Czech and * English only * diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index a5878fc03..117eac19a 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -32,7 +32,7 @@ if ($GLOBALS['text_dir'] == 'ltr') { ?> - + diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 055d5f58d..f566ee52d 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -39,7 +39,7 @@ if ($text_dir == 'ltr') { } ?> - + diff --git a/main.php b/main.php index 0b0de1a26..98b27baef 100644 --- a/main.php +++ b/main.php @@ -119,14 +119,6 @@ echo '
'; echo '

' . __('Appearance Settings') . '

'; echo '