From 88a94bbb8245e8388186d6c80ed9808270fe4f0a Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Fri, 13 Sep 2024 22:32:51 -0300 Subject: [PATCH] fix: languages --- .../src/pages/settings/settings-general.tsx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/renderer/src/pages/settings/settings-general.tsx b/src/renderer/src/pages/settings/settings-general.tsx index 10c17eca..4aab85d4 100644 --- a/src/renderer/src/pages/settings/settings-general.tsx +++ b/src/renderer/src/pages/settings/settings-general.tsx @@ -38,11 +38,9 @@ export function SettingsGeneral() { const [defaultDownloadsPath, setDefaultDownloadsPath] = useState(""); useEffect(() => { - async function fetchdefaultDownloadsPath() { - setDefaultDownloadsPath(await window.electron.getDefaultDownloadsPath()); - } - - fetchdefaultDownloadsPath(); + window.electron.getDefaultDownloadsPath().then((path) => { + setDefaultDownloadsPath(path); + }); setLanguageOptions( orderBy( @@ -89,6 +87,15 @@ export function SettingsGeneral() { function updateFormWithUserPreferences() { if (userPreferences) { + const languageKeys = Object.keys(languageResources); + const language = + languageKeys.find((language) => { + return language === userPreferences.language; + }) ?? + languageKeys.find((language) => { + return language.startsWith(userPreferences.language.split("-")[0]); + }); + setForm((prev) => ({ ...prev, downloadsPath: userPreferences.downloadsPath ?? defaultDownloadsPath, @@ -96,7 +103,7 @@ export function SettingsGeneral() { userPreferences.downloadNotificationsEnabled, repackUpdatesNotificationsEnabled: userPreferences.repackUpdatesNotificationsEnabled, - language: userPreferences.language, + language: language ?? "en", })); } }