mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix use of findLocale 

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
This commit is contained in:
Georg Ehrke 2018-06-27 21:12:08 +02:00
parent 9157086c23
commit b17d256761
No known key found for this signature in database
GPG Key ID: 9D98FD9380A1CB43
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/L10N/Factory.php
View File

@ -126,7 +126,7 @@ class Factory implements IFactory {
} }
if ($locale === null || !$this->localeExists($locale)) { if ($locale === null || !$this->localeExists($locale)) {
$locale = $this->findLocale($app, $lang); $locale = $this->findLocale($lang);
} }
if (!isset($this->instances[$lang][$app])) { if (!isset($this->instances[$lang][$app])) {

2
lib/private/TemplateLayout.php
View File

@ -135,7 +135,7 @@ class TemplateLayout extends \OC_Template {
$lang = \OC::$server->getL10NFactory()->findLanguage(); $lang = \OC::$server->getL10NFactory()->findLanguage();
$lang = str_replace('_', '-', $lang); $lang = str_replace('_', '-', $lang);
$this->assign('language', $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(\OC::$server->getSystemConfig()->getValue('installed', false)) {
if (empty(self::$versionHash)) { if (empty(self::$versionHash)) {