From 1b5797a4e52f67e4d9ea0fe7e2c20bd14f94ade1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 1 Jun 2016 17:07:51 +0200
Subject: [PATCH] Do not use the language name, when it's not the one from the
language we want
---
settings/personal.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/settings/personal.php b/settings/personal.php
index 3d294acaccf..0b2781fb21b 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -81,8 +81,9 @@ $commonLanguages = array();
foreach($languageCodes as $lang) {
$l = \OC::$server->getL10N('settings', $lang);
// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
- if(substr($l->t('__language_name__'), 0, 1) !== '_') {//first check if the language name is in the translation file
- $ln=array('code'=>$lang, 'name'=> (string)$l->t('__language_name__'));
+ $potentialName = (string) $l->t('__language_name__');
+ if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+ $ln=array('code'=>$lang, 'name'=> $potentialName);
}elseif(isset($languageNames[$lang])) {
$ln=array('code'=>$lang, 'name'=>$languageNames[$lang]);
}else{//fallback to language code
--
GitLab