uucore: add functions to manage translations #7955
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sylvestre
force-pushed
the
locale
branch
8 times, most recently
from
572c58e to
3551c6f
Compare
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
There was a problem hiding this comment.
Pull Request Overview
This PR adds new functions and structures to manage localization and translations in the uucore package. Key changes include:
- Introduction of the locale module with functionality to initialize localization, load Fluent bundles, and retrieve localized messages.
- Updates to mod files and Cargo.toml to expose the new locale module and add necessary Fluent dependencies.
- Modifications to configuration files (deny.toml and VSCode wordlist) to support the new dependencies.
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/uucore/src/lib/mods/locale.rs | New localization functionality with resource loading and message formatting functions. |
| src/uucore/src/lib/mods.rs | Locale module exposed. |
| src/uucore/src/lib/lib.rs | Locale module publicly re-exported. |
| src/uucore/Cargo.toml | Dependency changes for Fluent and related crates. |
| deny.toml | Updated dependency skips relevant to Fluent usage. |
| Cargo.toml | Added Fluent dependencies. |
| .vscode/cspell.dictionaries/workspace.wordlist.txt | Updated wordlist for new terminology. |
Comments suppressed due to low confidence (1)
src/uucore/src/lib/mods/locale.rs:229
- [nitpick] The parameter name 'rustc_args' may be misleading since the function works with Fluent arguments for localization. Consider renaming it to 'args' or 'fluent_args' to better reflect its purpose.
rustc_args: HashMap<String, String>,
|
GNU testsuite comparison: |
cakebaker
reviewed
May 22, 2025
cakebaker
reviewed
May 22, 2025
sylvestre
force-pushed
the
locale
branch
2 times, most recently
from
793d4e0 to
fc17288
Compare
cakebaker
reviewed
May 22, 2025
| let locale_path = config.get_locale_path(&try_locale); | ||
| tried_paths.push(locale_path.clone()); | ||
|
|
||
| if let Ok(ftl_string) = fs::read_to_string(&locale_path) { |
There was a problem hiding this comment.
in the wrong order
cakebaker
reviewed
May 22, 2025
Comment on lines
+134
to
+135
| loaded = true; | ||
| break; |
There was a problem hiding this comment.
Instead of a break you could do an early return. It would make the loaded variable obsolete.
|
GNU testsuite comparison: |
cakebaker
reviewed
May 22, 2025
| Ok(bundle) | ||
| } | ||
|
|
||
| fn get_message_internal(id: &str, args: Option<FluentArgs>, default: &str) -> String { |
There was a problem hiding this comment.
I think it should be Never mind, my advice is incorrect, though I'm still not completely happy with the function name.get_internal_message.
cakebaker
reviewed
May 22, 2025
| /// ``` | ||
| pub fn get_message_with_args( | ||
| id: &str, | ||
| rustc_args: HashMap<String, String>, |
There was a problem hiding this comment.
I don't understand why it is prefixed with rustc.
cakebaker
reviewed
May 22, 2025
Comment on lines
+232
to
+235
| let mut args = FluentArgs::new(); | ||
| for (k, v) in rustc_args { | ||
| args.set(k, v); | ||
| } |
There was a problem hiding this comment.
I think you can simplify it to:
Suggested change
| let mut args = FluentArgs::new(); | |
| for (k, v) in rustc_args { | |
| args.set(k, v); | |
| } | |
| let args = rustc_args.into_iter().collect(); |
cakebaker
reviewed
May 22, 2025
Comment on lines
+314
to
+318
| let locale = match detect_system_locale() { | ||
| Ok(loc) => loc, | ||
| Err(_) => LanguageIdentifier::from_str(DEFAULT_LOCALE) | ||
| .expect("Default locale should always be valid"), | ||
| }; |
There was a problem hiding this comment.
I think you can simplify it to:
Suggested change
| let locale = match detect_system_locale() { | |
| Ok(loc) => loc, | |
| Err(_) => LanguageIdentifier::from_str(DEFAULT_LOCALE) | |
| .expect("Default locale should always be valid"), | |
| }; | |
| let locale = detect_system_locale().unwrap_or_else(|_| { | |
| LanguageIdentifier::from_str(DEFAULT_LOCALE).expect("Default locale should always be valid") | |
| }); |
cakebaker
reviewed
May 22, 2025
Comment on lines
+102
to
+109
| // Always ensure DEFAULT_LOCALE is in the fallback chain | ||
| let default_locale: LanguageIdentifier = DEFAULT_LOCALE | ||
| .parse() | ||
| .map_err(|_| LocalizationError::Parse("Failed to parse default locale".into()))?; | ||
|
|
||
| if !locales_to_try.contains(&default_locale) { | ||
| locales_to_try.push(default_locale); | ||
| } |
There was a problem hiding this comment.
Is this code necessary? In setup_localization you already add the DEFAULT_LOCALE as a fallback locale and thus it is always in locales_to_try because of line 100.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.