From 6d4601fe66a5377a8d80ca84e94ae924771193c8 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Mon, 22 Jul 2019 15:56:59 +0100
Subject: [PATCH] Updates used languages and fixes loading them.

---
 lang/languages.json                           | 14 ++--
 .../base/i18n/BuiltinLanguages.native.js      | 84 +++++++++++++------
 react/features/base/i18n/i18next.js           |  2 +-
 3 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/lang/languages.json b/lang/languages.json
index 3ced106d3..998cd4560 100644
--- a/lang/languages.json
+++ b/lang/languages.json
@@ -1,27 +1,31 @@
 {
     "en": "English",
     "af": "Afrikaans",
-    "az": "Azerbaijani",
     "bg": "Bulgarian",
+    "ca": "Catalan",
     "cs": "Czech",
     "de": "German",
     "el": "Greek",
+    "enGB": "English (United Kingdom)",
     "eo": "Esperanto",
     "es": "Spanish",
+    "esUS": "Spanish (Latin America)",
+    "fi": "Finnish",
     "fr": "French",
+    "frCA": "French (Canadian)",
+    "hr": "Croatian",
     "hy": "Armenian",
     "it": "Italian",
     "ja": "Japanese",
     "ko": "Korean",
-    "nb": "Norwegian Bokmal",
+    "nl": "Dutch",
     "oc": "Occitan",
     "pl": "Polish",
     "ptBR": "Portuguese (Brazil)",
     "ru": "Russian",
-    "sk": "Slovak",
-    "sl": "Slovenian",
     "sv": "Swedish",
     "tr": "Turkish",
     "vi": "Vietnamese",
-    "zhCN": "Chinese (China)"
+    "zhCN": "Chinese (China)",
+    "zhTW": "Chinese (Taiwan)"
 }
diff --git a/react/features/base/i18n/BuiltinLanguages.native.js b/react/features/base/i18n/BuiltinLanguages.native.js
index 4558e009a..9aefdaa72 100644
--- a/react/features/base/i18n/BuiltinLanguages.native.js
+++ b/react/features/base/i18n/BuiltinLanguages.native.js
@@ -7,6 +7,12 @@ import i18next from 'i18next';
  */
 const _LANGUAGES = {
 
+    // Afrikaans
+    'af': {
+        languages: require('../../../../lang/languages-af'),
+        main: require('../../../../lang/main-af')
+    },
+
     // Bulgarian
     'bg': {
         languages: require('../../../../lang/languages-bg'),
@@ -19,6 +25,12 @@ const _LANGUAGES = {
         main: require('../../../../lang/main-de')
     },
 
+    // English (United Kingdom)
+    'enGB': {
+        languages: require('../../../../lang/languages-enGB'),
+        main: require('../../../../lang/main-enGB')
+    },
+
     // Esperanto
     'eo': {
         languages: require('../../../../lang/languages-eo'),
@@ -31,16 +43,34 @@ const _LANGUAGES = {
         main: require('../../../../lang/main-es')
     },
 
+    // Spanish (Latin America)
+    'esUS': {
+        languages: require('../../../../lang/languages-esUS'),
+        main: require('../../../../lang/main-esUS')
+    },
+
+    // Finnish
+    'fi': {
+        languages: require('../../../../lang/languages-fi'),
+        main: require('../../../../lang/main-fi')
+    },
+
     // French
     'fr': {
         languages: require('../../../../lang/languages-fr'),
         main: require('../../../../lang/main-fr')
     },
 
-    // Armenian
-    'hy': {
-        languages: require('../../../../lang/languages-hy'),
-        main: require('../../../../lang/main-hy')
+    // French (Canadian)
+    'frCA': {
+        languages: require('../../../../lang/languages-frCA'),
+        main: require('../../../../lang/main-frCA')
+    },
+
+    // Croatian
+    'hr': {
+        languages: require('../../../../lang/languages-hr'),
+        main: require('../../../../lang/main-hr')
     },
 
     // Italian
@@ -49,10 +79,22 @@ const _LANGUAGES = {
         main: require('../../../../lang/main-it')
     },
 
-    // Norwegian Bokmal
-    'nb': {
-        languages: require('../../../../lang/languages-nb'),
-        main: require('../../../../lang/main-nb')
+    // Japanese
+    'ja': {
+        languages: require('../../../../lang/languages-ja'),
+        main: require('../../../../lang/main-ja')
+    },
+
+    // Korean
+    'ko': {
+        languages: require('../../../../lang/languages-ko'),
+        main: require('../../../../lang/main-ko')
+    },
+
+    // Dutch
+    'nl': {
+        languages: require('../../../../lang/languages-nl'),
+        main: require('../../../../lang/main-nl')
     },
 
     // Occitan
@@ -79,34 +121,28 @@ const _LANGUAGES = {
         main: require('../../../../lang/main-ru')
     },
 
-    // Slovak
-    'sk': {
-        languages: require('../../../../lang/languages-sk'),
-        main: require('../../../../lang/main-sk')
-    },
-
-    // Slovenian
-    'sl': {
-        languages: require('../../../../lang/languages-sl'),
-        main: require('../../../../lang/main-sl')
-    },
-
     // Swedish
     'sv': {
         languages: require('../../../../lang/languages-sv'),
         main: require('../../../../lang/main-sv')
     },
 
-    // Turkish
-    'tr': {
-        languages: require('../../../../lang/languages-tr'),
-        main: require('../../../../lang/main-tr')
+    // Vietnamese
+    'vi': {
+        languages: require('../../../../lang/languages-vi'),
+        main: require('../../../../lang/main-vi')
     },
 
     // Chinese (China)
     'zhCN': {
         languages: require('../../../../lang/languages-zhCN'),
         main: require('../../../../lang/main-zhCN')
+    },
+
+    // Chinese (Taiwan)
+    'zhTW': {
+        languages: require('../../../../lang/languages-zhTW'),
+        main: require('../../../../lang/main-zhTW')
     }
 };
 
diff --git a/react/features/base/i18n/i18next.js b/react/features/base/i18n/i18next.js
index f2aaf34cf..9390880b9 100644
--- a/react/features/base/i18n/i18next.js
+++ b/react/features/base/i18n/i18next.js
@@ -41,7 +41,7 @@ const options = {
         (typeof interfaceConfig !== 'undefined' && interfaceConfig.APP_NAME)
             || 'Jitsi Meet',
     backend: {
-        loadPath: 'lang/__ns__-__lng__.json'
+        loadPath: 'lang/{{ns}}-{{lng}}.json'
     },
     defaultNS: 'main',
     fallbackLng: DEFAULT_LANGUAGE,