Merge pull request #25054 from owncloud/issue-24536-language-name-reused-for-fallback-languages-stable9

[stable9] Do not use the language name, when it's not the one from the language…

1 files changed, 3 insertions, 2 deletions

diff --git a/settings/personal.php b/settings/personal.php
index 62a718985f8..244cd7eb581 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -76,8 +76,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