From b17d256761ef244bacbadd37f661bfe92ed6972e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Wed, 27 Jun 2018 21:12:08 +0200
Subject: [PATCH] fix use of findLocale
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
---
lib/private/L10N/Factory.php | 2 +-
lib/private/TemplateLayout.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
index b8774c2f74e..d824fa461e7 100644
--- a/lib/private/L10N/Factory.php
+++ b/lib/private/L10N/Factory.php
@@ -126,7 +126,7 @@ class Factory implements IFactory {
}
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
index be81608f074..5e6719593a3 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -135,7 +135,7 @@ class TemplateLayout extends \OC_Template {
$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)) {
--
GitLab