Adjust locale fallback

This fixes #1701
This commit is contained in:
Zack Rauen 2023-12-14 01:28:09 -05:00
parent 316069c3d9
commit 591823f90e
1 changed files with 7 additions and 11 deletions

View File

@ -11,7 +11,6 @@ export default new class LocaleManager {
get defaultLocale() {return "en-US";} get defaultLocale() {return "en-US";}
constructor() { constructor() {
this.locale = "";
this.strings = Utilities.extend({}, Locales[this.defaultLocale]); this.strings = Utilities.extend({}, Locales[this.defaultLocale]);
} }
@ -21,16 +20,13 @@ export default new class LocaleManager {
} }
setLocale() { setLocale() {
let newStrings; // Reset to the default locale in case a language is incomplete
if (this.discordLocale != this.defaultLocale) { Utilities.extend(this.strings, Locales[this.defaultLocale]);
newStrings = Locales[this.discordLocale];
if (!newStrings) return this.setLocale(this.defaultLocale); // Get the strings of the new language and extend if a translation exists
} const newStrings = Locales[this.discordLocale];
else { if (newStrings) Utilities.extendTruthy(this.strings, newStrings);
newStrings = Locales[this.defaultLocale];
}
this.locale = this.discordLocale;
Utilities.extendTruthy(this.strings, newStrings);
Events.emit("strings-updated"); Events.emit("strings-updated");
} }
}; };