Leahnaya/website
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/website.git synced 2026-06-10 19:00:19 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Ash Monty 2022-09-20 19:10:59 +02:00
commit b8aeade7d6
No known key found for this signature in database
GPG Key ID: 740B7C88251D49B6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util.js
View File

@ -27,7 +27,7 @@ function getLocale(language, region) {
if (fs.pathExistsSync(path)) {
const selectedLocale = require(path);
const finalLocale = merge(baseLocale, selectedLocale);
const finalLocale = merge({}, baseLocale, selectedLocale);
return finalLocale;
}