mirror of
https://github.com/PretendoNetwork/website.git
synced 2026-09-25 02:05:40 -05:00
Merge branch 'dev'
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user