Skip to content

Commit f64bb91

Browse files
fix(app): add english to locale matchers (#16280)
1 parent eb9eb5e commit f64bb91

3 files changed

Lines changed: 4 additions & 0 deletions

File tree

packages/app/src/context/language.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ const DICT: Record<Locale, Dictionary> = {
146146
}
147147

148148
const localeMatchers: Array<{ locale: Locale; match: (language: string) => boolean }> = [
149+
{ locale: "en", match: (language) => language.startsWith("en") },
149150
{ locale: "zht", match: (language) => language.startsWith("zh") && language.includes("hant") },
150151
{ locale: "zh", match: (language) => language.startsWith("zh") },
151152
{ locale: "ko", match: (language) => language.startsWith("ko") },
@@ -217,6 +218,7 @@ export const { use: useLanguage, provider: LanguageProvider } = createSimpleCont
217218
)
218219

219220
const locale = createMemo<Locale>(() => normalizeLocale(store.locale))
221+
console.log("locale", locale())
220222
const intl = createMemo(() => INTL[locale()])
221223

222224
const dict = createMemo<Dictionary>(() => DICT[locale()])

packages/desktop-electron/src/renderer/i18n/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ function detectLocale(): Locale {
7676
const languages = navigator.languages?.length ? navigator.languages : [navigator.language]
7777
for (const language of languages) {
7878
if (!language) continue
79+
if (language.toLowerCase().startsWith("en")) return "en"
7980
if (language.toLowerCase().startsWith("zh")) {
8081
if (language.toLowerCase().includes("hant")) return "zht"
8182
return "zh"

packages/desktop/src/i18n/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ function detectLocale(): Locale {
7777
const languages = navigator.languages?.length ? navigator.languages : [navigator.language]
7878
for (const language of languages) {
7979
if (!language) continue
80+
if (language.toLowerCase().startsWith("en")) return "en"
8081
if (language.toLowerCase().startsWith("zh")) {
8182
if (language.toLowerCase().includes("hant")) return "zht"
8283
return "zh"

0 commit comments

Comments
 (0)