fix(@formatjs/intl-locale): fix according to tc39/test262#2628

formatjs · May 20, 2020 · 1006ed2 · 1006ed2
1 parent ed34904
commit 1006ed2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/packages/intl-locale/src/index.ts b/packages/intl-locale/src/index.ts
@@ -174,9 +174,9 @@ function removeLikelySubtags(
 ): UnicodeLanguageId {
   const {variants, ...max} = addLikelySubtags(unicodeLangId);
   const trials: UnicodeLanguageId[] = [
-    {lang: unicodeLangId.lang},
-    {lang: unicodeLangId.lang, region: unicodeLangId.region},
-    {lang: unicodeLangId.lang, script: unicodeLangId.script},
+    {lang: max.lang},
+    {lang: max.lang, region: max.region},
+    {lang: max.lang, script: max.script},
   ];
   for (const trial of trials) {
     if (isLanguageEqualWithoutVariants(max, addLikelySubtags(trial))) {

diff --git a/packages/intl-locale/tests/minimize.test.ts b/packages/intl-locale/tests/minimize.test.ts
@@ -1,24 +1,23 @@
 import {IntlLocale} from '../src';
 import * as data from 'cldr-core/supplemental/likelySubtags.json';
 IntlLocale._addLikelySubtagData(data.supplemental.likelySubtags);
-// This is different from test262 bc of https://github.com/tc39/test262/issues/2628
 const testDataMinimal = {
   // Undefined primary language.
-  und: 'und',
-  'und-Thai': 'und-Thai',
-  'und-419': 'und-419',
-  'und-150': 'und-150',
-  'und-AT': 'und-AT',
+  und: 'en',
+  'und-Thai': 'th',
+  'und-419': 'es-419',
+  'und-150': 'ru-150',
+  'und-AT': 'de-AT',
 
   // https://unicode-org.atlassian.net/browse/ICU-13786
   'aae-Latn-IT': 'aae-Latn-IT',
   'aae-Thai-CO': 'aae-Thai-CO',
 
   // https://unicode-org.atlassian.net/browse/ICU-10220
   // https://unicode-org.atlassian.net/browse/ICU-12345
-  'und-CW': 'und-CW',
-  'und-US': 'und',
-  'zh-Hant': 'zh-Hant',
+  'und-CW': 'pap-CW',
+  'und-US': 'en',
+  'zh-Hant': 'zh-TW',
   'zh-Hani': 'zh-Hani',
 };