Skip to content

Commit 32eef06

Browse files
authored
Merge pull request #8749 from cakebaker/wc_fix_files0_from
wc: adapt error message to pass `wc-files0-from`
2 parents 9b80a98 + 905714c commit 32eef06

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/uu/wc/locales/en-US.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ wc-help-words = print the word counts
1616
# Error messages
1717
wc-error-files-disabled = extra operand '{ $extra }'
1818
file operands cannot be combined with --files0-from
19-
wc-error-stdin-repr-not-allowed = when reading file names from stdin, no file name of '-' allowed
19+
wc-error-stdin-repr-not-allowed = when reading file names from standard input, no file name of '-' allowed
2020
wc-error-zero-length-filename = invalid zero-length file name
2121
wc-error-zero-length-filename-ctx = { $path }:{ $idx }: invalid zero-length file name
2222
wc-error-cannot-open-for-reading = cannot open { $path } for reading

src/uu/wc/locales/fr-FR.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ wc-help-words = afficher le nombre de mots
1616
# Messages d'erreur
1717
wc-error-files-disabled = opérande supplémentaire '{ $extra }'
1818
les opérandes de fichier ne peuvent pas être combinées avec --files0-from
19-
wc-error-stdin-repr-not-allowed = lors de la lecture des noms de fichiers depuis stdin, aucun nom de fichier '-' autorisé
19+
wc-error-stdin-repr-not-allowed = lors de la lecture des noms de fichiers depuis l'entrée standard, aucun nom de fichier '-' autorisé
2020
wc-error-zero-length-filename = nom de fichier de longueur nulle invalide
2121
wc-error-zero-length-filename-ctx = { $path }:{ $idx } : nom de fichier de longueur nulle invalide
2222
wc-error-cannot-open-for-reading = impossible d'ouvrir { $path } en lecture

tests/by-util/test_wc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ fn test_files0_from_with_stdin_in_file() {
544544

545545
#[test]
546546
fn test_files0_from_with_stdin_try_read_from_stdin() {
547-
const MSG: &str = "when reading file names from stdin, no file name of '-' allowed";
547+
const MSG: &str = "when reading file names from standard input, no file name of '-' allowed";
548548
new_ucmd!()
549549
.args(&["--files0-from=-"])
550550
.pipe_in("-")

0 commit comments

Comments
 (0)