undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: apply: update say_patch_name to give translators complete sentence

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2012-04-23 19:30:28 +07:00 committed by Junio C Hamano
parent 3638eb431b
commit 5613e8117d
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
builtin/apply.c
View File

@ -335,22 +335,25 @@ static void clear_image(struct image *image)
image->len = 0; image->len = 0;
} }
static void say_patch_name(FILE *output, const char *pre, /* fmt must contain _one_ %s and no other substitution */
struct patch *patch, const char *post) static void say_patch_name(FILE *output, const char *fmt, struct patch *patch)
{ {
fputs(pre, output); struct strbuf sb = STRBUF_INIT;
if (patch->old_name && patch->new_name && if (patch->old_name && patch->new_name &&
strcmp(patch->old_name, patch->new_name)) { strcmp(patch->old_name, patch->new_name)) {
quote_c_style(patch->old_name, NULL, output, 0); quote_c_style(patch->old_name, &sb, NULL, 0);
fputs(" => ", output); strbuf_addstr(&sb, " => ");
quote_c_style(patch->new_name, NULL, output, 0); quote_c_style(patch->new_name, &sb, NULL, 0);
} else { } else {
const char *n = patch->new_name; const char *n = patch->new_name;
if (!n) if (!n)
n = patch->old_name; n = patch->old_name;
quote_c_style(n, NULL, output, 0); quote_c_style(n, &sb, NULL, 0);
} }
fputs(post, output); fprintf(output, fmt, sb.buf);
fputc('\n', output);
strbuf_release(&sb);
} }
#define CHUNKSIZE (8192) #define CHUNKSIZE (8192)
@ -3172,7 +3175,7 @@ static int check_patch_list(struct patch *patch)
while (patch) { while (patch) {
if (apply_verbosely) if (apply_verbosely)
say_patch_name(stderr, say_patch_name(stderr,
"Checking patch ", patch, "...\n"); _("Checking patch %s..."), patch);
err |= check_patch(patch); err |= check_patch(patch);
patch = patch->next; patch = patch->next;
} }
@ -3536,6 +3539,7 @@ static int write_out_one_reject(struct patch *patch)
char namebuf[PATH_MAX]; char namebuf[PATH_MAX];
struct fragment *frag; struct fragment *frag;
int cnt = 0; int cnt = 0;
struct strbuf sb = STRBUF_INIT;
for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) { for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
if (!frag->rejected) if (!frag->rejected)
@ -3546,7 +3550,7 @@ static int write_out_one_reject(struct patch *patch)
if (!cnt) { if (!cnt) {
if (apply_verbosely) if (apply_verbosely)
say_patch_name(stderr, say_patch_name(stderr,
"Applied patch ", patch, " cleanly.\n"); _("Applied patch %s cleanly."), patch);
return 0; return 0;
} }
@ -3557,8 +3561,12 @@ static int write_out_one_reject(struct patch *patch)
die(_("internal error")); die(_("internal error"));
/* Say this even without --verbose */ /* Say this even without --verbose */
say_patch_name(stderr, "Applying patch ", patch, " with"); strbuf_addf(&sb, Q_("Applying patch %%s with %d reject...",
fprintf(stderr, " %d rejects...\n", cnt); "Applying patch %%s with %d rejects...",
cnt),
cnt);
say_patch_name(stderr, sb.buf, patch);
strbuf_release(&sb);
cnt = strlen(patch->new_name); cnt = strlen(patch->new_name);
if (ARRAY_SIZE(namebuf) <= cnt + 5) { if (ARRAY_SIZE(namebuf) <= cnt + 5) {