mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ja/clean-confirm-i18n'

Browse Source 
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:
Junio C Hamano
2015-03-06 15:02:29 -08:00
parent b6488fe191 d913022763
commit 83ac11fac4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/clean.c
View File

@ -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 {