Add locale if it's undefined in user settings

imesense · Apr 30, 2024 · 816f28b · 816f28b
1 parent 6944e17
commit 816f28b
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/ImeSense.Launchers.Belarus.Core/Manager/UserManager.cs b/src/ImeSense.Launchers.Belarus.Core/Manager/UserManager.cs
@@ -37,6 +37,8 @@ public async Task LoadAsync(CancellationToken cancellationToken = default)
                 user.IpAddress = string.Empty;
             }
 
+            user.Locale ??= GetAutoLocale();
+
             var isUsernameCorrect =
                 _authenticationValidator.IsUsernameNotEmpty(user.Username) &&
                 _authenticationValidator.IsUsernameCorrectLength(user.Username) &&
@@ -92,15 +94,20 @@ public async Task SaveAsync(CancellationToken cancellationToken = default)
 
     private UserSettings CreateDefaultUserSettings()
     {
-        var userSettings = new UserSettings();
+        var userSettings = new UserSettings {
+            Locale = GetAutoLocale()
+        };
+        _logger?.LogInformation("Set locale: {locale}", userSettings.Locale.Title);
+        return userSettings;
+    }
+
+    private Locale GetAutoLocale()
+    {
         var systemCulture = CultureInfo.CurrentCulture;
         if (systemCulture.ThreeLetterISOLanguageName.Equals(_launcherStorage.Locales[0].Key)) {
-            userSettings.Locale = _launcherStorage.Locales[0];
+            return _launcherStorage.Locales[0];
         } else {
-            userSettings.Locale = _launcherStorage.Locales[1];
+            return _launcherStorage.Locales[1];
         }
-        _logger?.LogInformation("Set locale: {locale}", userSettings.Locale.Title);
-
-        return userSettings;
     }
 }