Merge branch 'master' into develop

This commit is contained in:
Pieter Vander Vennet 2021-11-07 15:31:55 +01:00
commit 37231969e6
120 changed files with 44636 additions and 44531 deletions

View file

@ -245,7 +245,7 @@ function generateTranslationsObjectFrom(objects: { path: string, parsed: { id: s
let json = tr.toJson(lang)
try {
json = JSON.stringify(JSON.parse(json), null, " ");
json = JSON.stringify(JSON.parse(json), null, " ");
} catch (e) {
console.error(e)
}
@ -360,7 +360,7 @@ function mergeLayerTranslations() {
const layerFiles = ScriptUtils.getLayerFiles();
for (const layerFile of layerFiles) {
mergeLayerTranslation(layerFile.parsed, layerFile.path, loadTranslationFilesFrom("layers"))
writeFileSync(layerFile.path, JSON.stringify(layerFile.parsed, null, " "))
writeFileSync(layerFile.path, JSON.stringify(layerFile.parsed, null, " "))
}
}