]> granicus.if.org Git - icu/commitdiff
ICU-21957 integrate CLDR release-42-alpha1b to ICU main for 72
authorPeter Edberg <pedberg@unicode.org>
Tue, 9 Aug 2022 17:08:27 +0000 (10:08 -0700)
committerPeter Edberg <42151464+pedberg-icu@users.noreply.github.com>
Tue, 9 Aug 2022 23:05:20 +0000 (16:05 -0700)
19 files changed:
icu4c/source/data/curr/en.txt
icu4c/source/data/curr/en_AU.txt
icu4c/source/data/curr/en_SL.txt
icu4c/source/data/curr/ff_Adlm_SL.txt
icu4c/source/data/curr/ff_Latn_SL.txt
icu4c/source/data/curr/supplementalData.txt
icu4c/source/data/locales/ar.txt
icu4c/source/data/locales/es_419.txt
icu4c/source/data/locales/es_MX.txt
icu4c/source/data/locales/root.txt
icu4c/source/data/locales/tk.txt
icu4c/source/data/locales/yue.txt
icu4c/source/data/locales/zh_Hant.txt
icu4c/source/test/intltest/loctest.cpp
icu4j/main/shared/data/icudata.jar
icu4j/main/shared/data/icutzdata.jar
icu4j/main/shared/data/testdata.jar
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_locale.txt

