finchie/cli_framework - Change 4MRF5E76QSW3EPICI6TNEGJ2KSBWODWMIDQPLYALDWBYWKAV5LJAC

Generate simple locale matching code in `localize()`

Needs refinement, but allows selection between multiple supported locales on a per-message basis, which is one of the final blockers for a finished MVP!

Created by finchie on March 18, 2024

4MRF5E76QSW3EPICI6TNEGJ2KSBWODWMIDQPLYALDWBYWKAV5LJAC

Dependencies

In channels

main

Change contents

Replacement in fluent_embed/src/parse_macro.rs at line 16 [4.39]

B:BD[3.200] → [3.200:259]

    let mut messages = Vec::with_capacity(variants.len());

[3.200]

[4.397]

    let mut extra_messages = Vec::with_capacity(variants.len());
    let mut canonical_messages = Vec::with_capacity(variants.len());

Replacement in fluent_embed/src/parse_macro.rs at line 38 [4.39]

B:BD[4.1307] → [5.0:57]

        messages.push(group.message(&kebab_case_ident));

[4.1307]

[4.1348]

        extra_messages.push(group.message(&kebab_case_ident));
        canonical_messages.push(group.canonical_message(&kebab_case_ident));

Insertion in fluent_embed/src/parse_macro.rs at line 42 [4.39]
[4.1355]
[4.1355]
```
    // TODO: locale matching should use a better algorithm
```

Replacement in fluent_embed/src/parse_macro.rs at line 45 [4.39]

B:BD[4.1390] → [5.58:174]

            fn localize(&self, locale: &::icu_locid::Locale, plural_rules: &::icu_plurals::PluralRules) -> String {

[4.1390]

[4.1476]

            fn localize(&self, locales: &[&::icu_locid::Locale], plural_rules: &::icu_plurals::PluralRules) -> String {
                // Check each locale to see if it's implemented for this message
                for locale in locales {
                    match self {
                        #(Self::#idents => #extra_messages),*
                    }
                }
                // Fall back to default locale

Replacement in fluent_embed/src/parse_macro.rs at line 55 [4.39]

B:BD[4.1505] → [4.1505:1557]

                    #(Self::#idents => #messages),*

[4.1505]

[4.1557]

                    #(Self::#idents => #canonical_messages),*

Deletion in fluent_embed/src/group.rs at line 84 [6.3543]

B:BD[5.1171] → [2.1741:1893]

        let canonical_locale = syn::LitStr::new(
            &self.canonical_locale.to_string(),
            proc_macro2::Span::call_site(),
        );

Deletion in fluent_embed/src/group.rs at line 89 [6.3543]

B:BD[2.2083] → [2.2083:2199]

        let canonical_message =
            crate::parse_fluent::message(&self.canonical_messages[message_column]);

Deletion in fluent_embed/src/group.rs at line 101 [6.3543]

B:BD[2.2757] → [2.2757:2852]


            assert!(locale.normalizing_eq(#canonical_locale));
            #canonical_message

Insertion in fluent_embed/src/group.rs at line 103 [6.3543]

[7.2034]

[6.6614]


    pub fn canonical_message(&self, id: &str) -> syn::Expr {
        let message_column = self
            .canonical_messages
            .iter()
            .position(|message| message.id.name == id)
            .expect("Message id must be valid");
        crate::parse_fluent::message(&self.canonical_messages[message_column])
    }

Replacement in cli_macros/tests/selectors.rs at line 31 [8.140]

B:BD[8.956] → [5.1418:1472]

            message.localize(&locale, &plural_rules),

[8.956]

[8.1001]

            message.localize(&[&locale], &plural_rules),