MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3501 from JSuenram/master 

Translation updates. Small mySQL-Fix (only tested against mysQL 8.0.26)
This commit is contained in:
Ylian Saint-Hilaire 2022-01-21 09:16:13 -08:00 committed by GitHub
parent 1cd27af588 2ab250a10b
commit aa153558f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db.js
View File

@ -665,13 +665,13 @@ module.exports.CreateDB = function (parent, func) {
} else if (parent.args.mysql) { } else if (parent.args.mysql) {
// Use MySQL // Use MySQL
obj.databaseType = 5; obj.databaseType = 5;
var tempDatastore = require('mysql').createConnection(connectionObject); var tempDatastore = require('mysql').createPool(connectionObject);
tempDatastore.query('CREATE DATABASE IF NOT EXISTS ' + dbname, function (error) { tempDatastore.query('CREATE DATABASE IF NOT EXISTS ' + dbname, function (error) {
if (error != null) { if (error != null) {
console.log('Auto-create database failed: ' + error); console.log('Auto-create database failed: ' + error);
} }
connectionObject.database = dbname; connectionObject.database = dbname;
Datastore = require('mysql').createConnection(connectionObject); Datastore = require('mysql').createPool(connectionObject);
createTablesIfNotExist(dbname); createTablesIfNotExist(dbname);
}); });
setTimeout(function () { tempDatastore.end(); }, 2000); setTimeout(function () { tempDatastore.end(); }, 2000);

4
translate/translate.json
View File

@ -748,7 +748,7 @@
}, },
{ {
"cs": "(Žádný)", "cs": "(Žádný)",
"de": "(Keiner)", "de": "(keiner)",
"en": "(None)", "en": "(None)",
"es": "(Ninguno)", "es": "(Ninguno)",
"fi": "(Ei mitään)", "fi": "(Ei mitään)",
@ -1081,6 +1081,7 @@
] ]
}, },
{ {
"de": ", täglich wiederkehrend",
"en": ", Reccuring daily", "en": ", Reccuring daily",
"pl": ", Powtarzaj codziennie", "pl": ", Powtarzaj codziennie",
"xloc": [ "xloc": [
@ -1089,6 +1090,7 @@
] ]
}, },
{ {
"de": ", wöchentlich wiederkehrend",
"en": ", Reccuring weekly", "en": ", Reccuring weekly",
"pl": ", Powtarzaj co tydzień", "pl": ", Powtarzaj co tydzień",
"xloc": [ "xloc": [