date: Fix %x, %X, %r to respect locale settings by abendrothj · Pull Request #11068 · uutils/coreutils

abendrothj · 2026-02-23T09:22:22Z

Previously these format specifiers were hardcoded to US/POSIX defaults, ignoring LC_TIME and LC_ALL. Now they call nl_langinfo to get the locale's actual format strings.

Changes:

Add D_FMT, T_FMT, T_FMT_AMPM query functions in locale.rs
Expand %x/%X/%r before jiff formatting in date.rs
Un-ignore and extend locale tests in test_date.rs

now for ci...

oech3 · 2026-02-23T09:23:59Z

Please cargo fmt

abendrothj · 2026-02-23T09:31:15Z

Please cargo fmt

oops, forgot prehook doesnt work on mac currently

- Add locale.rs functions to query nl_langinfo for D_FMT, T_FMT, T_FMT_AMPM - Add expand_locale_specifiers() to replace %x, %X, %r with locale formats - Integrate locale specifier expansion before jiff formatting - Un-ignore and extend locale tests with graceful degradation

github-actions · 2026-02-23T10:03:11Z

GNU testsuite comparison:

Skipping an intermittent issue tests/pr/bounded-memory (passes in this run but fails in the 'main' branch)

tests/by-util/test_date.rs

…e test from check to assertion

github-actions · 2026-02-25T07:51:30Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/follow-name (passes in this run but fails in the 'main' branch)
Note: The gnu test tests/expand/bounded-memory is now being skipped but was previously passing.

cakebaker · 2026-02-25T08:38:25Z

tests/by-util/test_date.rs

-        .stdout_is("19/01/1997\n");
+        .stdout_is("19.01.1997\n");


I think the new assert is incorrect (it fails on my machine) and the original assert was correct.

Here is the output I get from GNU date:

$ TZ=UTC LC_ALL=fr_FR.UTF-8 date -d "1997-01-19 08:17:48" "+%x" 19/01/1997

should be all inline to GNU now

cakebaker · 2026-02-25T09:08:49Z

tests/by-util/test_date.rs

+    if !locale_is_available("fr_FR.UTF-8") {
+        println!("Skipping French locale %X test — fr_FR.UTF-8 not available");
+        return;
+    }
+    new_ucmd!()
+        .env("TZ", "UTC")
+        .env("LC_ALL", "fr_FR.UTF-8")
+        .arg("-d")
+        .arg("1997-01-19 08:17:48")
+        .arg("+%X")
+        .succeeds()
+        .stdout_is("08:17:48\n");


I would use a locale with a different time format like en_US.UTF-8, for which the output should be 08:17:48 AM.

I'm sorry, my bad. I meant to use en_US.UTF-8 here in test_date_format_big_x_locale_aware (and not in test_date_format_r_locale_aware) because the expected outputs for the C and fr_FR.UTF-8 locales are identical.

tests/by-util/test_date.rs

github-actions · 2026-02-25T10:47:57Z

GNU testsuite comparison:

Congrats! The gnu test tests/csplit/csplit-heap is now passing!

github-actions · 2026-02-25T11:11:00Z

GNU testsuite comparison:

GNU test failed: tests/date/resolution. tests/date/resolution is passing on 'main'. Maybe you have to rebase?
Skipping an intermittent issue tests/date/date-locale-hour (passes in this run but fails in the 'main' branch)
Congrats! The gnu test tests/csplit/csplit-heap is now passing!

codspeed-hq · 2026-02-25T11:14:32Z

Merging this PR will not alter performance

✅ 294 untouched benchmarks
⏩ 42 skipped benchmarks¹

_{Comparing abendrothj:fix/dateformat (9a5b0e9) with main (9ac174b)}

42 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

github-actions · 2026-02-25T11:32:08Z

GNU testsuite comparison:

Skip an intermittent issue tests/pr/bounded-memory (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/csplit/csplit-heap is now passing!

cakebaker · 2026-02-26T10:16:47Z

tests/by-util/test_date.rs

+    new_ucmd!()
+        .env("TZ", "UTC")
+        .env("LC_ALL", "fr_FR.UTF-8")
+        .arg("-d")
+        .arg("1997-01-19 08:17:48")
+        .arg("+%r")
+        .succeeds()
+        .stdout_is(expected);


While the test looks good, it fails on Linux because the implementation doesn't output the expected value.

Here is the output of the program:

$ TZ=UTC LC_ALL=fr_FR.UTF-8 cargo run -q date -d "1997-01-19 08:17:48" "+%r" 08:17:48 AM

And here is the expected output from GNU date:

$ TZ=UTC LC_ALL=fr_FR.UTF-8 date -d "1997-01-19 08:17:48" "+%r" 08:17:48

abendrothj force-pushed the fix/dateformat branch 2 times, most recently from 462cb08 to 032b444 Compare February 23, 2026 09:30

abendrothj force-pushed the fix/dateformat branch 2 times, most recently from aa1ee97 to 0146bba Compare February 23, 2026 09:36

abendrothj force-pushed the fix/dateformat branch from 0710de3 to 81b15f0 Compare February 23, 2026 09:48

cakebaker reviewed Feb 23, 2026

View reviewed changes

tests/by-util/test_date.rs Show resolved Hide resolved

test: enhance locale-aware date formatting tests for French and chang…

b38ef52

…e test from check to assertion

abendrothj requested a review from cakebaker February 25, 2026 07:47

cakebaker reviewed Feb 25, 2026

View reviewed changes

tests/by-util/test_date.rs Show resolved Hide resolved

test: fix %x, %r linux/macos locale differences and fallback for French

5519da8

test: strictly assert %x and %r instead of loose contains checks

9a5b0e9

abendrothj force-pushed the fix/dateformat branch from 653a995 to 9a5b0e9 Compare February 25, 2026 11:13

oech3 mentioned this pull request Feb 25, 2026

shuf_input_range benchmark is flakey #11105

Open

abendrothj requested a review from cakebaker February 25, 2026 12:05

cakebaker reviewed Feb 26, 2026

View reviewed changes

Uh oh!

Conversation

abendrothj commented Feb 23, 2026

Uh oh!

oech3 commented Feb 23, 2026

Uh oh!

abendrothj commented Feb 23, 2026

Uh oh!

github-actions bot commented Feb 23, 2026

Uh oh!

Uh oh!

github-actions bot commented Feb 25, 2026

Uh oh!

cakebaker Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abendrothj Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

cakebaker Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

abendrothj Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

cakebaker Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 25, 2026

Uh oh!

github-actions bot commented Feb 25, 2026

Uh oh!

codspeed-hq bot commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging this PR will not alter performance

Footnotes

Uh oh!

github-actions bot commented Feb 25, 2026

Uh oh!

cakebaker Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cakebaker Feb 25, 2026 •

edited

Loading

codspeed-hq bot commented Feb 25, 2026 •

edited

Loading