diff --git a/src/uu/stat/locales/en-US.ftl b/src/uu/stat/locales/en-US.ftl index c1acddfad0..3db5e503bb 100644 --- a/src/uu/stat/locales/en-US.ftl +++ b/src/uu/stat/locales/en-US.ftl @@ -90,6 +90,7 @@ stat-word-block = Block stat-word-size = Size stat-word-fundamental = Fundamental stat-word-block-size = block size +stat-word-block-size-capitalized = Block size stat-word-blocks = Blocks stat-word-total = Total stat-word-free = Free diff --git a/src/uu/stat/locales/fr-FR.ftl b/src/uu/stat/locales/fr-FR.ftl index 3c51a09c66..1d0f8038cd 100644 --- a/src/uu/stat/locales/fr-FR.ftl +++ b/src/uu/stat/locales/fr-FR.ftl @@ -73,6 +73,7 @@ stat-word-block = Bloc stat-word-size = Taille stat-word-fundamental = Fondamentale stat-word-block-size = taille bloc +stat-word-block-size-capitalized = Taille bloc stat-word-blocks = Blocs stat-word-total = Total stat-word-free = Libres diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs index 4ad0005325..1e98f0e607 100644 --- a/src/uu/stat/src/stat.rs +++ b/src/uu/stat/src/stat.rs @@ -1428,15 +1428,14 @@ impl Stater { "%n %i %l %t %s %S %b %f %a %c %d\n".into() } else { format!( - " {}: \"%n\"\n {}: %-8i {}: %-7l {}: %T\n{} \ - {}: %-10s {} {}: %S\n{}: {}: %-10b \ + " {}: \"%n\"\n {}: %-8i {}: %-7l {}: %T\n{}: %-10s \ + {} {}: %S\n{}: {}: %-10b \ {}: %-10f {}: %a\n{}: {}: %-10c {}: %d\n", translate!("stat-word-file"), translate!("stat-word-id"), translate!("stat-word-namelen"), translate!("stat-word-type"), - translate!("stat-word-block"), - translate!("stat-word-size"), + translate!("stat-word-block-size-capitalized"), translate!("stat-word-fundamental"), translate!("stat-word-block-size"), translate!("stat-word-blocks"), diff --git a/tests/by-util/test_stat.rs b/tests/by-util/test_stat.rs index 9e47c71277..3144b56122 100644 --- a/tests/by-util/test_stat.rs +++ b/tests/by-util/test_stat.rs @@ -52,6 +52,18 @@ fn test_fs_format() { ts.ucmd().args(&args).succeeds().stdout_is(expected_stdout); } +#[test] +// `stat -f` is only implemented for these targets; elsewhere `fs_type` is +// still `unimplemented!()`. +#[cfg(any(target_os = "linux", target_os = "android"))] +fn test_fs_default_format_block_size_label() { + // GNU prints "Block size:", not "Block Size:". + new_ucmd!() + .args(&["-f", "/"]) + .succeeds() + .stdout_contains("Block size:"); +} + #[cfg(unix)] #[test] fn test_terse_normal_format() {