Merge branch 'dev' into jajaja

# Conflicts: # next.config.ts # src/app/(main)/settings/preferences/LanguageSetting.tsx # src/components/hooks/useConfig.ts
2025-07-27 02:11:32 -07:00
parent 2ad624ccc8 784677e180
commit b552868e0a
14 changed files with 55 additions and 44 deletions
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -20,7 +20,7 @@ function getDefaultTheme() {
 }

 const initialState = {
-  locale: getItem(LOCALE_CONFIG) || DEFAULT_LOCALE,
+  locale: getItem(LOCALE_CONFIG) || process.env.defaultLocale || DEFAULT_LOCALE,
  theme: getItem(THEME_CONFIG) || getDefaultTheme() || DEFAULT_THEME,
  timezone: getItem(TIMEZONE_CONFIG) || getTimezone(),
  dateRangeValue: getItem(DATE_RANGE_CONFIG) || DEFAULT_DATE_RANGE_VALUE,