fix(ui): remove test ENGLISH locale and automatically reset invalid locale settings

Author: oatmealproblem

src/renderer/src/intl/index.ts

@@ -27,16 +27,17 @@ const locales = {
 	'en-US': flattenMessages(enUS) as Record<MessageID, string>,
 	'ja-JP': flattenMessages(jaJP) as Partial<Record<MessageID, string>>,
 	'zh-TW': flattenMessages(zhTW) as Partial<Record<MessageID, string>>,
-	ENGLISH: Object.fromEntries(
-		Object.entries(flattenMessages(enUS)).map(([k, v]) => [k, v.toUpperCase()]),
-	) as Partial<Record<MessageID, string>>,
 	MessageID: Object.fromEntries(Object.keys(flattenMessages(enUS)).map((k) => [k, k])) as Record<
 		MessageID,
 		string
 	>,
 };
 type Locale = keyof typeof locales;
 
+export function isValidLocale(locale: string) {
+	return Object.keys(locales).includes(locale) && locale !== 'MessageID';
+}
+
 function getBestLocale(): Locale {
 	const keys = Object.keys(locales) as [Locale, ...Locale[]];
 	return (

src/renderer/src/lib/settings/appSettings.ts

@@ -1,6 +1,6 @@
 import { localStorageStore } from '@skeletonlabs/skeleton';
 import { derived, get } from 'svelte/store';
-import { locale } from '../../intl';
+import { isValidLocale, locale } from '../../intl';
 import stellarMapsApi from '../stellarMapsApi';
 import { disableTranslatorMode, enableTranslatorMode } from '../translatorMode';
 
@@ -40,8 +40,15 @@ function loadSettings() {
 		.then((settings) => appSettings.set(settings))
 		.then(() => {
 			appSettings.subscribe((settings) => {
-				// update locale
-				locale.set(settings.appLocale as Parameters<(typeof locale)['set']>[0]);
+				// update locale if valid
+				if (isValidLocale(settings.appLocale)) {
+					locale.set(settings.appLocale as Parameters<(typeof locale)['set']>[0]);
+				} else {
+					// change settings if it somehow has an invalid locale
+					appSettings.update((value) => ({ ...value, appLocale: get(locale) }));
+					return;
+				}
+
 				// write to file
 				createAppConfigDirIfNeeded()
 					.then(getAppSettingsPath)

src/renderer/src/lib/settings/appSettingsConfig.ts

@@ -7,7 +7,6 @@ export const appSettingsConfig: AppSettingConfig[] = [
 		tooltip: 'setting.appLocale_tooltip',
 		options: [
 			{ id: 'en-US', literalName: 'English' },
-			{ id: 'ENGLISH', literalName: 'ENGLISH' },
 			{ id: 'ja-JP', literalName: '日本語' },
 			{ id: 'zh-TW', literalName: '中文（正體字）' },
 		],