index 3249d59491a8d5d565367fc6da7971ab83bc0194..51dcda169beb4859a0a4d003094c2dc5f2779938 100644 (file)
@@ -901,11 +901,11 @@ en{
         }
         SLE{
             "SLE",
-            "Sierra Leonean New Leone",
+            "Sierra Leonean Leone",
         }
         SLL{
             "SLL",
-            "Sierra Leonean Leone",
+            "Sierra Leonean Leone (1964—2022)",
         }
         SOS{
             "SOS",
@@ -2122,13 +2122,13 @@ en{
             other{"Slovak korunas"}
         }
         SLE{
-            one{"Sierra Leonean new leone"}
-            other{"Sierra Leonean new leones"}
-        }
-        SLL{
             one{"Sierra Leonean leone"}
             other{"Sierra Leonean leones"}
         }
+        SLL{
+            one{"Sierra Leonean leone (1964—2022)"}
+            other{"Sierra Leonean leones (1964—2022)"}
+        }
         SOS{
             one{"Somali shilling"}
             other{"Somali shillings"}
index a7cc65eaa18bedd229758ca44a684ebf8ef7fbfd..c61cbf783a1f91cf46ba9946895e50854b64fd58 100644 (file)
@@ -428,10 +428,6 @@ en_AU{
             "SHP",
             "St Helena Pound",
         }
-        SLL{
-            "SLL",
-            "Sierra Leonean Leone",
-        }
         SOS{
             "SOS",
             "Somali Shilling",
index 072437546f25befb3771e82d03290b76d6a17a04..535b727a2dccf55f0823f7ae456ba97570ea6e98 100644 (file)
@@ -4,7 +4,7 @@
 en_SL{
     %%Parent{"en_001"}
     Currencies{
-        SLL{
+        SLE{
             "Le",
             "Sierra Leonean Leone",
         }
index 7d450c645abd411e0ff8f535ee2274a6d2cf29f6..7481f87f97ef5f1a4b950e93c6ab643b515d001d 100644 (file)
@@ -7,9 +7,9 @@ ff_Adlm_SL{
             "GNF",
             "𞤊𞤢𞤪𞤢𞤲 𞤘𞤭𞤲𞤫𞤲𞤳𞤮",
         }
-        SLL{
+        SLE{
             "Le",
-            "𞤂𞤫𞤴𞤮𞤲 𞤅𞤫𞤪𞤢𞤤𞤭𞤴𞤢𞤲𞤳𞤮",
+            "SLE",
         }
     }
 }
index a8d7726aba8dba7db07cb9c36b49ffc4670d979f..06645fb31907625f77c0486d8df6259f51fb63d0 100644 (file)
@@ -3,9 +3,9 @@
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 ff_Latn_SL{
     Currencies{
-        SLL{
+        SLE{
             "Le",
-            "Lewoon Seraa Liyon",
+            "SLE",
         }
     }
 }
index c86496b7f8406e7778dd953924f479085b9a3bdc..6e87296a39e2b9ec118d401089a16cb4082d748d 100644 (file)
@@ -3761,11 +3761,10 @@ supplementalData:table(nofallback){
         SL{
             {
                 from:intvector{
-                    383,
-                    -496241664,
+                    385,
+                    -1223776256,
                 }
                 id{"SLE"}
-                tender{"false"}
             }
             {
                 from:intvector{
@@ -3773,6 +3772,10 @@ supplementalData:table(nofallback){
                     1072291840,
                 }
                 id{"SLL"}
+                to:intvector{
+                    387,
+                    -1778510849,
+                }
             }
             {
                 from:intvector{
index dcfd4c41b86ee663731246289ffe6fae8ecb65bf..3fc8f016820af402f7d23777e3aac3f9544a806c 100644 (file)
@@ -580,12 +580,12 @@ ar{
                 Hm{"HH:mm"}
                 Hms{"HH:mm:ss"}
                 M{"L"}
-                MEd{"E، d/‏M"}
+                MEd{"E، d‏/M"}
                 MMM{"LLL"}
                 MMMEd{"E، d MMM"}
                 MMMMd{"d MMMM"}
                 MMMd{"d MMM"}
-                Md{"d/‏M"}
+                Md{"d‏/M"}
                 d{"d"}
                 h{"h a"}
                 hm{"h:mm a"}
@@ -594,7 +594,7 @@ ar{
                 y{"y G"}
                 yyyy{"y G"}
                 yyyyM{"M‏/y G"}
-                yyyyMEd{"E، d/‏M/‏y G"}
+                yyyyMEd{"E، d‏/M‏/y G"}
                 yyyyMMM{"MMM y G"}
                 yyyyMMMEd{"E، d MMM y G"}
                 yyyyMMMM{"MMMM y G"}
@@ -660,8 +660,8 @@ ar{
                     M{"M–M"}
                 }
                 MEd{
-                    M{"E، d/‏M – E، d/‏M"}
-                    d{"E، d/‏M –‏ E، d/‏M"}
+                    M{"E، d‏/M – E، d‏/M"}
+                    d{"E، d‏/M – E، d‏/M"}
                 }
                 MMM{
                     M{"MMM–MMM"}
@@ -678,8 +678,8 @@ ar{
                     d{"d–d MMM"}
                 }
                 Md{
-                    M{"d-M – d-M"}
-                    d{"d-M – d-M"}
+                    M{"d‏/M – d‏/M"}
+                    d{"d‏/M – d‏/M"}
                 }
                 d{
                     d{"d–d"}
@@ -810,7 +810,7 @@ ar{
                 Hmsv{"HH:mm:ss v"}
                 Hmv{"HH:mm v"}
                 M{"L"}
-                MEd{"E، d/‏M"}
+                MEd{"E، d‏/M"}
                 MMM{"LLL"}
                 MMMEd{"E، d MMM"}
                 MMMMEd{"E، d MMMM"}
@@ -825,7 +825,7 @@ ar{
                 MMMMd{"d MMMM"}
                 MMMd{"d MMM"}
                 MMdd{"dd‏/MM"}
-                Md{"d/‏M"}
+                Md{"d‏/M"}
                 d{"d"}
                 h{"h a"}
                 hm{"h:mm a"}
@@ -835,7 +835,7 @@ ar{
                 ms{"mm:ss"}
                 y{"y"}
                 yM{"M‏/y"}
-                yMEd{"E، d/‏M/‏y"}
+                yMEd{"E، d‏/M‏/y"}
                 yMM{"MM‏/y"}
                 yMMM{"MMM y"}
                 yMMMEd{"E، d MMM y"}
@@ -1072,8 +1072,8 @@ ar{
                     M{"M–M"}
                 }
                 MEd{
-                    M{"E، d/‏M – E، d/‏M"}
-                    d{"E، d/‏M –‏ E، d/‏M"}
+                    M{"E، d‏/M – E، d‏/M"}
+                    d{"E، d‏/M – E، d‏/M"}
                 }
                 MMM{
                     M{"MMM–MMM"}
@@ -1090,8 +1090,8 @@ ar{
                     d{"d–d MMM"}
                 }
                 Md{
-                    M{"M/d – M/d"}
-                    d{"d-M – d-M"}
+                    M{"d‏/M – d‏/M"}
+                    d{"d‏/M – d‏/M"}
                 }
                 d{
                     d{"d–d"}
@@ -1433,12 +1433,12 @@ ar{
                 Hm{"HH:mm"}
                 Hms{"HH:mm:ss"}
                 M{"L"}
-                MEd{"E، d/‏M"}
+                MEd{"E، d‏/M"}
                 MMM{"LLL"}
                 MMMEd{"E، d MMM"}
                 MMMMd{"d MMMM"}
                 MMMd{"d MMM"}
-                Md{"d/‏M"}
+                Md{"d‏/M"}
                 d{"d"}
                 h{"h a"}
                 hm{"h:mm a"}
@@ -1446,7 +1446,7 @@ ar{
                 y{"y G"}
                 yyyy{"y G"}
                 yyyyM{"M‏/y G"}
-                yyyyMEd{"E، d/‏M/‏y G"}
+                yyyyMEd{"E، d‏/M‏/y G"}
                 yyyyMMM{"MMM y G"}
                 yyyyMMMEd{"E، d MMM y G"}
                 yyyyMMMM{"MMMM y G"}
index dbfe7c61b0f0d82f47e45c6dc0bc20aec1d8a5a6..9ce2e4e1cab12cb98b05508065f86479617887dd 100644 (file)
@@ -13,12 +13,15 @@ es_419{
             patternsLong{
                 decimalFormat{
                     1000000000000{
+                        one{"0 billón"}
                         other{"0 billón"}
                     }
                     10000000000000{
+                        one{"00 billones"}
                         other{"00 billones"}
                     }
                     100000000000000{
+                        one{"000 billones"}
                         other{"000 billones"}
                     }
                 }
index 4046f5b8928862aed6479b36fcce183f592a3345..3cc06802be53df75794ff96ceb31249c146b92cb 100644 (file)
@@ -12,12 +12,15 @@ es_MX{
             patternsLong{
                 decimalFormat{
                     1000000000000{
+                        one{"0 billón"}
                         other{"0 billones"}
                     }
                     10000000000000{
+                        one{"00 billones"}
                         other{"00 billones"}
                     }
                     100000000000000{
+                        one{"000 billones"}
                         other{"000 billones"}
                     }
                 }
index 27699c4f488ce7ace4e9bd12c8b3f2fea2efe333..c638d323c3f1efbbf23c318ed92fd8469a5c2d64 100644 (file)
@@ -3311,17 +3311,54 @@ root{
             }
         }
         namePattern{
+            givenFirst-long-addressing-formal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-long-addressing-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
             givenFirst-long-monogram-formal{
                 "{given-monogram-allCaps}{given2-monogram-allCaps}{surname-monogram-a"
                 "llCaps}"
             }
+            givenFirst-long-monogram-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-monogram-formal"}
             givenFirst-long-referring-formal{"{prefix} {given} {given2} {surname} {surname2} {suffix}"}
+            givenFirst-long-referring-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-medium-addressing-formal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-medium-addressing-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-medium-monogram-formal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-monogram-formal"}
+            givenFirst-medium-monogram-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-monogram-formal"}
+            givenFirst-medium-referring-formal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-medium-referring-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-short-addressing-formal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-short-addressing-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-short-monogram-formal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-monogram-formal"}
+            givenFirst-short-monogram-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-monogram-formal"}
+            givenFirst-short-referring-formal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
+            givenFirst-short-referring-informal:alias{"/LOCALE/personNames/namePattern/givenFirst-long-referring-formal"}
             sorting-long-referring-formal{"{surname} {surname2}, {prefix} {given} {given2} {suffix}"}
+            sorting-long-referring-informal:alias{"/LOCALE/personNames/namePattern/sorting-long-referring-formal"}
+            sorting-medium-referring-formal:alias{"/LOCALE/personNames/namePattern/sorting-long-referring-formal"}
+            sorting-medium-referring-informal:alias{"/LOCALE/personNames/namePattern/sorting-long-referring-formal"}
+            sorting-short-referring-formal:alias{"/LOCALE/personNames/namePattern/sorting-long-referring-formal"}
+            sorting-short-referring-informal:alias{"/LOCALE/personNames/namePattern/sorting-long-referring-formal"}
+            surnameFirst-long-addressing-formal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-long-addressing-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
             surnameFirst-long-monogram-formal{
                 "{surname-monogram-allCaps}{given-monogram-allCaps}{given2-monogram-a"
                 "llCaps}"
             }
+            surnameFirst-long-monogram-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-monogram-formal"}
             surnameFirst-long-referring-formal{"{surname} {surname2} {prefix} {given} {given2} {suffix}"}
+            surnameFirst-long-referring-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-medium-addressing-formal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-medium-addressing-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-medium-monogram-formal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-monogram-formal"}
+            surnameFirst-medium-monogram-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-monogram-formal"}
+            surnameFirst-medium-referring-formal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-medium-referring-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-short-addressing-formal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-short-addressing-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-short-monogram-formal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-monogram-formal"}
+            surnameFirst-short-monogram-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-monogram-formal"}
+            surnameFirst-short-referring-formal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
+            surnameFirst-short-referring-informal:alias{"/LOCALE/personNames/namePattern/surnameFirst-long-referring-formal"}
         }
     }
 }
index ccc5519c0943008886fe330bee752f2fc31ec4b4..c186c36d713161d91efc04d0430f19a950850156 100644 (file)
@@ -861,6 +861,57 @@ tk{
             }
         }
         islamic{
+            DateTimePatterns{
+                "HH:mm:ss zzzz",
+                "HH:mm:ss z",
+                "HH:mm:ss",
+                "HH:mm",
+                "EEEE, d MMMM, y G",
+                "d MMMM, y G",
+                "d MMM, y G",
+                "d/M/y GGGGG",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+                "{1} {0}",
+            }
+            availableFormats{
+                E{"ccc"}
+                Ed{"d, E"}
+                Gy{"y G"}
+                GyMMM{"MMM y G"}
+                GyMMMEd{"E, d MMM, y G"}
+                GyMMMd{"d MMM, y G"}
+                GyMd{"d/M/y GGGGG"}
+                M{"L"}
+                MEd{"E, d/M"}
+                MMM{"LLL"}
+                MMMEd{"E, d MMM"}
+                MMMMEd{"d MMMM, E"}
+                MMMMd{"d MMMM"}
+                MMMd{"d MMM"}
+                Md{"d/M"}
+                d{"d"}
+                y{"y G"}
+                yM{"MM.y"}
+                yMEd{"dd.MM.y E"}
+                yMMM{"MMM, y"}
+                yMMMEd{"d MMM, y, E"}
+                yMMMM{"MMMM, y"}
+                yMMMd{"d MMM, y"}
+                yMd{"dd.MM.y"}
+                yyyy{"y G"}
+                yyyyM{"M/y GGGGG"}
+                yyyyMEd{"E, d/M/y GGGGG"}
+                yyyyMMM{"MMM y G"}
+                yyyyMMMEd{"E, d MMM, y G"}
+                yyyyMMMM{"MMMM, y G"}
+                yyyyMMMd{"d MMM, y G"}
+                yyyyMd{"d/M/y GGGGG"}
+                yyyyQQQ{"QQQ, y G"}
+                yyyyQQQQ{"QQQQ, y G"}
+            }
             eras{
                 abbreviated{
                     "HS",
@@ -868,6 +919,20 @@ tk{
             }
             monthNames{
                 format{
+                    abbreviated{
+                        "Aşy",
+                        "Sap",
+                        "Tir I",
+                        "Tir II",
+                        "Tir III",
+                        "Tir IV",
+                        "Rej",
+                        "Mer",
+                        "Ora",
+                        "Baý",
+                        "Boş",
+                        "Gur",
+                    }
                     narrow{
                         "1",
                         "2",
@@ -898,6 +963,20 @@ tk{
                     }
                 }
                 stand-alone{
+                    abbreviated{
+                        "Aşy",
+                        "Sap",
+                        "Tir I",
+                        "Tir II",
+                        "Tir III",
+                        "Tir IV",
+                        "Rej",
+                        "Mer",
+                        "Ora",
+                        "Baý",
+                        "Boş",
+                        "Gur",
+                    }
                     narrow{
                         "1",
                         "2",
index 5b7c25c397db4792845eddc17446c65b44a8b2be..d5bfc6d1569c2184147aabe70cdd8b290bdc8b86 100644 (file)
@@ -55,7 +55,7 @@ yue{
         " 盜 盟 盡 監-盥 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睏 睛 睡 督 瞇 瞌 瞧 瞪 瞭 矛 矣 知 短 石 砂 砍 研 砲 破"
         " 硬 碎 碗 碟 碧 碩 碰 確 碼 磁 磚 磨 磯 礎 礙 礫 示 社 祈 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 禱 禿-私 秋 科"
         " 秒 秘 租 秤 秦 移 稅 程 稍 種 稱 稻 稿 穀 穆 穌 積 穩 究 穹 空 穿 突 窄 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 竿 笑"
-        " ç¬\9b ç¬¦ ç¬¨ ç¬¬ ç­\86 ç­\89 ç­\8b ç­\94 ç­\96 ç­· ç®\80 箏 箔 算 管 箭 箱 節 範 篇 築 篷 簡 簫 簽 簿 籃 籌 籍 籠 籤 米 粉 粗 粵 精 糊 糕"
+        " ç¬\9b ç¬¦ ç¬¨ ç¬¬ ç­\86 ç­\89 ç­\8b ç­\94 ç­\96 ç­· ç°¡ 箏 箔 算 管 箭 箱 節 範 篇 築 篷 簡 簫 簽 簿 籃 籌 籍 籠 籤 米 粉 粗 粵 精 糊 糕"
         " 糖 糟 糥 系 糾 紀 約 紅 紉 納 紐 純 紙-紛 素 索 紫 紮-細 紳 紹 終 組 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 綽 綿 緊"
         " 緒 線 緣 編 緩 緬 緯 練 縛 縣 縫 縮 縱 總 績 繁 繃 繆 織 繞 繡 繩 繪 繳 繼 續 纖 缸 缺 罈 罐 罕 罩 罪 置 罰 署 罵"
         " 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職 聽 聾 肉 肌 肚"
index 2c7ebe25b2b6e39e3f897c223dd24282be3ba1ea..e14378923d2aeb232f0f5852fcaf4f760830df3c 100644 (file)
@@ -64,7 +64,7 @@ zh_Hant{
         " 生 產 用 田-申 男 甸 界 留 畢 略 番 畫 異 當 疆 疏 疑 疼 病 痕 痛 痴 瘋 療 癡 癸 登-百 的 皆 皇 皮 盃 益 盛 盜 盟"
         " 盡 監 盤 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睛 睡 督 瞧 瞭 矛 矣 知 短 石 砂 砍 研 砲 破 硬 碎 碗 碟 碧 碩"
         " 碰 確 碼 磁 磨 磯 礎 礙 示 社 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 秀 私 秋 科 秒 秘 租 秤 秦 移 稅 程 稍 種"
-        " ç¨± ç¨¿ ç©\86 ç©\8c ç©\8d ç©© ç©¶ ç©¹ ç©º ç©¿ çª\81 çª\97 çª© çª® çª¶ ç«\8b ç«\99 ç«\9f ç«  ç«¥ ç«¯ ç«¶ ç«¹ ç¬\91 ç¬\9b ç¬¦ ç¬¨ ç¬¬ ç­\86 ç­\89 ç­\8b ç­\94 ç­\96 ç®\80 算 管 箭 箱"
+        " ç¨± ç¨¿ ç©\86 ç©\8c ç©\8d ç©© ç©¶ ç©¹ ç©º ç©¿ çª\81 çª\97 çª© çª® çª¶ ç«\8b ç«\99 ç«\9f ç«  ç«¥ ç«¯ ç«¶ ç«¹ ç¬\91 ç¬\9b ç¬¦ ç¬¨ ç¬¬ ç­\86 ç­\89 ç­\8b ç­\94 ç­\96 ç°¡ 算 管 箭 箱"
         " 節 範 篇 築 簡 簫 簽 簿 籃 籌 籍 籤 米 粉 粗 粵 精 糊 糕 糟 系 糾 紀 約 紅 納 紐 純 紙-紛 素 索 紫 累 細 紹 終 組"
         " 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 緊 緒 線 緣 編 緩 緬 緯 練 縛 縣 縮 縱 總 績 繁 繆 織 繞 繪 繳 繼 續 缸 缺 罕"
         " 罪 置 罰 署 罵 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職"
index aff5808bf2b70f8b01324d553616cdb451c441d0..cb902fd0140a0301da20ab9063900115e73c08a4 100644 (file)
@@ -6619,17 +6619,18 @@ void LocaleTest::TestNullDereferenceWrite21597() {
 }
 #if !UCONFIG_NO_FORMATTING
 void LocaleTest::TestSierraLeoneCurrency21997() {
-    // Check that currency of Sierra Leone is SLL (which is legal tender)
+    // CLDR 41: Check that currency of Sierra Leone is SLL (which is legal tender)
     // and not the newer currency SLE (which is not legal tender), as of CLDR 41.
     // Test will fail once SLE is declared legal.
-    UnicodeString sllStr("SLL", ""), resultStr;
+    // CLDR 42: Now check that currency of Sierra Leone is SLE (which is legal tender)
+    UnicodeString sllStr("SLE", ""), resultStr;
     UChar tmp[4];
     UErrorCode status = U_ZERO_ERROR;
 
     ucurr_forLocale("en_SL", tmp, 4, &status);
     resultStr.setTo(tmp);
     if (sllStr != resultStr) {
-        errcheckln(status, "Fail: en_SL didn't return SLL - %s", u_errorName(status));
+        errcheckln(status, "Fail: en_SL didn't return SLE - %s", u_errorName(status));
     }
 }
 #endif
index dbd6072d2c0fa9c2996924f65d247e59d34f4e4f..68f5c651f5f9be1e94c62d1572c6c11fa0ecb4ee 100644 (file)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf8795befffb64993fb4206eca8d8943ceaefd0759e3d8980fc54bc1b3a11d0a
-size 14157124
+oid sha256:e4ae80b6ce99473eef6cbdaf0c1a79ce12154456805852c1ef2b8307ef1f46f1
+size 14157165
index 5daffd297c7e66c71266f17f5624ef93ad9311db..c4e01917574733b6227b895ae85b6aeb85e86fd9 100644 (file)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24c3feb621e4d5e9c853a3e9ce0f639ccb3a067b2457d381830175012c92f9ca
+oid sha256:01837c5a85a50c05d04ee8331e307d58119b1b04767c8d136899fff990aaba25
 size 95833
index 2136ecc28386e7980c88b72421025df91328b15a..958e7dde9c570d5571292bf87591a34b456d5643 100644 (file)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:349fef765df14d111f23ea45a7b67ecb17b12fd5d95baf53761354c43a307a88
+oid sha256:089ebe48b1b8db3143f8f24d70707b618dfafda8b158ad7714bbd71a16928238
 size 828462
index b1ad3645e3292488a740e89f65ef5d3cd41ed153..8ef1515b027aea0f966ad0e332d21628343035bc 100644 (file)
@@ -985,13 +985,14 @@ public class CurrencyTest extends TestFmwk {
     }
     @Test
     public void testSierraLeoneCurrency21997() {
-        // Check that currency of Sierra Leone is SLL (which is legal tender)
+        // CLDR 41: Check that currency of Sierra Leone is SLL (which is legal tender)
         // and not the newer currency SLE (which is not legal tender), as of CLDR 41.
         // Test will fail once SLE is declared legal.
+        // CLDR 42: Now check that currency of Sierra Leone is SLE (which is legal tender)
         Currency currency = Currency.getInstance(ULocale.forLanguageTag("en-SL"));
         String result = currency.getCurrencyCode();
-        if (!"SLL".equals(result)) {
-            errln("Currency code of en-SL is not SLL but " + result);
+        if (!"SLE".equals(result)) {
+            errln("Currency code of en-SL is not SLE but " + result);
         }
     }
 }
index 6a8c70a788cf667f9aacdba5bd2eb89194e89d25..125fbe0b1764e1b823c308f26de91fc7d536329a 100644 (file)
 //ldml/personNames/personName[@order="(%A)"][@length="(%A)"][@usage="(%A)"][@formality="(%A)"]/namePattern ;           /personNames/namePattern/$1-$2-$3-$4
 //ldml/personNames/personName[@order="(%A)"][@length="(%A)"][@usage="(%A)"][@formality="(%A)"]/namePattern[@alt="1"] ; /personNames/namePattern/$1-$2-$3-$4
 //ldml/personNames/personName[@order="(%A)"][@length="(%A)"][@usage="(%A)"][@formality="(%A)"]/namePattern[@alt="2"] ; /personNames/namePattern/$1-$2-$3-$4
+//ldml/personNames/personName[@order="(%A)"][@length="(%A)"][@usage="(%A)"][@formality="(%A)"]/alias[@source="locale"][@path="../personName[@order='(%A)'][@length='(%A)'][@usage='(%A)'][@formality='(%A)']"]
+     ; /personNames/namePattern/$1-$2-$3-$4:alias ; values=/LOCALE/personNames/namePattern/$5-$6-$7-$8
 
 # Misc