From 4543e943ddca58f8c73f7c265b1a9f7052eb057b Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 3 Mar 2022 22:45:22 -0600 Subject: [PATCH] Fix custom locale imports --- .gitignore | 1 + app/soapbox/locales/messages.js | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8a53931ef..d2c20b8ef 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ yarn-error.log* # Custom build files /custom/**/* !/custom/* +/custom/*.* !/custom/.gitkeep !/custom/**/.gitkeep diff --git a/app/soapbox/locales/messages.js b/app/soapbox/locales/messages.js index bcea22f3c..129869d50 100644 --- a/app/soapbox/locales/messages.js +++ b/app/soapbox/locales/messages.js @@ -1,10 +1,7 @@ // Import custom messages const importCustom = locale => { - try { - return import(/* webpackChunkName: "locale_[request]" */`custom/locales/${locale}.json`); - } catch(e) { - return new Promise(resolve => resolve({ default: {} })); - } + return import(/* webpackChunkName: "locale_[request]" */`custom/locales/${locale}.json`) + .catch(error => ({ default: {} })); }; // Import git-checked messages @@ -20,6 +17,9 @@ const importMessagesWithCustom = locale => { ]).then(messages => { const [native, custom] = messages; return Object.assign(native.default, custom.default); + }).catch(error => { + console.error(error); + throw error; }); };