fix: infinite redirection in navigation

Bernankez · Oct 18, 2024 · cb83281 · cb83281
1 parent 6014dda
commit cb83281
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v1.1.1
+
+#### Bug Fixes
+
+- 修复在iOS设备上无法打开的问题
+
 ### v1.1.0
 
 #### Features

diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
@@ -25,18 +25,19 @@ export async function setLocale(locale: AvailableLocales) {
   document.querySelector("html")?.setAttribute("lang", locale);
 }
 
-export function inferPreferredLocale() {
+export function inferPreferredLocale(): AvailableLocales {
   const appStore = useAppStore();
   if (appStore.locale) {
     return appStore.locale;
   }
   const userLocale = (window.navigator.language || defaultLocale) as AvailableLocales;
-  if (availableLocales.indexOf(userLocale)) {
+  if (availableLocales.indexOf(userLocale) > 0) {
     return userLocale;
   }
   const userLocaleWithoutRegion = userLocale.split("-")[0] as AvailableLocales;
-  if (availableLocales.indexOf(userLocaleWithoutRegion)) {
-    return userLocaleWithoutRegion;
+  const availableLocale = availableLocales.find(locale => locale.startsWith(userLocaleWithoutRegion));
+  if (availableLocale) {
+    return availableLocale;
   }
   return defaultLocale;
 }