Merge pull request #18598 from owncloud/proper-language-l10n

Add comment for language name and remove unneeded fallbacks

2 files changed, 1 insertions, 28 deletions

diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index e5fe9ff29ad..729cc3c6af3 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -25,48 +25,22 @@
  */
 
 return array(
-'bg_BG'=>'български език',
-'ca'=>'Català',
-'cs_CZ'=>'Čeština',
-'da'=>'Dansk',
-'de'=>'Deutsch (Persönlich)',
-'de_DE'=>'Deutsch (Förmlich)',
 'el'=>'Ελληνικά',
-'en'=>'English',
-'es'=>'Español',
-'et_EE'=>'Eesti',
 'fa'=>'فارسى',
 'fi_FI'=>'Suomi',
-'fr'=>'Français',
 'hi'=>'हिन्दी',
 'id'=>'Bahasa Indonesia',
-'it'=>'Italiano',
 'lb'=>'Lëtzebuergesch',
-//'l10n-de'=>'',
 'ms_MY'=>'Bahasa Melayu',
 'nb_NO'=>'Norwegian Bokmål',
-'nl'=>'Nederlands',
-'pl'=>'Polski',
 'pt_BR'=>'Português brasileiro',
 'pt_PT'=>'Português',
 'ro'=>'română',
-'ru'=>'Русский язык',
-'sr'=>'Српски',
 'sr@latin'=>'Srpski',
 'sv'=>'Svenska',
-'zh_CN'=>'简体中文',
-'sk_SK'=>'Slovenčina',
 'hu_HU'=>'Magyar',
-'eu'=>'Euskara',
-'lt_LT'=>'Lietuvių',
-'eo'=>'Esperanto',
-'tr'=>'Türkçe',
 'hr'=>'Hrvatski',
 'ar'=>'العربية',
-'he'=>'עִבְרִית,',
-'ia'=>'Interlingua',
-'sl'=>'Slovenski',
-'nn_NO'=>'Nynorsk',
 'lv'=>'Latviešu',
 'mk'=>'македонски',
 'uk'=>'Українська',
@@ -76,9 +50,7 @@ return array(
 'bn_BD'=>'Bengali',
 'ta_LK'=>'தமிழ்',
 'zh_HK'=>'繁體中文（香港）',
-'oc'=>'Occitan (post 1500)',
 'is'=>'Icelandic',
-'pl_PL'=>'Polski',
 'ka_GE'=>'Georgian for Georgia',
 'ku_IQ'=>'Kurdish Iraq',
 'si_LK'=>'Sinhala',
diff --git a/settings/personal.php b/settings/personal.php
index bbbba3b5b8d..32944de7200 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -71,6 +71,7 @@ $languages=array();
 $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__'));
 	}elseif(isset($languageNames[$lang])) {