bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix custom locale imports

Browse source
This commit is contained in:
Alex Gleason 2022-03-03 22:45:22 -06:00
parent 4cd56d7fda
commit 4543e943dd
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -19,6 +19,7 @@ yarn-error.log*
# Custom build files # Custom build files
/custom/**/* /custom/**/*
!/custom/* !/custom/*
/custom/*.*
!/custom/.gitkeep !/custom/.gitkeep
!/custom/**/.gitkeep !/custom/**/.gitkeep

10
app/soapbox/locales/messages.js
View file

@ -1,10 +1,7 @@
// Import custom messages // Import custom messages
const importCustom = locale => { const importCustom = locale => {
try { return import(/* webpackChunkName: "locale_[request]" */`custom/locales/${locale}.json`)
return import(/* webpackChunkName: "locale_[request]" */`custom/locales/${locale}.json`); .catch(error => ({ default: {} }));
} catch(e) {
return new Promise(resolve => resolve({ default: {} }));
}
}; };
// Import git-checked messages // Import git-checked messages
@ -20,6 +17,9 @@ const importMessagesWithCustom = locale => {
]).then(messages => { ]).then(messages => {
const [native, custom] = messages; const [native, custom] = messages;
return Object.assign(native.default, custom.default); return Object.assign(native.default, custom.default);
}).catch(error => {
console.error(error);
throw error;
}); });
}; };