From daa4c1c0a63b86f88f59a5924d9ceddd6ef50ac4 Mon Sep 17 00:00:00 2001 From: tonihei Date: Mon, 16 May 2022 10:59:47 +0100 Subject: [PATCH] Add language normalization for "arb" (Standard Arabic) This is an individual language (ISO 639-3) part of the Arabic macrolanguage ("ar" in ISO 639-1). Add this mapping to our existing list similar to other individual to macrolanguage mappings we have already. Issue: Issue: google/ExoPlayer#10255 PiperOrigin-RevId: 448911950 --- .../src/main/java/com/google/android/exoplayer2/util/Util.java | 1 + .../test/java/com/google/android/exoplayer2/util/UtilTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java index 29bc83a83a..f32b869607 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -2719,6 +2719,7 @@ public final class Util { "ji", "yi", // Individual macrolanguage codes mapped back to full macrolanguage code. // See https://en.wikipedia.org/wiki/ISO_639_macrolanguage + "arb", "ar-arb", "in", "ms-ind", "ind", "ms-ind", "nb", "no-nob", diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java index baba823fc2..790a3e24df 100644 --- a/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java +++ b/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java @@ -1162,6 +1162,7 @@ public class UtilTest { assertThat(Util.normalizeLanguageCode("ara-ayl")).isEqualTo("ar-ayl"); // Special case of short codes that are actually part of a macrolanguage. + assertThat(Util.normalizeLanguageCode("arb")).isEqualTo("ar-arb"); assertThat(Util.normalizeLanguageCode("nb")).isEqualTo("no-nob"); assertThat(Util.normalizeLanguageCode("nn")).isEqualTo("no-nno"); assertThat(Util.normalizeLanguageCode("nob")).isEqualTo("no-nob");