Split up language utils file

src/features/extension/Extensions.utils.ts

@@ -21,7 +21,6 @@ import {
     languageSpecialSortComparator,
     toComparableLanguage,
     toComparableLanguages,
-    toUniqueLanguageCodes,
 } from '@/base/utils/Languages.ts';
 import {
     EXTENSION_ACTION_TO_FAILURE_TRANSLATION_KEY_MAP,
@@ -31,6 +30,7 @@ import { enhancedCleanup } from '@/base/utils/Strings.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { makeToast } from '@/base/utils/Toast.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
+import { toUniqueISOLanguageCodes } from '@/lib/ISOLanguageUtil.ts';
 
 export const getInstalledState = (
     isInstalled: boolean,
@@ -131,7 +131,7 @@ export const filterExtensions = (
         query?: string | null | undefined;
     } = {},
 ): TExtension[] => {
-    const normalizedSelectedLanguages = toComparableLanguages(toUniqueLanguageCodes(selectedLanguages ?? []));
+    const normalizedSelectedLanguages = toComparableLanguages(toUniqueISOLanguageCodes(selectedLanguages ?? []));
 
     return extensions
         .filter(

src/features/source/components/SourceLanguageSelect.tsx

@@ -23,7 +23,7 @@ import Box from '@mui/material/Box';
 import ListItemAvatar from '@mui/material/ListItemAvatar';
 import { CustomTooltip } from '@/base/components/CustomTooltip.tsx';
 import { translateExtensionLanguage } from '@/features/extension/Extensions.utils.ts';
-import { languageSortComparator, toUniqueLanguageCodes } from '@/base/utils/Languages.ts';
+import { languageSortComparator } from '@/base/utils/Languages.ts';
 import {
     SourceDisplayNameInfo,
     SourceIconInfo,
@@ -38,6 +38,7 @@ import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { ListCardAvatar } from '@/base/components/lists/cards/ListCardAvatar.tsx';
 import { makeToast } from '@/base/utils/Toast.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
+import { toUniqueISOLanguageCodes } from '@/lib/ISOLanguageUtil.ts';
 
 export const SourceLanguageSelect = ({
     selectedLanguages,
@@ -59,14 +60,14 @@ export const SourceLanguageSelect = ({
 
     const [tmpSourceIdToEnabledState, setTmpSourceIdToEnabledState] = useState<Record<SourceIdInfo['id'], boolean>>({});
 
-    const [tmpSelectedLanguages, setTmpSelectedLanguages] = useState(toUniqueLanguageCodes(selectedLanguages));
+    const [tmpSelectedLanguages, setTmpSelectedLanguages] = useState(toUniqueISOLanguageCodes(selectedLanguages));
     const [open, setOpen] = useState<boolean>(false);
 
     const sourcesByLanguage = useMemo(() => Sources.groupByLanguage(sources), [sources]);
 
     const languagesSortedBySelectState = useMemo(
         () =>
-            toUniqueLanguageCodes([
+            toUniqueISOLanguageCodes([
                 ...tmpSelectedLanguages.toSorted(languageSortComparator),
                 ...languages.toSorted(languageSortComparator),
             ]),
@@ -77,7 +78,7 @@ export const SourceLanguageSelect = ({
         setOpen(false);
 
         setTmpSourceIdToEnabledState({});
-        setTmpSelectedLanguages(toUniqueLanguageCodes(selectedLanguages));
+        setTmpSelectedLanguages(toUniqueISOLanguageCodes(selectedLanguages));
     };
 
     const handleOk = () => {
@@ -89,7 +90,7 @@ export const SourceLanguageSelect = ({
             ),
         ).catch((e) => makeToast(t('global.error.label.failed_to_save_changes'), 'error', getErrorMessage(e)));
         setTmpSourceIdToEnabledState({});
-        setSelectedLanguages(toUniqueLanguageCodes(tmpSelectedLanguages));
+        setSelectedLanguages(toUniqueISOLanguageCodes(tmpSelectedLanguages));
     };
 
     const handleChange = (language: string, selected: boolean) => {

src/features/source/services/Sources.ts

@@ -21,7 +21,6 @@ import {
     languageSpecialSortComparator,
     toComparableLanguage,
     toComparableLanguages,
-    toUniqueLanguageCodes,
 } from '@/base/utils/Languages.ts';
 import { getSourceMetadata } from '@/features/source/services/SourceMetadata.ts';
 import {
@@ -30,6 +29,7 @@ import {
 } from '@/features/settings/services/ServerSettingsMetadata.ts';
 import { makeToast } from '@/base/utils/Toast.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
+import { toUniqueISOLanguageCodes } from '@/lib/ISOLanguageUtil.ts';
 
 export class Sources {
     static readonly LOCAL_SOURCE_ID = '0';
@@ -98,7 +98,7 @@ export class Sources {
             enabled?: boolean;
         } = {},
     ): Source[] {
-        const normalizedLanguages = toComparableLanguages(toUniqueLanguageCodes(languages ?? []));
+        const normalizedLanguages = toComparableLanguages(toUniqueISOLanguageCodes(languages ?? []));
 
         return sources
             .filter(