mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9579 from nextcloud/bugfix_stable13/noid/fix_force_language_html_attr 

[stable13] make sure force language is reflected in html lang attribute
This commit is contained in:
Morris Jobke 2018-05-24 17:59:58 +02:00 committed by GitHub
parent cef2e190a1 930c11a6cd
commit 866568d4d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/L10N/Factory.php
View File

@ -126,6 +126,11 @@ class Factory implements IFactory {
* @return string language If nothing works it returns 'en'
*/
public function findLanguage($app = null) {
$forceLang = $this->config->getSystemValue('force_language', false);
if (is_string($forceLang)) {
$this->requestLanguage = $forceLang;
}
if ($this->requestLanguage !== '' && $this->languageExists($app, $this->requestLanguage)) {
return $this->requestLanguage;
}

50
tests/lib/L10N/FactoryTest.php
View File

@ -110,7 +110,12 @@ class FactoryTest extends TestCase {
->with('MyApp', 'de')
->willReturn(false);
$this->config
->expects($this->once())
->expects($this->at(0))
->method('getSystemValue')
->with('force_language', false)
->willReturn(false);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('installed', false)
->willReturn(true);
@ -144,7 +149,12 @@ class FactoryTest extends TestCase {
->with('MyApp', 'de')
->willReturn(false);
$this->config
->expects($this->at(0))
->expects($this->at(0))
->method('getSystemValue')
->with('force_language', false)
->willReturn(false);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('installed', false)
->willReturn(true);
@ -167,7 +177,7 @@ class FactoryTest extends TestCase {
->with('MyApp', 'jp')
->willReturn(false);
$this->config
->expects($this->at(2))
->expects($this->at(3))
->method('getSystemValue')
->with('default_language', false)
->willReturn('es');
@ -187,7 +197,12 @@ class FactoryTest extends TestCase {
->with('MyApp', 'de')
->willReturn(false);
$this->config
->expects($this->at(0))
->expects($this->at(0))
->method('getSystemValue')
->with('force_language', false)
->willReturn(false);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('installed', false)
->willReturn(true);
@ -210,7 +225,7 @@ class FactoryTest extends TestCase {
->with('MyApp', 'jp')
->willReturn(false);
$this->config
->expects($this->at(2))
->expects($this->at(3))
->method('getSystemValue')
->with('default_language', false)
->willReturn('es');
@ -233,7 +248,12 @@ class FactoryTest extends TestCase {
->with('MyApp', 'de')
->willReturn(false);
$this->config
->expects($this->at(0))
->expects($this->at(0))
->method('getSystemValue')
->with('force_language', false)
->willReturn(false);
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('installed', false)
->willReturn(true);
@ -256,7 +276,7 @@ class FactoryTest extends TestCase {
->with('MyApp', 'jp')
->willReturn(false);
$this->config
->expects($this->at(2))
->expects($this->at(3))
->method('getSystemValue')
->with('default_language', false)
->willReturn('es');
@ -273,6 +293,22 @@ class FactoryTest extends TestCase {
$this->assertSame('en', $factory->findLanguage('MyApp'));
}
public function testFindLanguageWithForcedLanguage() {
$factory = $this->getFactory(['languageExists']);
$this->config
->expects($this->at(0))
->method('getSystemValue')
->with('force_language', false)
->willReturn('de');
$factory->expects($this->once())
->method('languageExists')
->with('MyApp', 'de')
->willReturn(true);
$this->assertSame('de', $factory->findLanguage('MyApp'));
}
/**
* @dataProvider dataFindAvailableLanguages
*