sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make sure force language is reflected in html lang attribute 

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
pull/9580/head
Georg Ehrke 2018-05-09 12:05:46 +07:00
parent b9584e1b25
commit 0dc1b3e741
No known key found for this signature in database
GPG Key ID: 9D98FD9380A1CB43
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/L10N/Factory.php
Unescape Escape View File

@ -130,6 +130,12 @@ class Factory implements IFactory {
return $this->requestLanguage;
}
$forceLang = $this->config->getSystemValue('force_language', false);
if (is_string($forceLang) && $this->languageExists($app, $forceLang)) {
$this->requestLanguage = $forceLang;
return $forceLang;
}
/**
* At this point Nextcloud might not yet be installed and thus the lookup
* in the preferences table might fail. For this reason we need to check

50
tests/lib/L10N/FactoryTest.php
Unescape Escape 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
*