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

Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

Browse Source
This commit is contained in:
Weblate 2017-06-01 14:36:05 +02:00
commit e7a6eadcee
2 changed files with 8 additions and 2584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2582
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

10
test/classes/LanguageTest.php
View File

@ -35,6 +35,12 @@ class LanguageTest extends PMATestCase
$this->manager = new LanguageManager();
}
public function tearDown()
{
// Ensure we have English locale after tests
$this->manager->getLanguage('en')->activate();
}
/**
* Test language filtering
*
@ -42,11 +48,11 @@ class LanguageTest extends PMATestCase
*/
public function testAvailable()
{
$GLOBALS['cfg']['FilterLanguages'] = 'cs';
$GLOBALS['cfg']['FilterLanguages'] = 'cs|en$';
$langs = $this->manager->availableLocales();
$this->assertEquals(1, count($langs));
$this->assertEquals(2, count($langs));
$this->assertContains('cs', $langs);
$GLOBALS['cfg']['FilterLanguages'] = '';
}