Skip to content

Commit affcede

Browse files
committed
refactor: inlined getBrowserLocale functionality
Signed-off-by: Pedro Lamas <[email protected]>
1 parent c555d1c commit affcede

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

src/plugins/i18n.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Vue from 'vue'
22
import VueI18n, { type Locale } from 'vue-i18n'
33
import { SupportedLocales } from '@/globals'
4-
import getBrowserLocale from '@/util/get-browser-locale'
54
import messages from '@/locales/en.yaml'
65
import { I18nLocales } from '@/dynamicImports'
76

@@ -22,11 +21,14 @@ export const getAllLocales = (): Intl.LocalesArgument => {
2221
* Loads the starting locale for the user.
2322
*/
2423
export const getStartingLocale = () => {
25-
const browserLocale = getBrowserLocale({ countryCodeOnly: true })
24+
const navigatorLocale = getNavigatorLocales()[0]
25+
const countryCode = navigatorLocale.split(/-|_/)[0]
26+
2627
if (
27-
browserLocale &&
28-
SupportedLocales.findIndex(locale => locale.code === browserLocale) >= 0) {
29-
return browserLocale
28+
countryCode &&
29+
SupportedLocales.some(locale => locale.code === countryCode)
30+
) {
31+
return countryCode
3032
} else {
3133
return import.meta.env.VUE_APP_I18N_LOCALE || 'en'
3234
}

src/util/get-browser-locale.ts

-21
This file was deleted.

0 commit comments

Comments
 (0)