File tree Expand file tree Collapse file tree 2 files changed +7
-26
lines changed Expand file tree Collapse file tree 2 files changed +7
-26
lines changed Original file line number Diff line number Diff line change 11import Vue from 'vue'
22import VueI18n , { type Locale } from 'vue-i18n'
33import { SupportedLocales } from '@/globals'
4- import getBrowserLocale from '@/util/get-browser-locale'
54import messages from '@/locales/en.yaml'
65import { I18nLocales } from '@/dynamicImports'
76
@@ -22,11 +21,14 @@ export const getAllLocales = (): Intl.LocalesArgument => {
2221 * Loads the starting locale for the user.
2322 */
2423export 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 }
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments