Merge branch 'main' into update-packages

package.json

@@ -53,6 +53,7 @@
     "hls.js": "^1.5.19",
     "i18next": "^23.16.8",
     "immer": "^10.1.1",
+    "iso-639-3": "^3.0.1",
     "jwt-decode": "^4.0.0",
     "lodash.isequal": "^4.5.0",
     "lodash.merge": "^4.6.2",

src/components/player/atoms/settings/AudioView.tsx

@@ -1,3 +1,4 @@
+import { iso6393To1 } from "iso-639-3";
 import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -53,10 +54,16 @@ export function AudioView({ id }: { id: string }) {
           <AudioOption
             key={v.id}
             selected={v.id === currentAudioTrack?.id}
-            langCode={v.language}
+            langCode={
+              v.language.length === 3
+                ? (iso6393To1[v.language] ?? v.language)
+                : v.language
+            }
             onClick={audioTracks.includes(v) ? () => change(v) : undefined}
           >
-            {getPrettyLanguageNameFromLocale(v.language) ?? unknownChoice}
+            {getPrettyLanguageNameFromLocale(v.language) ??
+              v.label ??
+              unknownChoice}
           </AudioOption>
         ))}
       </Menu.Section>

src/components/player/atoms/settings/SettingsMenu.tsx

@@ -41,6 +41,7 @@ export function SettingsMenu({ id }: { id: string }) {
 
   const selectedAudioLanguagePretty = currentAudioTrack
     ? (getPrettyLanguageNameFromLocale(currentAudioTrack.language) ??
+      currentAudioTrack.label ??
       t("player.menus.subtitles.unknownLanguage"))
     : undefined;
 

src/utils/language.ts

@@ -1,5 +1,6 @@
 import countryLanguages, { LanguageObj } from "@ladjs/country-language";
 import { getTag } from "@sozialhelden/ietf-language-tags";
+import { iso6393To1 } from "iso-639-3";
 
 const languageOrder = ["en", "hi", "fr", "de", "nl", "pt"];
 
@@ -99,7 +100,10 @@ function populateLanguageCode(language: string): string {
  * @returns pretty format for language, null if it no info can be found for language
  */
 export function getPrettyLanguageNameFromLocale(locale: string): string | null {
-  const tag = getTag(locale, true);
+  const tag =
+    locale.length === 3
+      ? getTag(iso6393To1[locale] ?? locale, true)
+      : getTag(locale, true);
   const lang = tag?.language?.Description?.[0] ?? null;
   if (!lang) return null;