Skip to content

Improve the locale support #7981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
cakebaker merged 7 commits into from
May 29, 2025
Merged

Improve the locale support #7981

cakebaker merged 7 commits into from
May 29, 2025

Conversation

@sylvestre
Copy link
Contributor

@sylvestre sylvestre commented May 24, 2025

Improve the fallback + remove the default + add tests

@sylvestre sylvestre requested a review from Copilot May 24, 2025 18:27
Copilot AI reviewed May 24, 2025
View reviewed changes
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This pull request enhances locale support by improving fallback behavior, removing the default locale configuration, and adding tests to cover these changes.

  • Updated locale generation commands to include Spanish UTF-8 support.
  • Adjusted workflow configurations to improve locale fallback consistency.

@github-actions
Copy link

github-actions bot commented May 24, 2025

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)
Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

@sylvestre sylvestre requested a review from cakebaker May 24, 2025 19:50
@github-actions
Copy link

github-actions bot commented May 24, 2025

GNU testsuite comparison:

GNU test failed: tests/misc/arch. tests/misc/arch is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/misc/stdbuf (fails in this run but passes in the 'main' branch)
Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)
Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

@sylvestre sylvestre marked this pull request as draft May 24, 2025 20:52
cakebaker
cakebaker reviewed May 25, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 25, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 25, 2025
View reviewed changes
src/uucore/src/lib/mods/locale.rs
fn format(&self, id: &str, args: Option<&FluentArgs>, default: &str) -> String {
match self.bundle.get_message(id).and_then(|m| m.value()) {
Some(value) => {
fn format(&self, id: &str, args: Option<&FluentArgs>) -> String {
Copy link
Contributor

@cakebaker cakebaker May 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be more logical to return an Option<String> to distinguish between found/not found.

Copy link
Contributor Author

@sylvestre sylvestre May 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if not found, i think we should just return the id instead of an empty string.
it isn't ideal but better than an empty string
no ?

Copy link
Contributor

@cakebaker cakebaker May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, it wouldn't be an empty string but None.

@sylvestre sylvestre force-pushed the locale2 branch 2 times, most recently from 888542f to 8882cd8 Compare May 26, 2025 19:55
@github-actions
Copy link

github-actions bot commented May 26, 2025

GNU testsuite comparison:

GNU test failed: tests/misc/arch. tests/misc/arch is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/misc/stdbuf (fails in this run but passes in the 'main' branch)

@github-actions
Copy link

github-actions bot commented May 26, 2025

GNU testsuite comparison:

GNU test failed: tests/misc/arch. tests/misc/arch is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)

@github-actions
Copy link

github-actions bot commented May 26, 2025

GNU testsuite comparison:

GNU test failed: tests/misc/arch. tests/misc/arch is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/misc/stdbuf (fails in this run but passes in the 'main' branch)
Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

@github-actions
Copy link

github-actions bot commented May 27, 2025

GNU testsuite comparison:

GNU test failed: tests/misc/arch. tests/misc/arch is passing on 'main'. Maybe you have to rebase?

@github-actions
Copy link

github-actions bot commented May 27, 2025

GNU testsuite comparison:

GNU test failed: tests/misc/arch. tests/misc/arch is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/misc/stdbuf (fails in this run but passes in the 'main' branch)

@github-actions
Copy link

github-actions bot commented May 27, 2025

GNU testsuite comparison:

Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

@github-actions
Copy link

github-actions bot commented May 27, 2025

GNU testsuite comparison:

Skip an intermittent issue tests/misc/stdbuf (fails in this run but passes in the 'main' branch)

@sylvestre sylvestre marked this pull request as ready for review May 27, 2025 11:14
@sylvestre sylvestre requested a review from cakebaker May 27, 2025 11:15
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
cakebaker
cakebaker reviewed May 28, 2025
View reviewed changes
@sylvestre
locale: refactor the locale system:
72597bc 
* remove the default value. Avoid duplication of the english string + facilitate translation
* have english as a default. Load english when the translated string isn't available
@github-actions
Copy link

github-actions bot commented May 28, 2025

GNU testsuite comparison:

Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)
Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)

@sylvestre sylvestre requested a review from cakebaker May 29, 2025 07:01
@cakebaker cakebaker merged commit 869660b into uutils:main May 29, 2025
74 checks passed
@cakebaker
Copy link
Contributor

cakebaker commented May 29, 2025 •
edited
Loading

Good job, now we have the first (partially) bilingual util :)

@BrewTestBot BrewTestBot mentioned this pull request Sep 6, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@cakebaker cakebaker Awaiting requested review from cakebaker

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sylvestre @cakebaker