fix use of findLocale

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
nextcloud · Jun 27, 2018 · b17d256 · b17d256
1 parent 9157086
commit b17d256
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
@@ -126,7 +126,7 @@ public function get($app, $lang = null, $locale = null) {
 		}
 
 		if ($locale === null || !$this->localeExists($locale)) {
-			$locale = $this->findLocale($app, $lang);
+			$locale = $this->findLocale($lang);
 		}
 
 		if (!isset($this->instances[$lang][$app])) {

diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -135,7 +135,7 @@ public function __construct( $renderAs, $appId = '' ) {
 		$lang = \OC::$server->getL10NFactory()->findLanguage();
 		$lang = str_replace('_', '-', $lang);
 		$this->assign('language', $lang);
-		$this->assign('locale', \OC::$server->getL10NFactory()->findLocale());
+		$this->assign('locale', \OC::$server->getL10NFactory()->findLocale($lang));
 
 		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
 			if (empty(self::$versionHash)) {