sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove occurrences of grandfathering

Browse source 
ISSUE: #7565
PiperOrigin-RevId: 321108417
This commit is contained in:
kimvde 2020-07-14 08:12:53 +01:00 committed by Oliver Woodman
parent 23d680a4b4
commit 68cd283830
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
View file

@ -585,7 +585,7 @@ public final class Util {
mainLanguage = replacedLanguage; mainLanguage = replacedLanguage;
} }
if ("no".equals(mainLanguage) || "i".equals(mainLanguage) || "zh".equals(mainLanguage)) { if ("no".equals(mainLanguage) || "i".equals(mainLanguage) || "zh".equals(mainLanguage)) {
normalizedTag = maybeReplaceGrandfatheredLanguageTags(normalizedTag); normalizedTag = maybeReplaceLegacyLanguageTags(normalizedTag);
} }
return normalizedTag; return normalizedTag;
} }
@ -2347,11 +2347,11 @@ public final class Util {
.isCleartextTrafficPermitted(checkNotNull(uri.getHost())); .isCleartextTrafficPermitted(checkNotNull(uri.getHost()));
} }
private static String maybeReplaceGrandfatheredLanguageTags(String languageTag) { private static String maybeReplaceLegacyLanguageTags(String languageTag) {
for (int i = 0; i < isoGrandfatheredTagReplacements.length; i += 2) { for (int i = 0; i < isoLegacyTagReplacements.length; i += 2) {
if (languageTag.startsWith(isoGrandfatheredTagReplacements[i])) { if (languageTag.startsWith(isoLegacyTagReplacements[i])) {
return isoGrandfatheredTagReplacements[i + 1] return isoLegacyTagReplacements[i + 1]
+ languageTag.substring(/* beginIndex= */ isoGrandfatheredTagReplacements[i].length()); + languageTag.substring(/* beginIndex= */ isoLegacyTagReplacements[i].length());
} }
} }
return languageTag; return languageTag;
@ -2411,9 +2411,9 @@ public final class Util {
"hsn", "zh-hsn" "hsn", "zh-hsn"
}; };
// "Grandfathered tags", replaced by modern equivalents (including macrolanguage) // Legacy ("grandfathered") tags, replaced by modern equivalents (including macrolanguage)
// See https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry. // See https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry.
private static final String[] isoGrandfatheredTagReplacements = private static final String[] isoLegacyTagReplacements =
new String[] { new String[] {
"i-lux", "lb", "i-lux", "lb",
"i-hak", "zh-hak", "i-hak", "zh-hak",

2
library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
View file

@ -940,7 +940,7 @@ public class UtilTest {
assertThat(Util.normalizeLanguageCode("ji")).isEqualTo(Util.normalizeLanguageCode("yi")); assertThat(Util.normalizeLanguageCode("ji")).isEqualTo(Util.normalizeLanguageCode("yi"));
assertThat(Util.normalizeLanguageCode("ji")).isEqualTo(Util.normalizeLanguageCode("yid")); assertThat(Util.normalizeLanguageCode("ji")).isEqualTo(Util.normalizeLanguageCode("yid"));
// Grandfathered tags // Legacy tags
assertThat(Util.normalizeLanguageCode("i-lux")).isEqualTo(Util.normalizeLanguageCode("lb")); assertThat(Util.normalizeLanguageCode("i-lux")).isEqualTo(Util.normalizeLanguageCode("lb"));
assertThat(Util.normalizeLanguageCode("i-lux")).isEqualTo(Util.normalizeLanguageCode("ltz")); assertThat(Util.normalizeLanguageCode("i-lux")).isEqualTo(Util.normalizeLanguageCode("ltz"));
assertThat(Util.normalizeLanguageCode("i-hak")).isEqualTo(Util.normalizeLanguageCode("hak")); assertThat(Util.normalizeLanguageCode("i-hak")).isEqualTo(Util.normalizeLanguageCode("hak"));