Parcourir la source

Updates used languages and fixes loading them.

j8
damencho il y a 6 ans
Parent
révision
6d4601fe66

+ 9
- 5
lang/languages.json Voir le fichier

@@ -1,27 +1,31 @@
1 1
 {
2 2
     "en": "English",
3 3
     "af": "Afrikaans",
4
-    "az": "Azerbaijani",
5 4
     "bg": "Bulgarian",
5
+    "ca": "Catalan",
6 6
     "cs": "Czech",
7 7
     "de": "German",
8 8
     "el": "Greek",
9
+    "enGB": "English (United Kingdom)",
9 10
     "eo": "Esperanto",
10 11
     "es": "Spanish",
12
+    "esUS": "Spanish (Latin America)",
13
+    "fi": "Finnish",
11 14
     "fr": "French",
15
+    "frCA": "French (Canadian)",
16
+    "hr": "Croatian",
12 17
     "hy": "Armenian",
13 18
     "it": "Italian",
14 19
     "ja": "Japanese",
15 20
     "ko": "Korean",
16
-    "nb": "Norwegian Bokmal",
21
+    "nl": "Dutch",
17 22
     "oc": "Occitan",
18 23
     "pl": "Polish",
19 24
     "ptBR": "Portuguese (Brazil)",
20 25
     "ru": "Russian",
21
-    "sk": "Slovak",
22
-    "sl": "Slovenian",
23 26
     "sv": "Swedish",
24 27
     "tr": "Turkish",
25 28
     "vi": "Vietnamese",
26
-    "zhCN": "Chinese (China)"
29
+    "zhCN": "Chinese (China)",
30
+    "zhTW": "Chinese (Taiwan)"
27 31
 }

+ 60
- 24
react/features/base/i18n/BuiltinLanguages.native.js Voir le fichier

@@ -7,6 +7,12 @@ import i18next from 'i18next';
7 7
  */
8 8
 const _LANGUAGES = {
9 9
 
10
+    // Afrikaans
11
+    'af': {
12
+        languages: require('../../../../lang/languages-af'),
13
+        main: require('../../../../lang/main-af')
14
+    },
15
+
10 16
     // Bulgarian
11 17
     'bg': {
12 18
         languages: require('../../../../lang/languages-bg'),
@@ -19,6 +25,12 @@ const _LANGUAGES = {
19 25
         main: require('../../../../lang/main-de')
20 26
     },
21 27
 
28
+    // English (United Kingdom)
29
+    'enGB': {
30
+        languages: require('../../../../lang/languages-enGB'),
31
+        main: require('../../../../lang/main-enGB')
32
+    },
33
+
22 34
     // Esperanto
23 35
     'eo': {
24 36
         languages: require('../../../../lang/languages-eo'),
@@ -31,16 +43,34 @@ const _LANGUAGES = {
31 43
         main: require('../../../../lang/main-es')
32 44
     },
33 45
 
46
+    // Spanish (Latin America)
47
+    'esUS': {
48
+        languages: require('../../../../lang/languages-esUS'),
49
+        main: require('../../../../lang/main-esUS')
50
+    },
51
+
52
+    // Finnish
53
+    'fi': {
54
+        languages: require('../../../../lang/languages-fi'),
55
+        main: require('../../../../lang/main-fi')
56
+    },
57
+
34 58
     // French
35 59
     'fr': {
36 60
         languages: require('../../../../lang/languages-fr'),
37 61
         main: require('../../../../lang/main-fr')
38 62
     },
39 63
 
40
-    // Armenian
41
-    'hy': {
42
-        languages: require('../../../../lang/languages-hy'),
43
-        main: require('../../../../lang/main-hy')
64
+    // French (Canadian)
65
+    'frCA': {
66
+        languages: require('../../../../lang/languages-frCA'),
67
+        main: require('../../../../lang/main-frCA')
68
+    },
69
+
70
+    // Croatian
71
+    'hr': {
72
+        languages: require('../../../../lang/languages-hr'),
73
+        main: require('../../../../lang/main-hr')
44 74
     },
45 75
 
46 76
     // Italian
@@ -49,10 +79,22 @@ const _LANGUAGES = {
49 79
         main: require('../../../../lang/main-it')
50 80
     },
51 81
 
52
-    // Norwegian Bokmal
53
-    'nb': {
54
-        languages: require('../../../../lang/languages-nb'),
55
-        main: require('../../../../lang/main-nb')
82
+    // Japanese
83
+    'ja': {
84
+        languages: require('../../../../lang/languages-ja'),
85
+        main: require('../../../../lang/main-ja')
86
+    },
87
+
88
+    // Korean
89
+    'ko': {
90
+        languages: require('../../../../lang/languages-ko'),
91
+        main: require('../../../../lang/main-ko')
92
+    },
93
+
94
+    // Dutch
95
+    'nl': {
96
+        languages: require('../../../../lang/languages-nl'),
97
+        main: require('../../../../lang/main-nl')
56 98
     },
57 99
 
58 100
     // Occitan
@@ -79,34 +121,28 @@ const _LANGUAGES = {
79 121
         main: require('../../../../lang/main-ru')
80 122
     },
81 123
 
82
-    // Slovak
83
-    'sk': {
84
-        languages: require('../../../../lang/languages-sk'),
85
-        main: require('../../../../lang/main-sk')
86
-    },
87
-
88
-    // Slovenian
89
-    'sl': {
90
-        languages: require('../../../../lang/languages-sl'),
91
-        main: require('../../../../lang/main-sl')
92
-    },
93
-
94 124
     // Swedish
95 125
     'sv': {
96 126
         languages: require('../../../../lang/languages-sv'),
97 127
         main: require('../../../../lang/main-sv')
98 128
     },
99 129
 
100
-    // Turkish
101
-    'tr': {
102
-        languages: require('../../../../lang/languages-tr'),
103
-        main: require('../../../../lang/main-tr')
130
+    // Vietnamese
131
+    'vi': {
132
+        languages: require('../../../../lang/languages-vi'),
133
+        main: require('../../../../lang/main-vi')
104 134
     },
105 135
 
106 136
     // Chinese (China)
107 137
     'zhCN': {
108 138
         languages: require('../../../../lang/languages-zhCN'),
109 139
         main: require('../../../../lang/main-zhCN')
140
+    },
141
+
142
+    // Chinese (Taiwan)
143
+    'zhTW': {
144
+        languages: require('../../../../lang/languages-zhTW'),
145
+        main: require('../../../../lang/main-zhTW')
110 146
     }
111 147
 };
112 148
 

+ 1
- 1
react/features/base/i18n/i18next.js Voir le fichier

@@ -41,7 +41,7 @@ const options = {
41 41
         (typeof interfaceConfig !== 'undefined' && interfaceConfig.APP_NAME)
42 42
             || 'Jitsi Meet',
43 43
     backend: {
44
-        loadPath: 'lang/__ns__-__lng__.json'
44
+        loadPath: 'lang/{{ns}}-{{lng}}.json'
45 45
     },
46 46
     defaultNS: 'main',
47 47
     fallbackLng: DEFAULT_LANGUAGE,

Chargement…
Annuler
Enregistrer