Skip to content

The open alternative to Salesforce, designed for AI.

Merge language and scale into one Interface settings section (#24222)

Félix Malfait8676b342f25d
diff --git a/packages/twenty-front/src/modules/settings/experience/components/UiScalePicker.tsx b/packages/twenty-front/src/modules/settings/experience/components/UiScalePicker.tsx
index cc624dce1eb..bbb48639d43 100644
--- a/packages/twenty-front/src/modules/settings/experience/components/UiScalePicker.tsx
+++ b/packages/twenty-front/src/modules/settings/experience/components/UiScalePicker.tsx
@@ -15,6 +15,7 @@ export const UiScalePicker = () => {
return (
<Select
dropdownId="ui-scale-picker"
+ label={t`Scale`}
dropdownWidth={218}
dropdownWidthAuto
fullWidth
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx
index 9fa837ad69e..62da9269980 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx
@@ -244,6 +244,7 @@ export const LocalePicker = () => {
<StyledContainer>
<Select
dropdownId="preferred-locale"
+ label={t`Language`}
dropdownWidthAuto
fullWidth
withSearchInput
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
index 70751386a52..fae6558fc10 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
@@ -1,3 +1,5 @@
+import { styled } from '@linaria/react';
+
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { FormatPreferencesSettings } from '@/settings/experience/components/FormatPreferencesSettings';
import { UiScalePicker } from '@/settings/experience/components/UiScalePicker';
@@ -10,8 +12,15 @@ import { getSettingsPath } from 'twenty-shared/utils';
import { H2Title } from 'twenty-ui/typography';
import { ColorSchemePicker } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { LocalePicker } from '~/pages/settings/profile/appearance/components/LocalePicker';
+const StyledInterfaceControls = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[4]};
+`;
+
export const SettingsExperience = () => {
const { colorScheme, setColorScheme } = useColorScheme();
const { t } = useLingui();
@@ -41,10 +50,13 @@ export const SettingsExperience = () => {
<Section>
<H2Title
- title={t`Interface scale`}
- description={t`Adjust the size of text and interface elements`}
+ title={t`Interface`}
+ description={t`Select your language and adjust the size of the interface`}
/>
- <UiScalePicker />
+ <StyledInterfaceControls>
+ <LocalePicker />
+ <UiScalePicker />
+ </StyledInterfaceControls>
</Section>
<Section>
@@ -55,14 +67,6 @@ export const SettingsExperience = () => {
<OpenRecordInPreferencePicker />
</Section>
- <Section>
- <H2Title
- title={t`Language`}
- description={t`Select your preferred language`}
- />
- <LocalePicker />
- </Section>
-
<Section>
<H2Title
title={t`Formats`}