Skip to content

i18n: ignore non-UTF-8 LANGUAGE and use next valid locale env #10631

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

Closed
EriksRemess wants to merge 1 commit into from
Closed

i18n: ignore non-UTF-8 LANGUAGE and use next valid locale env #10631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/os/locale.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,20 @@ pub fn ensureLocale(alloc: std.mem.Allocator) !void {
}
}

// gettext's LANGUAGE overrides LC_ALL/LC_MESSAGES/LANG. If it does not
// include an explicit UTF-8 locale, ignore it so gettext falls back to
// LC_ALL/LC_MESSAGES/LANG.
if ((try internal_os.getenv(alloc, "LANGUAGE"))) |language| {
defer language.deinit(alloc);
if (language.value.len > 0 and
!std.mem.endsWith(u8, language.value, ".UTF-8"))
{
_ = internal_os.setenv("LANGUAGE", "");
_ = internal_os.unsetenv("LANGUAGE");
log.info("ignoring LANGUAGE without UTF-8 locale entries value={s}", .{language.value});
}
}

// Set the locale to whatever is set in env vars.
if (setlocale(LC_ALL, "")) |v| {
log.info("setlocale from env result={s}", .{v});
Expand Down