Fix missing "custom app languages"

Regression c1ac58f4d6

src/base/components/inputs/LanguageSelect.tsx

@@ -21,8 +21,7 @@ import { Virtuoso } from 'react-virtuoso';
 import { useLingui } from '@lingui/react/macro';
 import { CustomTooltip } from '@/base/components/CustomTooltip.tsx';
 import { translateExtensionLanguage } from '@/features/extension/Extensions.utils.ts';
-import { languageSortComparator } from '@/base/utils/Languages.ts';
-import { toUniqueISOLanguageCodes } from '@/lib/ISOLanguageUtil.ts';
+import { languageSortComparator, toUniqueLanguageCodes } from '@/base/utils/Languages.ts';
 
 interface IProps {
     selectedLanguages: string[];
@@ -34,12 +33,12 @@ export function LanguageSelect(props: IProps) {
     const { t } = useLingui();
 
     const { selectedLanguages, setSelectedLanguages, languages } = props;
-    const [tmpSelectedLanguages, setTmpSelectedLanguages] = useState(toUniqueISOLanguageCodes(selectedLanguages));
+    const [tmpSelectedLanguages, setTmpSelectedLanguages] = useState(toUniqueLanguageCodes(selectedLanguages));
     const [open, setOpen] = useState<boolean>(false);
 
     const languagesSortedBySelectState = useMemo(
         () =>
-            toUniqueISOLanguageCodes([
+            toUniqueLanguageCodes([
                 ...tmpSelectedLanguages.toSorted(languageSortComparator),
                 ...languages.toSorted(languageSortComparator),
             ]),
@@ -48,12 +47,12 @@ export function LanguageSelect(props: IProps) {
 
     const handleCancel = () => {
         setOpen(false);
-        setTmpSelectedLanguages(toUniqueISOLanguageCodes(selectedLanguages));
+        setTmpSelectedLanguages(toUniqueLanguageCodes(selectedLanguages));
     };
 
     const handleOk = () => {
         setOpen(false);
-        setSelectedLanguages(toUniqueISOLanguageCodes(tmpSelectedLanguages));
+        setSelectedLanguages(toUniqueLanguageCodes(tmpSelectedLanguages));
     };
 
     const handleChange = (language: string, selected: boolean) => {

src/base/utils/Languages.ts

@@ -53,6 +53,15 @@ export function languageCodeToName(code: string): string {
     return getLanguage(code).nativeName;
 }
 
+export const toUniqueLanguageCodes = (codes: string[]): string[] => {
+    const languages = codes.map((code) => getLanguage(code));
+    const languagesByIsoCode = Object.groupBy(languages, (language) => language.isoCode);
+
+    return Object.entries(languagesByIsoCode)
+        .filter(([, languagesOfIsoCode]) => !!languagesOfIsoCode?.length)
+        .map(([, languagesOfIsoCode]) => languagesOfIsoCode![0].orgCode);
+};
+
 export const toComparableLanguage = (code: string): string => getLanguage(code).isoCode;
 
 export const toComparableLanguages = (codes: string[]): string[] => codes.map(toComparableLanguage);