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

Merge pull request #2423 from nextcloud/fix-language-names 

Fix naming of languages
This commit is contained in:
Lukas Reschke 2016-12-01 13:39:17 +01:00 committed by GitHub
parent e4fa5b28a3 01a62dee30
commit 1eab2a63c6
3 changed files with 3 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
settings/languageCodes.php
View File

@ -1,63 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Brice Maron <brice@bmaron.net>
* @author Jan-Christoph Borchardt <hey@jancborchardt.net>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Pellaeon Lin <nfsmwlin@gmail.com>
* @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
return array(
'el'=>'Ελληνικά',
'en'=>'English',
'fa'=>'فارسى',
'fi_FI'=>'Suomi',
'hi'=>'हिन्दी',
'id'=>'Bahasa Indonesia',
'lb'=>'Lëtzebuergesch',
'ms_MY'=>'Bahasa Melayu',
'nb_NO'=>'Norwegian Bokmål',
'pt_BR'=>'Português brasileiro',
'pt_PT'=>'Português',
'ro'=>'română',
'sr@latin'=>'Srpski',
'sv'=>'Svenska',
'hu_HU'=>'Magyar',
'hr'=>'Hrvatski',
'ar'=>'العربية',
'lv'=>'Latviešu',
'mk'=>'македонски',
'uk'=>'Українська',
'vi'=>'Tiếng Việt',
'zh_TW'=>'正體中文（臺灣）',
'af_ZA'=> 'Afrikaans',
'bn_BD'=>'Bengali',
'ta_LK'=>'தமிழ்',
'zh_HK'=>'繁體中文（香港）',
'is'=>'Icelandic',
'ka_GE'=>'Georgian for Georgia',
'ku_IQ'=>'Kurdish Iraq',
'si_LK'=>'Sinhala',
'be'=>'Belarusian',
'ka'=>'Kartuli (Georgian)',
'my_MM'=>'Burmese - MYANMAR ',
'ur_PK' =>'Urdu (Pakistan)'
);

5
settings/personal.php
View File

@ -79,7 +79,6 @@ $commonLangCodes = array(
'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko' 'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
); );
$languageNames=include 'languageCodes.php';
$languages=array(); $languages=array();
$commonLanguages = array(); $commonLanguages = array();
foreach($languageCodes as $lang) { foreach($languageCodes as $lang) {
@ -88,8 +87,8 @@ foreach($languageCodes as $lang) {
$potentialName = (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 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); $ln = array('code' => $lang, 'name' => $potentialName);
}elseif(isset($languageNames[$lang])) { } elseif ($lang === 'en') {
$ln=array('code'=>$lang, 'name'=>$languageNames[$lang]); $ln = ['code' => $lang, 'name' => 'English'];
}else{//fallback to language code }else{//fallback to language code
$ln=array('code'=>$lang, 'name'=>$lang); $ln=array('code'=>$lang, 'name'=>$lang);
} }

68
tests/Settings/languageCodesTest.php
View File

@ -1,68 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Tests\Settings;
use Test\TestCase;
class languageCodesTest extends TestCase {
public function test() {
$languageArray = include_once __DIR__ . '/../../settings/languageCodes.php';
$expected = [
'el'=>'Ελληνικά',
'en'=>'English',
'fa'=>'فارسى',
'fi_FI'=>'Suomi',
'hi'=>'हिन्दी',
'id'=>'Bahasa Indonesia',
'lb'=>'Lëtzebuergesch',
'ms_MY'=>'Bahasa Melayu',
'nb_NO'=>'Norwegian Bokmål',
'pt_BR'=>'Português brasileiro',
'pt_PT'=>'Português',
'ro'=>'română',
'sr@latin'=>'Srpski',
'sv'=>'Svenska',
'hu_HU'=>'Magyar',
'hr'=>'Hrvatski',
'ar'=>'العربية',
'lv'=>'Latviešu',
'mk'=>'македонски',
'uk'=>'Українська',
'vi'=>'Tiếng Việt',
'zh_TW'=>'正體中文（臺灣）',
'af_ZA'=> 'Afrikaans',
'bn_BD'=>'Bengali',
'ta_LK'=>'தமிழ்',
'zh_HK'=>'繁體中文（香港）',
'is'=>'Icelandic',
'ka_GE'=>'Georgian for Georgia',
'ku_IQ'=>'Kurdish Iraq',
'si_LK'=>'Sinhala',
'be'=>'Belarusian',
'ka'=>'Kartuli (Georgian)',
'my_MM'=>'Burmese - MYANMAR ',
'ur_PK' =>'Urdu (Pakistan)',
];
$this->assertSame($expected, $languageArray);
}
}