locale: honor LC_ALL and LC_MESSAGES precedence over LANG#13331
Open
costajohnt wants to merge 2 commits into
Open
locale: honor LC_ALL and LC_MESSAGES precedence over LANG#13331costajohnt wants to merge 2 commits into
costajohnt wants to merge 2 commits into
Conversation
detect_system_locale() only read LANG, ignoring LC_ALL and LC_MESSAGES. POSIX message-locale precedence is LC_ALL > LC_MESSAGES > LANG: the first of those that is set and non-empty wins (set-but-empty is treated as unset), falling back to en-US when none qualify. Extract the precedence + encoding-stripping into a pure resolve_locale_string helper that takes an env lookup closure, so the logic is unit-tested without mutating process-global env vars (which race under parallel test threads). detect_system_locale() passes std::env::var through it, preserving the exact old string handling (only which variable supplies the value changed).
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #8922.
Locale detection only read
LANG, soLC_ALLandLC_MESSAGESwere ignored. GNU honors all three, soLC_ALL=fr_FR.UTF-8 sleep --helpprints French there but English in uutils.This applies the POSIX message-locale precedence
LC_ALL>LC_MESSAGES>LANG: the first of those that is set and non-empty wins (a set-but-empty value is treated as unset), otherwise it falls back to the existingen-USdefault. The winning value keeps the same.<encoding>stripping as before (fr_FR.UTF-8->fr_FR), so theLANG-only path is unchanged.The precedence lives in a small pure helper that takes the env lookup as an argument, so it can be unit-tested without mutating process-global env vars (which race under parallel test threads):
detect_system_localejust calls it withstd::env::var.Behavior change
Anyone who has
LC_ALLorLC_MESSAGESset to something other thanLANGwill now get that locale for messages instead ofLANG. That is the intended fix for #8922, but noting it since it is user-visible.Tests
Seven unit tests on the helper:
LC_ALLwins,LC_MESSAGESwhenLC_ALLis unset,LANGstill works, empty treated as unset,LC_ALLoverLANG,LC_ALLoverLC_MESSAGES, and nothing-set fallback.cargo test,cargo clippy --workspace --all-targets --all-features -- -D warnings, andcargo fmt --checkall pass.