Move sorting to TranslationProvider

RocketChat · Nov 25, 2024 · bca670c · bca670c
1 parent ace19a6
commit bca670c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/apps/meteor/client/providers/TranslationProvider.tsx b/apps/meteor/client/providers/TranslationProvider.tsx
@@ -169,12 +169,14 @@ const TranslationProvider = ({ children }: TranslationProviderProps): ReactEleme
 				ogName: i18nextInstance.t('Default'),
 				key: '',
 			},
-			...[...new Set([...i18nextInstance.languages, ...languages])].map((key) => ({
-				en: key,
-				name: getLanguageName(key, language),
-				ogName: getLanguageName(key, key),
-				key,
-			})),
+			...[...new Set([...i18nextInstance.languages, ...languages])]
+				.map((key) => ({
+					en: key,
+					name: getLanguageName(key, language),
+					ogName: getLanguageName(key, key),
+					key,
+				}))
+				.sort(({ name: nameA }, { name: nameB }) => nameA.localeCompare(nameB)),
 		],
 		[language, i18nextInstance],
 	);

diff --git a/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx
@@ -12,15 +12,7 @@ const PreferencesLocalizationSection = () => {
 
 	const { control } = useFormContext();
 
-	const languageOptions = useMemo(() => {
-		const mapOptions: SelectOption[] = languages.map(({ key, name }) => {
-			// Add a space to the name of the default language to bring it to the top
-			const displayName = key === '' && name === 'Default' ? ' Default' : name;
-			return [key, displayName];
-		});
-		mapOptions.sort(([, a], [, b]) => a.localeCompare(b));
-		return mapOptions;
-	}, [languages]);
+	const languageOptions = useMemo(() => languages.map(({ key, name }): SelectOption => [key, name]), [languages]);
 
 	const languageId = useUniqueId();