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

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

1 files changed, 25 insertions, 1 deletions

diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
index 399bebb8189..150b36cec44 100644
--- a/lib/private/L10N/Factory.php
+++ b/lib/private/L10N/Factory.php
@@ -260,7 +260,7 @@ class Factory implements IFactory {
 
 				foreach ($available as $available_language) {
 					if ($preferred_language === strtolower($available_language)) {
-						return $available_language;
+						return $this->respectDefaultLanguage($app, $available_language);
 					}
 				}
 
@@ -277,6 +277,30 @@ class Factory implements IFactory {
 	}
 
 	/**
+	 * 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
 	 *
 	 * @param string $sub