mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
Merge branch 'ja/clean-confirm-i18n'
The prompt string "remove?" used when "git clean -i" asks the user if a path should be removed was localizable, but the code always expects a substring of "yes" to tell it to go ahead. Always show [y/N] as part of this prompt to hint that the answer is not (yet) localized. * ja/clean-confirm-i18n: Add hint interactive cleaning
This commit is contained in:
commit
83ac11fac4
|
@ -754,7 +754,8 @@ static int ask_each_cmd(void)
|
||||||
/* Ctrl-D should stop removing files */
|
/* Ctrl-D should stop removing files */
|
||||||
if (!eof) {
|
if (!eof) {
|
||||||
qname = quote_path_relative(item->string, NULL, &buf);
|
qname = quote_path_relative(item->string, NULL, &buf);
|
||||||
printf(_("remove %s? "), qname);
|
/* TRANSLATORS: Make sure to keep [y/N] as is */
|
||||||
|
printf(_("Remove %s [y/N]? "), qname);
|
||||||
if (strbuf_getline(&confirm, stdin, '\n') != EOF) {
|
if (strbuf_getline(&confirm, stdin, '\n') != EOF) {
|
||||||
strbuf_trim(&confirm);
|
strbuf_trim(&confirm);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue