Commit 595a6269 authored by bmortier's avatar bmortier
Browse files

Merge branch...

Merge branch '5885-add-the-language-afrikaans-south-africa-af_za-chinese-taiwan-zh_tw' into '1.4-dev'

Resolve "Add the language Afrikaans (South Africa) (af_ZA) Chinese (Taiwan) (zh_TW)"

Closes #5885

See merge request fusiondirectory/fd!390
Showing with 4 additions and 0 deletions
+4 -0
...@@ -137,6 +137,7 @@ class Language ...@@ -137,6 +137,7 @@ class Language
/* locales in english */ /* locales in english */
$tmp_english = array( $tmp_english = array(
'en_US' => 'English', 'en_US' => 'English',
'af_ZA' => 'Afrikaans',
'ar_EG' => 'Arabic', 'ar_EG' => 'Arabic',
'ca_ES' => 'Catalan', 'ca_ES' => 'Catalan',
'cs_CZ' => 'Czech', 'cs_CZ' => 'Czech',
...@@ -163,6 +164,7 @@ class Language ...@@ -163,6 +164,7 @@ class Language
'sv_SE' => 'Swedish', 'sv_SE' => 'Swedish',
'tr_TR' => 'Turkish', 'tr_TR' => 'Turkish',
'vi_VN' => 'Vietnamese', 'vi_VN' => 'Vietnamese',
'zh_TW' => 'Taiwanese',
'zh_CN' => 'Chinese', 'zh_CN' => 'Chinese',
); );
...@@ -172,6 +174,7 @@ class Language ...@@ -172,6 +174,7 @@ class Language
$tmp_ownlang = array( $tmp_ownlang = array(
'en_US' => 'English', 'en_US' => 'English',
'ar_EG' => 'عربية', 'ar_EG' => 'عربية',
'af_ZA' => 'Afrikaans',
'ca_ES' => 'Català', 'ca_ES' => 'Català',
'cs_CZ' => 'Česky', 'cs_CZ' => 'Česky',
'de_DE' => 'Deutsch', 'de_DE' => 'Deutsch',
...@@ -197,6 +200,7 @@ class Language ...@@ -197,6 +200,7 @@ class Language
'sv_SE' => 'Svenska', 'sv_SE' => 'Svenska',
'tr_TR' => 'Türkçe', 'tr_TR' => 'Türkçe',
'vi_VN' => 'Tiếng Việt', 'vi_VN' => 'Tiếng Việt',
'zh_TW' => 'Taiwanese',
'zh_CN' => '中文, 汉语, 漢語', 'zh_CN' => '中文, 汉语, 漢語',
); );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment