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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2018-05-07 02:13:12 +02:00
commit 7df655f2c9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/classes/LanguageManager.php
View File

@ -822,8 +822,8 @@ class LanguageManager
public function selectLanguage()
{
// check forced language
if (! empty($GLOBALS['cfg']['Lang'])) {
$lang = $this->getLanguage($GLOBALS['cfg']['Lang']);
if (! empty($GLOBALS['PMA_Config']->get('Lang'))) {
$lang = $this->getLanguage($GLOBALS['PMA_Config']->get('Lang'));
if ($lang !== false) {
return $lang;
}
@ -883,8 +883,8 @@ class LanguageManager
}
// Didn't catch any valid lang : we use the default settings
if (isset($langs[$GLOBALS['cfg']['DefaultLang']])) {
return $langs[$GLOBALS['cfg']['DefaultLang']];
if (isset($langs[$GLOBALS['PMA_Config']->get('DefaultLang')])) {
return $langs[$GLOBALS['PMA_Config']->get('DefaultLang')];
}
// Fallback to English

9
test/classes/LanguageTest.php
View File

@ -158,25 +158,25 @@ class LanguageTest extends PmaTestCase
*/
public function testSelect($lang, $post, $get, $cookie, $accept, $agent, $default, $expect)
{
$GLOBALS['cfg']['Lang'] = $lang;
$GLOBALS['PMA_Config']->set('Lang', $lang);
$_POST['lang'] = $post;
$_GET['lang'] = $get;
$_COOKIE['pma_lang'] = $cookie;
$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $accept;
$_SERVER['HTTP_USER_AGENT'] = $agent;
$GLOBALS['cfg']['DefaultLang'] = $default;
$GLOBALS['PMA_Config']->set('DefaultLang', $default);
$lang = $this->manager->selectLanguage();
$this->assertEquals($expect, $lang->getEnglishName());
$GLOBALS['cfg']['Lang'] = '';
$GLOBALS['PMA_Config']->set('Lang', '');
$_POST['lang'] = '';
$_GET['lang'] = '';
$_COOKIE['pma_lang'] = '';
$_SERVER['HTTP_ACCEPT_LANGUAGE'] = '';
$_SERVER['HTTP_USER_AGENT'] = '';
$GLOBALS['cfg']['DefaultLang'] = 'en';
$GLOBALS['PMA_Config']->set('DefaultLang', 'en');
}
/**
@ -191,6 +191,7 @@ class LanguageTest extends PmaTestCase
array('', 'cs', '', '' ,'' ,'', '', 'Czech'),
array('', 'cs', 'en', '' ,'' ,'', '', 'Czech'),
array('', '', 'cs', '' ,'' ,'', '', 'Czech'),
array('', '', '', 'cs' ,'' ,'', '', 'Czech'),
array('', '', '', '' ,'cs,en-US;q=0.7,en;q=0.3' ,'', '', 'Czech'),
array(
'', '', '', '', '',