use formal version of German if default_language is set to 'de_DE'

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
nextcloud · Nov 30, 2017 · 8b73434 · 8b73434
1 parent 49ec86a
commit 8b73434
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 3 deletions.
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
@@ -260,7 +260,7 @@ private function getLanguageFromRequest($app) {
 
  foreach ($available as $available_language) {
  if ($preferred_language === strtolower($available_language)) {
- return $available_language;
+ return $this->respectDefaultLanguage($app, $available_language);
  }
  }
 
@@ -276,6 +276,30 @@ private function getLanguageFromRequest($app) {
  throw new LanguageNotFoundException();
  }
 
+ /**
+ * if default language is set to de_DE (formal German) this should be
+ * preferred to 'de' (non-formal German) if possible
+ *
+ * @param string|null $app
+ * @param string $lang
+ * @return string
+ */
+ protected function respectDefaultLanguage($app, $lang) {
+ $result = $lang;
+ $defaultLanguage = $this->config->getSystemValue('default_language', false);
+
+ // use formal version of german ("Sie" instead of "Du") if the default
+ // language is set to 'de_DE' if possible
+ if (strtolower($lang) === 'de'
+ && strtolower($defaultLanguage) === 'de_de' &&
+ $this->languageExists($app, 'de_DE')
+ ) {
+ $result = 'de_DE';
+ }
+
+ return $result;
+ }
+
  /**
  * Checks if $sub is a subdirectory of $parent
  *

diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php
@@ -368,12 +368,17 @@ public function dataSetLanguageFromRequest() {
  * @param string $expected
  */
  public function testGetLanguageFromRequest($app, $header, array $availableLanguages, $expected) {
- $factory = $this->getFactory(['findAvailableLanguages']);
+ $factory = $this->getFactory(['findAvailableLanguages', 'respectDefaultLanguage']);
  $factory->expects($this->once())
  ->method('findAvailableLanguages')
  ->with($app)
  ->willReturn($availableLanguages);
 
+ $factory->expects($this->any())
+ ->method('respectDefaultLanguage')->willReturnCallback(function($app, $lang) {
+ return $lang;
+ });
+
  $this->request->expects($this->once())
  ->method('getHeader')
  ->with('ACCEPT_LANGUAGE')
@@ -497,7 +502,7 @@ public function testFindLanguage($loggedIn, $availableLang, $expected) {
  ->with($this->equalTo('ACCEPT_LANGUAGE'))
  ->willReturn($browserLang);
 
- $factory = $this->getFactory(['languageExists', 'findAvailableLanguages']);
+ $factory = $this->getFactory(['languageExists', 'findAvailableLanguages', 'respectDefaultLanguage']);
  $factory->expects($this->any())
  ->method('languageExists')
  ->will($this->returnCallback(function ($app, $lang) use ($availableLang) {
@@ -508,9 +513,44 @@ public function testFindLanguage($loggedIn, $availableLang, $expected) {
  ->will($this->returnCallback(function ($app) use ($availableLang) {
  return $availableLang;
  }));
+ $factory->expects($this->any())
+ ->method('respectDefaultLanguage')->willReturnCallback(function($app, $lang) {
+ return $lang;
+ });
 
  $lang = $factory->findLanguage(null);
  $this->assertSame($expected, $lang);
 
  }
+
+ public function dataTestRespectDefaultLanguage() {
+ return [
+ ['de', 'de_DE', true, 'de_DE'],
+ ['de', 'de', true, 'de'],
+ ['de', false, true, 'de'],
+ ['fr', 'de_DE', true, 'fr'],
+ ];
+ }
+
+ /**
+ * test if we respect default language if possible
+ *
+ * @dataProvider dataTestRespectDefaultLanguage
+ *
+ * @param string $lang
+ * @param string $defaultLanguage
+ * @param bool $langExists
+ * @param string $expected
+ */
+ public function testRespectDefaultLanguage($lang, $defaultLanguage, $langExists, $expected) {
+ $factory = $this->getFactory(['languageExists']);
+ $factory->expects($this->any())
+ ->method('languageExists')->willReturn($langExists);
+ $this->config->expects($this->any())
+ ->method('getSystemValue')->with('default_language', false)->willReturn($defaultLanguage);
+
+ $result = $this->invokePrivate($factory, 'respectDefaultLanguage', ['app', $lang]);
+ $this->assertSame($expected, $result);
+ }
+
 }