Fixed NPM auto path fill, improved Russian translation.
Ylian Saint-Hilaire committed
Feb 6, 2020 at 10:22 UTC
ffb61443ecf8fc1a85fc8652d0924baeddbdfdef
4 files changed
+17
-10
meshcentral.js
+5
-1
@@ -1253,7 +1253,11 @@ function CreateMeshCentralServer(config, args) {
1253
try {
1254
var nodepath = process.argv[0];
1255
var npmpath = obj.path.join(obj.path.dirname(process.argv[0]), 'npm');
1256
- if (obj.fs.existsSync(nodepath) && obj.fs.existsSync(npmpath)) { obj.args.npmpath = (nodepath + ' ' + npmpath); }
1256
+ if (obj.fs.existsSync(nodepath) && obj.fs.existsSync(npmpath)) {
1257
+ if (nodepath.indexOf(' ') >= 0) { nodepath = '"' + nodepath + '"'; }
1258
+ if (npmpath.indexOf(' ') >= 0) { npmpath = '"' + npmpath + '"'; }
1259
+ if (obj.platform == 'win32') { obj.args.npmpath = npmpath; } else { obj.args.npmpath = (nodepath + ' ' + npmpath); }
1260
+ }
1261
} catch (ex) { }
1262
}
1263
});
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.4.8-q",
3
+ "version": "0.4.8-r",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
translate/translate.js
+1
-1
@@ -207,7 +207,7 @@ function startEx(argv) {
207
208
if (command == 'translateall') {
209
if (fs.existsSync('../views/translations') == false) { fs.mkdirSync('../views/translations'); }
210
- if (fs.existsSync('../public/translations') == false) { fs.mkdirSync('../public/translations'); }
210
+ //if (fs.existsSync('../public/translations') == false) { fs.mkdirSync('../public/translations'); }
211
var lang = null;
212
if (argv.length > 4) { lang = argv[4].toLowerCase(); }
213
if (argv.length > 3) {
translate/translate.json
+10
-7
@@ -2167,6 +2167,7 @@
2167
},
2168
{
2169
"en": "Agent Installation",
2170
+ "ru": "Установка агента",
2171
"xloc": [
2172
"agentinvite.handlebars->3->3"
2173
]
@@ -6224,7 +6225,7 @@
6225
"ja": "ここからソフトウェアをダウンロードしてください",
6226
"nl": "Download de software hier",
6227
"pt": "Faça o download do software aqui",
6227
- "ru": "Скачайте программное обеспечение здесь",
6228
+ "ru": "Скачайте программу по этой ссылке",
6229
"xloc": [
6230
"agentinvite.handlebars->container->column_l->5->wintab32->3->win32url",
6231
"agentinvite.handlebars->container->column_l->5->wintab64->3->win64url"
@@ -14348,6 +14349,7 @@
14349
},
14350
{
14351
"en": "Remote Agent Installation for {0}",
14352
+ "ru": "Установка агента для {0}",
14353
"xloc": [
14354
"agentinvite.handlebars->3->1"
14355
]
@@ -20003,7 +20005,7 @@
20005
"en": "g:",
20006
"es": "g:",
20007
"nl": "g:",
20006
- "ru": "g:",
20008
+ "ru": "г:",
20009
"xloc": [
20010
"default.handlebars->25->406",
20011
"default.handlebars->25->407"
@@ -20015,7 +20017,7 @@
20017
"en": "group:",
20018
"es": "grupo:",
20019
"nl": "groep:",
20018
- "ru": "group:",
20020
+ "ru": "группа:",
20021
"xloc": [
20022
"default.handlebars->25->404",
20023
"default.handlebars->25->405"
@@ -20203,7 +20205,7 @@
20205
"en": "t:",
20206
"es": "t:",
20207
"nl": "t:",
20206
- "ru": "t:",
20208
+ "ru": "т:",
20209
"xloc": [
20210
"default.handlebars->25->410",
20211
"default.handlebars->25->411"
@@ -20214,7 +20216,7 @@
20216
"en": "tag:",
20217
"es": "etiqueta:",
20218
"nl": "tag:",
20217
- "ru": "tag:",
20219
+ "ru": "тег:",
20220
"xloc": [
20221
"default.handlebars->25->408",
20222
"default.handlebars->25->409"
@@ -20271,7 +20273,7 @@
20273
"en": "u:",
20274
"es": "u:",
20275
"nl": "u:",
20274
- "ru": "u:",
20276
+ "ru": "п:",
20277
"xloc": [
20278
"default.handlebars->25->400",
20279
"default.handlebars->25->401"
@@ -20282,7 +20284,7 @@
20284
"en": "user:",
20285
"es": "usuario:",
20286
"nl": "gebruiker:",
20285
- "ru": "user:",
20287
+ "ru": "пользователь:",
20288
"xloc": [
20289
"default.handlebars->25->398",
20290
"default.handlebars->25->399"
@@ -20322,6 +20324,7 @@
20324
},
20325
{
20326
"en": "{0} - Agent Installation",
20327
+ "ru": "{0} - установка агента",
20328
"xloc": [
20329
"agentinvite.handlebars->3->2"
20330
]