Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2021-10-06 09:12:16 +01:00
7 changed files with 17 additions and 10 deletions

View File

@@ -23,7 +23,7 @@
var i18n = require("i18next");
var path = require("path");
var fs = require("fs-extra");
var fs = require("fs");
var defaultLang = "en-US";
@@ -89,7 +89,7 @@ async function readFile(lng, ns) {
return resourceCache[ns][lng];
} else if (resourceMap[ns]) {
const file = path.join(resourceMap[ns].basedir, lng, resourceMap[ns].file);
const content = await fs.readFile(file, "utf8");
const content = await fs.promises.readFile(file, "utf8");
resourceCache[ns] = resourceCache[ns] || {};
resourceCache[ns][lng] = JSON.parse(content.replace(/^\uFEFF/, ''));
var baseLng = lng.split('-')[0];