diff options
| -rw-r--r-- | src/rm.c | 10 | ||||
| -rwxr-xr-x | tests/rm/interactive-always.sh | 4 | ||||
| -rwxr-xr-x | tests/rm/interactive-once.sh | 12 |
3 files changed, 15 insertions, 11 deletions
@@ -339,9 +339,13 @@ main (int argc, char **argv) { fprintf (stderr, (x.recursive - ? _("%s: remove all arguments recursively? ") - : _("%s: remove all arguments? ")), - program_name); + ? ngettext ("%s: remove %zu argument recursively? ", + "%s: remove %zu arguments recursively? ", + select_plural (n_files)) + : ngettext ("%s: remove %zu argument? ", + "%s: remove %zu arguments? ", + select_plural (n_files))), + program_name, n_files); if (!yesno ()) exit (EXIT_SUCCESS); } diff --git a/tests/rm/interactive-always.sh b/tests/rm/interactive-always.sh index 1dfb5a694..13743eb49 100755 --- a/tests/rm/interactive-always.sh +++ b/tests/rm/interactive-always.sh @@ -72,13 +72,13 @@ no WHEN WHEN=never . WHEN=once -rm: remove all arguments recursively? . +rm: remove 2 arguments recursively? . WHEN=always @remove_empty 'file4-1'? @remove_empty 'file4-2'? . -f overrides --interactive . --interactive overrides -f -rm: remove all arguments recursively? . +rm: remove 1 argument recursively? . EOF compare expout out || fail=1 diff --git a/tests/rm/interactive-once.sh b/tests/rm/interactive-once.sh index d138b7520..dcda5b848 100755 --- a/tests/rm/interactive-once.sh +++ b/tests/rm/interactive-once.sh @@ -88,17 +88,17 @@ one file, no recursion three files, no recursion . four files, no recursion, answer no -rm: remove all arguments? . +rm: remove 4 arguments? . four files, no recursion, answer yes -rm: remove all arguments? . +rm: remove 4 arguments? . one file, recursion, answer no -rm: remove all arguments recursively? . +rm: remove 1 argument recursively? . one file, recursion, answer yes -rm: remove all arguments recursively? . +rm: remove 1 argument recursively? . multiple files, recursion, answer no -rm: remove all arguments recursively? . +rm: remove 2 arguments recursively? . multiple files, recursion, answer yes -rm: remove all arguments recursively? . +rm: remove 2 arguments recursively? . EOF compare expout out || fail=1 |