verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-11-14 08:53:34 +01:00
parent f02a68cbd8 d170f73662
commit 1bf114f4cd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
print/config/print.json
View File

@ -8,7 +8,7 @@
"i18n": { "i18n": {
"locale": "es", "locale": "es",
"fallbackLocale": "es", "fallbackLocale": "es",
"silentTranslationWarn": true "silentTranslationWarn": false
}, },
"pdf": { "pdf": {
"format": "A4", "format": "A4",

7
print/core/config.js
View File

@ -10,8 +10,11 @@ let configFiles = [
]; ];
for (let configFile of configFiles) { for (let configFile of configFiles) {
if (fs.existsSync(configFile)) if (fs.existsSync(configFile)) {
Object.assign(config, require(configFile)); const conf = require(configFile);
for (let prop in conf)
Object.assign(config[prop], conf[prop]);
}
} }
config.env = env; config.env = env;