Fixed NPM auto path fill, improved Russian translation.

This commit is contained in:
Ylian Saint-Hilaire 2020-02-06 10:22:24 -08:00
parent c40145588e
commit 4e8ae05c2b
4 changed files with 17 additions and 10 deletions

View File

@ -1253,7 +1253,11 @@ function CreateMeshCentralServer(config, args) {
try { try {
var nodepath = process.argv[0]; var nodepath = process.argv[0];
var npmpath = obj.path.join(obj.path.dirname(process.argv[0]), 'npm'); var npmpath = obj.path.join(obj.path.dirname(process.argv[0]), 'npm');
if (obj.fs.existsSync(nodepath) && obj.fs.existsSync(npmpath)) { obj.args.npmpath = (nodepath + ' ' + npmpath); } if (obj.fs.existsSync(nodepath) && obj.fs.existsSync(npmpath)) {
if (nodepath.indexOf(' ') >= 0) { nodepath = '"' + nodepath + '"'; }
if (npmpath.indexOf(' ') >= 0) { npmpath = '"' + npmpath + '"'; }
if (obj.platform == 'win32') { obj.args.npmpath = npmpath; } else { obj.args.npmpath = (nodepath + ' ' + npmpath); }
}
} catch (ex) { } } catch (ex) { }
} }
}); });

View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.4.8-q", "version": "0.4.8-r",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

View File

@ -207,7 +207,7 @@ function startEx(argv) {
if (command == 'translateall') { if (command == 'translateall') {
if (fs.existsSync('../views/translations') == false) { fs.mkdirSync('../views/translations'); } if (fs.existsSync('../views/translations') == false) { fs.mkdirSync('../views/translations'); }
if (fs.existsSync('../public/translations') == false) { fs.mkdirSync('../public/translations'); } //if (fs.existsSync('../public/translations') == false) { fs.mkdirSync('../public/translations'); }
var lang = null; var lang = null;
if (argv.length > 4) { lang = argv[4].toLowerCase(); } if (argv.length > 4) { lang = argv[4].toLowerCase(); }
if (argv.length > 3) { if (argv.length > 3) {

View File

@ -2167,6 +2167,7 @@
}, },
{ {
"en": "Agent Installation", "en": "Agent Installation",
"ru": "Установка агента",
"xloc": [ "xloc": [
"agentinvite.handlebars->3->3" "agentinvite.handlebars->3->3"
] ]
@ -6224,7 +6225,7 @@
"ja": "ここからソフトウェアをダウンロードしてください", "ja": "ここからソフトウェアをダウンロードしてください",
"nl": "Download de software hier", "nl": "Download de software hier",
"pt": "Faça o download do software aqui", "pt": "Faça o download do software aqui",
"ru": "Скачайте программное обеспечение здесь", "ru": "Скачайте программу по этой ссылке",
"xloc": [ "xloc": [
"agentinvite.handlebars->container->column_l->5->wintab32->3->win32url", "agentinvite.handlebars->container->column_l->5->wintab32->3->win32url",
"agentinvite.handlebars->container->column_l->5->wintab64->3->win64url" "agentinvite.handlebars->container->column_l->5->wintab64->3->win64url"
@ -14348,6 +14349,7 @@
}, },
{ {
"en": "Remote Agent Installation for {0}", "en": "Remote Agent Installation for {0}",
"ru": "Установка агента для {0}",
"xloc": [ "xloc": [
"agentinvite.handlebars->3->1" "agentinvite.handlebars->3->1"
] ]
@ -20003,7 +20005,7 @@
"en": "g:", "en": "g:",
"es": "g:", "es": "g:",
"nl": "g:", "nl": "g:",
"ru": "g:", "ru": "г:",
"xloc": [ "xloc": [
"default.handlebars->25->406", "default.handlebars->25->406",
"default.handlebars->25->407" "default.handlebars->25->407"
@ -20015,7 +20017,7 @@
"en": "group:", "en": "group:",
"es": "grupo:", "es": "grupo:",
"nl": "groep:", "nl": "groep:",
"ru": "group:", "ru": "группа:",
"xloc": [ "xloc": [
"default.handlebars->25->404", "default.handlebars->25->404",
"default.handlebars->25->405" "default.handlebars->25->405"
@ -20203,7 +20205,7 @@
"en": "t:", "en": "t:",
"es": "t:", "es": "t:",
"nl": "t:", "nl": "t:",
"ru": "t:", "ru": "т:",
"xloc": [ "xloc": [
"default.handlebars->25->410", "default.handlebars->25->410",
"default.handlebars->25->411" "default.handlebars->25->411"
@ -20214,7 +20216,7 @@
"en": "tag:", "en": "tag:",
"es": "etiqueta:", "es": "etiqueta:",
"nl": "tag:", "nl": "tag:",
"ru": "tag:", "ru": "тег:",
"xloc": [ "xloc": [
"default.handlebars->25->408", "default.handlebars->25->408",
"default.handlebars->25->409" "default.handlebars->25->409"
@ -20271,7 +20273,7 @@
"en": "u:", "en": "u:",
"es": "u:", "es": "u:",
"nl": "u:", "nl": "u:",
"ru": "u:", "ru": "п:",
"xloc": [ "xloc": [
"default.handlebars->25->400", "default.handlebars->25->400",
"default.handlebars->25->401" "default.handlebars->25->401"
@ -20282,7 +20284,7 @@
"en": "user:", "en": "user:",
"es": "usuario:", "es": "usuario:",
"nl": "gebruiker:", "nl": "gebruiker:",
"ru": "user:", "ru": "пользователь:",
"xloc": [ "xloc": [
"default.handlebars->25->398", "default.handlebars->25->398",
"default.handlebars->25->399" "default.handlebars->25->399"
@ -20322,6 +20324,7 @@
}, },
{ {
"en": "{0} - Agent Installation", "en": "{0} - Agent Installation",
"ru": "{0} - установка агента",
"xloc": [ "xloc": [
"agentinvite.handlebars->3->2" "agentinvite.handlebars->3->2"
] ]