diff options
author | Georg Ehrke <developer@georgehrke.com> | 2018-06-27 21:12:08 +0200 |
---|---|---|
committer | Georg Ehrke <developer@georgehrke.com> | 2018-06-27 21:52:19 +0200 |
commit | b17d256761ef244bacbadd37f661bfe92ed6972e (patch) | |
tree | 27f2b3869259e482cb085a858818ecfe837e9085 /lib | |
parent | 9157086c23c8a82479084cc2c12a98f5f726ef5f (diff) | |
download | nextcloud-server-b17d256761ef244bacbadd37f661bfe92ed6972e.tar.gz nextcloud-server-b17d256761ef244bacbadd37f661bfe92ed6972e.zip |
fix use of findLocale
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/L10N/Factory.php | 2 | ||||
-rw-r--r-- | 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)) { |