admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Set default locale according to browser locale (#11805)

Browse Source 
We didn't get much complaints on Localization so I guess we can expand
it more and make it the default behavior to use the browser's locale
when you signup

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
This commit is contained in:
Félix Malfait
2025-04-30 13:11:40 +02:00
committed by GitHub
parent e55ff5ac4a
commit cb513bc7a8
7 changed files with 140 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/twenty-front/src/utils/i18n/dynamicActivate.ts
View File

@ -10,10 +10,4 @@ export const dynamicActivate = async (locale: keyof typeof APP_LOCALES) => {
const { messages } = await import(`../../locales/generated/${locale}.ts`);
i18n.load(locale, messages);
i18n.activate(locale);
try {
localStorage.setItem('locale', locale);
} catch (error) {
// eslint-disable-next-line no-console
console.log('Failed to save locale to localStorage:', error);
}
};

36
packages/twenty-front/src/utils/i18n/initialI18nActivate.ts
View File

@ -1,7 +1,7 @@
import { fromNavigator, fromStorage, fromUrl } from '@lingui/detect-locale';
import { APP_LOCALES } from 'twenty-shared/translations';
import { isDefined, isValidLocale, normalizeLocale } from 'twenty-shared/utils';
import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
import { APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
import { isDefined, isValidLocale } from 'twenty-shared/utils';
export const initialI18nActivate = () => {
const urlLocale = fromUrl('locale');
@ -10,20 +10,34 @@ export const initialI18nActivate = () => {
let locale: keyof typeof APP_LOCALES = APP_LOCALES.en;
if (isDefined(urlLocale) && isValidLocale(urlLocale)) {
locale = urlLocale;
const normalizedUrlLocale = isDefined(urlLocale)
? normalizeLocale(urlLocale)
: null;
const normalizedStorageLocale = isDefined(storageLocale)
? normalizeLocale(storageLocale)
: null;
const normalizedNavigatorLocale = isDefined(navigatorLocale)
? normalizeLocale(navigatorLocale)
: null;
if (isDefined(normalizedUrlLocale) && isValidLocale(normalizedUrlLocale)) {
locale = normalizedUrlLocale;
try {
localStorage.setItem('locale', urlLocale);
localStorage.setItem('locale', normalizedUrlLocale);
} catch (error) {
// eslint-disable-next-line no-console
console.log('Failed to save locale to localStorage:', error);
}
} else if (isDefined(storageLocale) && isValidLocale(storageLocale)) {
locale = storageLocale;
} else if (isDefined(navigatorLocale) && isValidLocale(navigatorLocale)) {
// TODO: remove when we're ready to launch
// locale = navigatorLocale;
locale = SOURCE_LOCALE;
} else if (
isDefined(normalizedStorageLocale) &&
isValidLocale(normalizedStorageLocale)
) {
locale = normalizedStorageLocale;
} else if (
isDefined(normalizedNavigatorLocale) &&
isValidLocale(normalizedNavigatorLocale)
) {
locale = normalizedNavigatorLocale;
}
dynamicActivate(locale);