Merge branch 'feature/profile-redesign' of github.com:hydralauncher/hydra into feature/profile-redesign

src/renderer/src/pages/settings/settings-general.tsx

@@ -38,11 +38,9 @@ export function SettingsGeneral() {
   const [defaultDownloadsPath, setDefaultDownloadsPath] = useState("");
 
   useEffect(() => {
-    async function fetchdefaultDownloadsPath() {
+    window.electron.getDefaultDownloadsPath().then((path) => {
-      setDefaultDownloadsPath(await window.electron.getDefaultDownloadsPath());
+      setDefaultDownloadsPath(path);
-    }
+    });
-
-    fetchdefaultDownloadsPath();
 
     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",
       }));
     }
   }