cf

unicode-org · Mar 21, 2024 · 848a668 · 848a668
1 parent 16c7584
commit 848a668
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 37 deletions.
diff --git a/provider/datagen/src/transform/cldr/cldr_serde/parent_locales.rs b/provider/datagen/src/transform/cldr/cldr_serde/parent_locales.rs
@@ -15,6 +15,7 @@ use std::collections::HashMap;
 pub struct ParentLocales {
     #[serde(rename = "parentLocale")]
     pub parent_locale: HashMap<LanguageIdentifier, LanguageIdentifier>,
+    pub collations: HashMap<String, LanguageIdentifier>,
 }
 
 #[derive(PartialEq, Debug, Deserialize)]

diff --git a/provider/datagen/src/transform/cldr/fallback/mod.rs b/provider/datagen/src/transform/cldr/fallback/mod.rs
@@ -6,8 +6,6 @@ use crate::transform::cldr::cldr_serde;
 
 use super::locale_canonicalizer::likely_subtags::LikelySubtagsResources;
 use icu_locid::{
-    extensions::unicode::{key, Key},
-    langid,
     subtags::{Language, Region, Script},
     LanguageIdentifier,
 };
@@ -53,35 +51,6 @@ impl DataProvider<LocaleFallbackParentsV1Marker> for crate::DatagenProvider {
     }
 }
 
-impl DataProvider<CollationFallbackSupplementV1Marker> for crate::DatagenProvider {
-    fn load(
-        &self,
-        req: DataRequest,
-    ) -> Result<DataResponse<CollationFallbackSupplementV1Marker>, DataError> {
-        self.check_req::<CollationFallbackSupplementV1Marker>(req)?;
-        // TODO(#1964): Load this data from its proper sources. For now, it is copied from:
-        // https://github.com/unicode-org/icu/blob/main/tools/cldr/cldr-to-icu/build-icu-data.xml
-        // as well as from CLDR XML.
-        #[allow(clippy::type_complexity)]
-        let parents_list: [(&UnvalidatedStr, (Language, Option<Script>, Option<Region>));
-            1] = [
-            ("yue".into(), (&langid!("zh-Hant")).into()), //
-        ];
-        let unicode_extension_defaults_list: [(Key, &UnvalidatedStr, &UnvalidatedStr); 2] = [
-            (key!("co"), "zh".into(), "pinyin".into()),
-            (key!("co"), "zh-Hant".into(), "stroke".into()),
-        ];
-        let data = LocaleFallbackSupplementV1 {
-            parents: parents_list.into_iter().collect(),
-            unicode_extension_defaults: unicode_extension_defaults_list.into_iter().collect(),
-        };
-        Ok(DataResponse {
-            metadata: Default::default(),
-            payload: Some(DataPayload::from_owned(data)),
-        })
-    }
-}
-
 impl IterableDataProvider<LocaleFallbackLikelySubtagsV1Marker> for crate::DatagenProvider {
     fn supported_locales(&self) -> Result<Vec<DataLocale>, DataError> {
         Ok(vec![Default::default()])
@@ -94,12 +63,6 @@ impl IterableDataProvider<LocaleFallbackParentsV1Marker> for crate::DatagenProvi
     }
 }
 
-impl IterableDataProvider<CollationFallbackSupplementV1Marker> for crate::DatagenProvider {
-    fn supported_locales(&self) -> Result<Vec<DataLocale>, DataError> {
-        Ok(vec![Default::default()])
-    }
-}
-
 fn transform<'x>(
     it: impl Iterator<Item = (&'x LanguageIdentifier, &'x LanguageIdentifier)> + 'x,
 ) -> LocaleFallbackLikelySubtagsV1<'static> {

diff --git a/provider/datagen/src/transform/icuexport/collator/mod.rs b/provider/datagen/src/transform/icuexport/collator/mod.rs
@@ -11,17 +11,77 @@ use icu_collections::codepointtrie::CodePointTrie;
 use icu_locid::extensions::unicode::key;
 use icu_locid::extensions::unicode::Value;
 use icu_locid::subtags::language;
+use icu_locid::subtags::Language;
+use icu_locid::subtags::Region;
+use icu_locid::subtags::Script;
 use icu_locid::LanguageIdentifier;
 use icu_locid::Locale;
+use icu_locid_transform::provider::CollationFallbackSupplementV1Marker;
+use icu_locid_transform::provider::LocaleFallbackSupplementV1;
 use icu_provider::prelude::*;
 use std::collections::HashSet;
 use std::convert::TryFrom;
 use std::str::FromStr;
 use writeable::Writeable;
 use zerovec::ZeroVec;
+use zerovec::ule::UnvalidatedStr;
 
 mod collator_serde;
 
+impl DataProvider<CollationFallbackSupplementV1Marker> for crate::DatagenProvider {
+    fn load(
+        &self,
+        req: DataRequest,
+    ) -> Result<DataResponse<CollationFallbackSupplementV1Marker>, DataError> {
+        self.check_req::<CollationFallbackSupplementV1Marker>(req)?;
+
+        let data = LocaleFallbackSupplementV1 {
+            parents: self
+                .cldr()?
+                .core()
+                .read_and_parse::<super::super::cldr::cldr_serde::parent_locales::Resource>(
+                    "supplemental/parentLocales.json",
+                )?
+                .supplemental
+                .parent_locales
+                .collations
+                .iter()
+                .map(|(from, to)| {
+                    (
+                        <&UnvalidatedStr>::from(from.as_str()),
+                        <(Language, Option<Script>, Option<Region>)>::from(to),
+                    )
+                })
+                .collect(),
+            unicode_extension_defaults: [
+                (
+                    key!("co"),
+                    <&UnvalidatedStr>::from("zh"),
+                    <&UnvalidatedStr>::from("pinyin"),
+                ),
+                (
+                    key!("co"),
+                    <&UnvalidatedStr>::from("zh-Hant"),
+                    <&UnvalidatedStr>::from("stroke"),
+                ),
+            ]
+            .into_iter()
+            .collect(),
+        };
+        Ok(DataResponse {
+            metadata: Default::default(),
+            payload: Some(DataPayload::from_owned(data)),
+        })
+    }
+}
+
+
+impl IterableDataProviderInternal<CollationFallbackSupplementV1Marker> for crate::DatagenProvider {
+    fn supported_locales_impl(&self) -> Result<HashSet<DataLocale>, DataError> {
+        Ok(HashSet::from_iter([Default::default()]))
+    }
+}
+
 impl crate::DatagenProvider {
     /// Backward compatibility for https://unicode-org.atlassian.net/browse/CLDR-15603
     fn has_legacy_swedish_variants(&self) -> bool {