Merge pull request #397 from git-f0x/master

Update to icu 2.0

Cargo.toml

@@ -23,8 +23,7 @@ tokio = { version = "1", features = ["process", "time"] }
 syntect = "5.2.0"
 two-face = "0.4.3"
 # Internationalization
-icu_collator = "1.5"
+icu = { version = "2.0.0", features = ["compiled_data"] }
-icu_provider = { version = "1.5", features = ["sync"] }
 i18n-embed = { version = "0.16", features = [
     "fluent-system",
     "desktop-requester",

src/localize.rs

@@ -1,50 +1,67 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use std::str::FromStr;
-use std::sync::OnceLock;
-
 use i18n_embed::{
     DefaultLocalizer, LanguageLoader, Localizer,
     fluent::{FluentLanguageLoader, fluent_language_loader},
 };
-use icu_collator::{Collator, CollatorOptions, Numeric};
+use icu::collator::{
-use icu_provider::DataLocale;
+    Collator, CollatorBorrowed, CollatorPreferences, options::CollatorOptions,
+    preferences::CollationNumericOrdering,
+};
+use icu::locale::Locale;
 use rust_embed::RustEmbed;
+use std::sync::LazyLock;
 
 #[derive(RustEmbed)]
 #[folder = "i18n/"]
 struct Localizations;
 
-pub static LANGUAGE_LOADER: OnceLock<FluentLanguageLoader> = OnceLock::new();
+pub static LANGUAGE_LOADER: LazyLock<FluentLanguageLoader> = LazyLock::new(|| {
-pub static LANGUAGE_SORTER: OnceLock<Collator> = OnceLock::new();
+    let loader: FluentLanguageLoader = fluent_language_loader!();
+
+    loader
+        .load_fallback_language(&Localizations)
+        .expect("Error while loading fallback language");
+
+    loader
+});
+
+pub static LANGUAGE_SORTER: LazyLock<CollatorBorrowed> = LazyLock::new(|| {
+    let create_collator = |locale: Locale| {
+        let mut prefs = CollatorPreferences::from(locale);
+        prefs.numeric_ordering = Some(CollationNumericOrdering::True);
+        Collator::try_new(prefs, CollatorOptions::default()).ok()
+    };
+
+    Locale::try_from_str(&LANGUAGE_LOADER.current_language().to_string())
+            .ok()
+            .and_then(create_collator)
+            .or_else(|| {
+                Locale::try_from_str(&LANGUAGE_LOADER.fallback_language().to_string())
+                    .ok()
+                    .and_then(create_collator)
+            })
+            .unwrap_or_else(|| {
+                let locale = Locale::try_from_str("en-US").expect("en-US is a valid BCP-47 tag");
+                create_collator(locale)
+                    .expect("Creating a collator from the system's current language, the fallback language, or American English should succeed")
+            })
+});
 
 #[macro_export]
 macro_rules! fl {
     ($message_id:literal) => {{
-        i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER.get().unwrap(), $message_id)
+        i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER, $message_id)
     }};
 
     ($message_id:literal, $($args:expr),*) => {{
-        i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER.get().unwrap(), $message_id, $($args), *)
+        i18n_embed_fl::fl!($crate::localize::LANGUAGE_LOADER, $message_id, $($args), *)
     }};
 }
 
 // Get the `Localizer` to be used for localizing this library.
 pub fn localizer() -> Box<dyn Localizer> {
-    LANGUAGE_LOADER.get_or_init(|| {
+    Box::from(DefaultLocalizer::new(&*LANGUAGE_LOADER, &Localizations))
-        let loader: FluentLanguageLoader = fluent_language_loader!();
-
-        loader
-            .load_fallback_language(&Localizations)
-            .expect("Error while loading fallback language");
-
-        loader
-    });
-
-    Box::from(DefaultLocalizer::new(
-        LANGUAGE_LOADER.get().unwrap(),
-        &Localizations,
-    ))
 }
 
 pub fn localize() {
@@ -52,25 +69,9 @@ pub fn localize() {
     let requested_languages = i18n_embed::DesktopLanguageRequester::requested_languages();
 
     if let Err(error) = localizer.select(&requested_languages) {
-        eprintln!("Error while loading language for App List {}", error);
+        eprintln!(
+            "Error while loading language for COSMIC Text Editor {}",
+            error
+        );
     }
 }
-
-pub fn sorter() -> &'static Collator {
-    LANGUAGE_SORTER.get_or_init(|| {
-        let mut options = CollatorOptions::new();
-        options.numeric = Some(Numeric::On);
-        let localizer = localizer();
-        let language_loader = localizer.language_loader();
-
-        DataLocale::from_str(&language_loader.current_language().to_string())
-            .or_else(|_| DataLocale::from_str(&language_loader.fallback_language().to_string()))
-            .ok()
-            .and_then(|locale| Collator::try_new(&locale, options).ok())
-            .or_else(|| {
-                let locale = DataLocale::from_str("en-US").expect("en-US is a valid BCP-47 tag");
-                Collator::try_new(&locale, options).ok()
-            })
-            .expect("Creating a collator from the system's current language, the fallback language, or American English should succeed")
-    })
-}

src/project.rs

@@ -91,7 +91,7 @@ impl Ord for ProjectNode {
                 }
             }
         }
-        crate::localize::sorter().compare(self.name(), other.name())
+        crate::localize::LANGUAGE_SORTER.compare(self.name(), other.name())
     }
 }