Browse Source

Updates used languages and fixes loading them.

j8
damencho 6 years ago
parent
commit
6d4601fe66

+ 9
- 5
lang/languages.json View File

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

7
  */
7
  */
8
 const _LANGUAGES = {
8
 const _LANGUAGES = {
9
 
9
 
10
+    // Afrikaans
11
+    'af': {
12
+        languages: require('../../../../lang/languages-af'),
13
+        main: require('../../../../lang/main-af')
14
+    },
15
+
10
     // Bulgarian
16
     // Bulgarian
11
     'bg': {
17
     'bg': {
12
         languages: require('../../../../lang/languages-bg'),
18
         languages: require('../../../../lang/languages-bg'),
19
         main: require('../../../../lang/main-de')
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
     // Esperanto
34
     // Esperanto
23
     'eo': {
35
     'eo': {
24
         languages: require('../../../../lang/languages-eo'),
36
         languages: require('../../../../lang/languages-eo'),
31
         main: require('../../../../lang/main-es')
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
     // French
58
     // French
35
     'fr': {
59
     'fr': {
36
         languages: require('../../../../lang/languages-fr'),
60
         languages: require('../../../../lang/languages-fr'),
37
         main: require('../../../../lang/main-fr')
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
     // Italian
76
     // Italian
49
         main: require('../../../../lang/main-it')
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
     // Occitan
100
     // Occitan
79
         main: require('../../../../lang/main-ru')
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
     // Swedish
124
     // Swedish
95
     'sv': {
125
     'sv': {
96
         languages: require('../../../../lang/languages-sv'),
126
         languages: require('../../../../lang/languages-sv'),
97
         main: require('../../../../lang/main-sv')
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
     // Chinese (China)
136
     // Chinese (China)
107
     'zhCN': {
137
     'zhCN': {
108
         languages: require('../../../../lang/languages-zhCN'),
138
         languages: require('../../../../lang/languages-zhCN'),
109
         main: require('../../../../lang/main-zhCN')
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 View File

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

Loading…
Cancel
Save