From b9095515a6065e11fc18e613c394edf0f8c44288 Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@opensides.be>
Date: Fri, 7 Sep 2018 10:49:52 +0000
Subject: [PATCH] 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

(cherry picked from commit 595a62696a11b68586334da7f831164a60dd7e0c)

de11ec69 :sparkles: feat(locales) Add the language Afrikaans (South Africa) (af_ZA) Chinese (Taiwan) (zh_TW)
---
 include/class_Language.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/class_Language.inc b/include/class_Language.inc
index d15453854..966181080 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -137,6 +137,7 @@ class Language
     /* locales in english */
     $tmp_english = array(
       'en_US' => 'English',
+      'af_ZA' => 'Afrikaans',
       'ar_EG' => 'Arabic',
       'ca_ES' => 'Catalan',
       'cs_CZ' => 'Czech',
@@ -163,6 +164,7 @@ class Language
       'sv_SE' => 'Swedish',
       'tr_TR' => 'Turkish',
       'vi_VN' => 'Vietnamese',
+      'zh_TW' => 'Taiwanese',
       'zh_CN' => 'Chinese',
     );
 
@@ -172,6 +174,7 @@ class Language
       $tmp_ownlang = array(
         'en_US' => 'English',
         'ar_EG' => 'عربية',
+        'af_ZA' => 'Afrikaans',
         'ca_ES' => 'Català',
         'cs_CZ' => 'ÄŒesky',
         'de_DE' => 'Deutsch',
@@ -197,6 +200,7 @@ class Language
         'sv_SE' => 'Svenska',
         'tr_TR' => 'Türkçe',
         'vi_VN' => 'Tiếng Việt',
+        'zh_TW' => 'Taiwanese',
         'zh_CN' => '中文, 汉语, 漢語',
       );
 
-- 
GitLab