Agent translation fixes.
Ylian Saint-Hilaire committed
Dec 15, 2020 at 13:38 UTC
fc432430f6d63b64f6b5b10c1f682ee75a3f4eb5
2 files changed
+4
-84
agents/agent-translations.json
-82
@@ -177,87 +177,5 @@
177
"connect": "連接",
178
"disconnect": "斷線",
179
"cancel": "取消"
180
- },
181
- "xloc": {
182
- "agent": [
183
- "agent-translations.json"
184
- ],
185
- "agentVersion": [
186
- "agent-translations.json"
187
- ],
188
- "group": [
189
- "agent-translations.json"
190
- ],
191
- "url": [
192
- "agent-translations.json"
193
- ],
194
- "meshName": [
195
- "agent-translations.json"
196
- ],
197
- "meshId": [
198
- "agent-translations.json"
199
- ],
200
- "serverId": [
201
- "agent-translations.json"
202
- ],
203
- "setup": [
204
- "agent-translations.json"
205
- ],
206
- "update": [
207
- "agent-translations.json"
208
- ],
209
- "install": [
210
- "agent-translations.json"
211
- ],
212
- "uninstall": [
213
- "agent-translations.json"
214
- ],
215
- "connect": [
216
- "agent-translations.json"
217
- ],
218
- "disconnect": [
219
- "agent-translations.json"
220
- ],
221
- "cancel": [
222
- "agent-translations.json"
223
- ],
224
- "pressok": [
225
- "agent-translations.json"
226
- ],
227
- "elevation": [
228
- "agent-translations.json"
229
- ],
230
- "sudo": [
231
- "agent-translations.json"
232
- ],
233
- "ctrlc": [
234
- "agent-translations.json"
235
- ],
236
- "commands": [
237
- "agent-translations.json"
238
- ],
239
- "graphicalerror": [
240
- "agent-translations.json"
241
- ],
242
- "zenity": [
243
- "agent-translations.json"
244
- ],
245
- "status": [
246
- [
247
- "agent-translations.json"
248
- ],
249
- [
250
- "agent-translations.json"
251
- ],
252
- [
253
- "agent-translations.json"
254
- ]
255
- ],
256
- "statusDescription": [
257
- "agent-translations.json"
258
- ],
259
- "description": [
260
- "agent-translations.json"
261
- ]
180
}
181
}
\ No newline at end of file
translate/translate.js
+4
-2
@@ -668,7 +668,9 @@ function extractFromJson(file) {
668
const str = json.en[i]
669
if (sourceStrings[str] == null) {
670
sourceStrings[str] = { en: str, xloc: [name] };
671
- } else { if (sourceStrings[str].xloc == null) { sourceStrings[str].xloc = []; } sourceStrings[str].xloc.push(name); }
671
+ } else {
672
+ if (sourceStrings[str].xloc == null) { sourceStrings[str].xloc = []; } sourceStrings[str].xloc.push(name);
673
+ }
674
} else if (Array.isArray(json.en[i])) {
675
for (var k in json.en[i]) {
676
if (typeof json.en[i][k] == 'string') {
@@ -794,7 +796,7 @@ function translateAllInJson(xlang, langFile, file) {
796
for (var i in langFileData.strings) {
797
var entry = langFileData.strings[i];
798
for (var lang in entry) {
797
- if (lang == 'en') continue;
799
+ if ((lang == 'en') || (lang == 'xloc')) continue;
800
if ((xlang != null) && (lang != xlang)) continue;
801
if (languages.indexOf(lang) == -1) { languages.push(lang); xtranslationTable[lang] = {}; }
802
if ((entry['en'] != null) && (entry[lang] != null)) { xtranslationTable[lang][entry['en']] = entry[lang]; }