fix: if locale is not present, set to unspecified

th-ch · Dec 2, 2023 · c41b2ce · c41b2ce
1 parent 7f02afc
commit c41b2ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -556,11 +556,14 @@ app.on('activate', async () => {
 });
 
 const getDefaultLocale = (locale: string) =>
-  Object.keys(languageResources).includes(locale) ? locale : 'en';
+  Object.keys(languageResources).includes(locale) ? locale : null;
 
 app.whenReady().then(async () => {
   if (!config.get('options.language')) {
-    config.set('options.language', getDefaultLocale(app.getLocale()));
+    const locale = getDefaultLocale(app.getLocale());
+    if (locale) {
+      config.set('options.language', locale);
+    }
   }
 
   await loadI18n().then(async () => {

diff --git a/src/menu.ts b/src/menu.ts
@@ -379,7 +379,7 @@ export const mainMenuTemplate = async (
                 (lang): Electron.MenuItemConstructorOptions => ({
                   label: `${languageResources[lang].translation.language.name} (${languageResources[lang].translation.language['local-name']})`,
                   type: 'checkbox',
-                  checked: config.get('options.language') === lang,
+                  checked: (config.get('options.language') ?? 'en') === lang,
                   click() {
                     config.setMenuOption('options.language', lang);
                     refreshMenu(win);