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

Merge pull request #23541 from owncloud/backport-23515-menu-language 

[9.0] Fix the translations of the User menu
This commit is contained in:
Thomas Müller 2016-04-04 16:47:39 +02:00
parent 85a0dd3689 a381cbc241
commit 4da4163d14
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/l10n/factory.php
View File

@ -95,20 +95,18 @@ class Factory implements IFactory {
if ($lang !== null) {
$lang = str_replace(array('\0', '/', '\\', '..'), '', (string) $lang);
}
$key = $lang;
if ($key === null || !$this->languageExists($app, $lang)) {
$key = 'null';
if ($lang === null || !$this->languageExists($app, $lang)) {
$lang = $this->findLanguage($app);
}
if (!isset($this->instances[$key][$app])) {
$this->instances[$key][$app] = new L10N(
if (!isset($this->instances[$lang][$app])) {
$this->instances[$lang][$app] = new L10N(
$this, $app, $lang,
$this->getL10nFilesForApp($app, $lang)
);
}
return $this->instances[$key][$app];
return $this->instances[$lang][$app];
}
/**