Fixed Dutch translations in translate.js
Ylian Saint-Hilaire committed
Dec 26, 2019 at 11:37 UTC
b202d3ef08662645a776e133649edf8a7e7edd84
4 files changed
+21
-44
meshuser.js
-26
@@ -322,32 +322,6 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
322
try { ws.send(JSON.stringify(stats)); } catch (ex) { }
323
}
324
325
- //
326
- var serverStatsStrings = {
327
- ServerState: "Server State",
328
- AgentErrorCounters: "Agent Error Counters",
329
- UnknownGroup: "Unknown Group",
330
- InvalidPKCSsignature: "Invalid PKCS signature",
331
- InvalidRSAsiguature: "Invalid RSA siguature",
332
- InvalidJSON: "Invalid JSON",
333
- UnknownAction: "Unknown Action",
334
- BadWebCertificate: "Bad Web Certificate",
335
- BadSignature: "Bad Signature",
336
- MaxSessionsReached: "Max Sessions Reached",
337
- UnknownDeviceGroup: "Unknown Device Group",
338
- InvalidDeviceGroupType: "Invalid Device Group Type",
339
- DuplicateAgent: "Duplicate Agent",
340
- ConnectedIntelAMT: "Connected Intel® AMT",
341
- RelayErrors: "Relay Errors",
342
- UserAccounts: "User Accounts",
343
- DeviceGroups: "Device Groups",
344
- AgentSessions: "Agent Sessions",
345
- ConnectedUsers: "Connected Users",
346
- UsersSessions: "Users Sessions",
347
- RelaySessions: "Relay Sessions",
348
- RelayCount: "Relay Count"
349
- };
350
-
325
// When data is received from the web socket
326
ws.on('message', processWebSocketData);
327
public/compress.bat
+1
-1
@@ -1,4 +1,4 @@
1
@ECHO OFF
2
CD ..\translate
3
C:\Users\Default.DESKTOP-M9I88C9\AppData\Roaming\nvm\v12.13.0\node translate.js minifyall
4
-C:\Users\Default.DESKTOP-M9I88C9\AppData\Roaming\nvm\v12.13.0\node translate.js translateall
4
+C:\Users\Default.DESKTOP-M9I88C9\AppData\Roaming\nvm\v12.13.0\node translate.js translateall
\ No newline at end of file
translate/translate.js
+10
-8
@@ -72,7 +72,7 @@ function start() {
72
console.log(' TRANSLATE [language] [languagefile] [files]');
73
console.log(' Use a language (.json) file to translate web pages to a give language.');
74
console.log('');
75
- console.log(' TRANSLATEALL (languagefile)');
75
+ console.log(' TRANSLATEALL (languagefile) (language code)');
76
console.log(' Translate all MeshCentral strings using the languages.json file.');
77
console.log('');
78
console.log(' MINIFYALL');
@@ -152,19 +152,21 @@ function start() {
152
// Extract or translate all MeshCentral strings
153
if (command == 'extractall') { extract("translate.json", meshCentralSourceFiles); }
154
if (command == 'translateall') {
155
- if (fs.existsSync("../views/translations") == false) { fs.mkdirSync("../views/translations"); }
156
- if (fs.existsSync("../public/translations") == false) { fs.mkdirSync("../public/translations"); }
157
- if ((process.argv.length > 3)) {
155
+ if (fs.existsSync('../views/translations') == false) { fs.mkdirSync('../views/translations'); }
156
+ if (fs.existsSync('../public/translations') == false) { fs.mkdirSync('../public/translations'); }
157
+ var lang = null;
158
+ if (process.argv.length > 4) { lang = process.argv[4].toLowerCase(); }
159
+ if (process.argv.length > 3) {
160
if (fs.existsSync(process.argv[3]) == false) {
161
console.log('Unable to find: ' + process.argv[3]);
162
} else {
161
- translate(null, process.argv[3], meshCentralSourceFiles, "translations");
163
+ translate(lang, process.argv[3], meshCentralSourceFiles, 'translations');
164
}
165
} else {
164
- if (fs.existsSync("translate.json") == false) {
166
+ if (fs.existsSync('translate.json') == false) {
167
console.log('Unable to find translate.json.');
168
} else {
167
- translate(null, "translate.json", meshCentralSourceFiles, "translations");
169
+ translate(lang, 'translate.json', meshCentralSourceFiles, 'translations');
170
}
171
}
172
return;
@@ -346,7 +348,7 @@ function translate(lang, langFile, sources, createSubDir) {
348
} else {
349
// See that languages are in the translation file
350
langs = {};
349
- for (var i in langFileData.strings) { var entry = langFileData.strings[i]; for (var j in entry) { if ((j != 'en') && (j != 'xloc') && (j != '*')) { langs[j] = true; } } }
351
+ for (var i in langFileData.strings) { var entry = langFileData.strings[i]; for (var j in entry) { if ((j != 'en') && (j != 'xloc') && (j != '*')) { langs[j.toLowerCase()] = true; } } }
352
for (var i in langs) { translateEx(i, langFileData, sources, createSubDir); }
353
}
354
translate/translate.json
+10
-9
@@ -8,7 +8,8 @@
8
"nl": "0",
9
"xloc": [
10
"default.handlebars->container->masthead->7->notificationCount",
11
- "default-mobile.handlebars->9->229"
11
+ "default-mobile.handlebars->9->229",
12
+ { "$ref": "#" }
13
]
14
},
15
{
@@ -15638,7 +15639,7 @@
15639
]
15640
},
15641
{
15641
- "en": "Toggle footer bar",
15642
+ "en": "Toggle footer bar",
15643
"xloc": [
15644
"default.handlebars->container->topbar->1->1->uiMenuButton->uiMenu"
15645
]
@@ -15651,21 +15652,21 @@
15652
},
15653
{
15654
"en": "Sync server device name to hostname",
15654
- "nl" "Synchroniseer serverapparaatnaam met hostnaam",
15655
+ "nl": "Synchroniseer serverapparaatnaam met hostnaam",
15656
"xloc": [
15657
"default.handlebars->23->1046"
15658
]
15659
},
15660
{
15661
"en": "Notification settings must also be turned on in account settings.",
15661
- "nl" "Meldingsinstellingen moeten ook worden ingeschakeld in accountinstellingen.",
15662
+ "nl": "Meldingsinstellingen moeten ook worden ingeschakeld in accountinstellingen.",
15663
"xloc": [
15664
"default.handlebars->23->1096"
15665
]
15666
},
15667
{
15668
"en": "Groups",
15668
- "nl" "Groepen
15669
+ "nl": "Groepen",
15670
"xloc": [
15671
"default.handlebars->23->1160"
15672
]
@@ -15686,7 +15687,7 @@
15687
},
15688
{
15689
"en": "CPU Load",
15689
- "nL": "CPU gebruik",
15690
+ "nl": "CPU gebruik",
15691
"xloc": [
15692
"default.handlebars->23->1306"
15693
]
@@ -15720,7 +15721,7 @@
15721
},
15722
{
15723
"en": "Invalid RSA siguature",
15723
- "n;": "Ongeldige RSA handtekening",
15724
+ "nl": "Ongeldige RSA handtekening",
15725
"xloc": [
15726
"default.handlebars->23->1288"
15727
]
@@ -15835,7 +15836,7 @@
15836
]
15837
},
15838
{
15838
- "en": "u:",
15839
+ "en": "u:",
15840
"xloc": [
15841
"default.handlebars->23->393"
15842
]
@@ -15862,7 +15863,7 @@
15863
},
15864
{
15865
"en": "External",
15865
- "en": "Extern",
15866
+ "nl": "Extern",
15867
"xloc": [
15868
"default.handlebars->23->1320"
15869
]