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

status: disable translation when --porcelain is used

Browse Source 
"git status --branch --porcelain" displays the status of the branch
(ahead, behind, gone), and used gettext to translate the string.

Use hardcoded strings when --porcelain is used, but keep the gettext
translation for "git status --short" which is essentially the same, but
meant to be read by a human.

Reported-by: Anarky <ghostanarky@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2014-03-20 13:12:41 +01:00 committed by Junio C Hamano
parent 7bbc4e8fdb
commit 7a76c28ff2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wt-status.c
View File

@ -1483,19 +1483,21 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
return; return;
} }
#define LABEL(string) (s->no_gettext ? (string) : _(string))
color_fprintf(s->fp, header_color, " ["); color_fprintf(s->fp, header_color, " [");
if (upstream_is_gone) { if (upstream_is_gone) {
color_fprintf(s->fp, header_color, _("gone")); color_fprintf(s->fp, header_color, LABEL(N_("gone")));
} else if (!num_ours) { } else if (!num_ours) {
color_fprintf(s->fp, header_color, _("behind ")); color_fprintf(s->fp, header_color, LABEL(N_("behind ")));
color_fprintf(s->fp, branch_color_remote, "%d", num_theirs); color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
} else if (!num_theirs) { } else if (!num_theirs) {
color_fprintf(s->fp, header_color, _("ahead ")); color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
color_fprintf(s->fp, branch_color_local, "%d", num_ours); color_fprintf(s->fp, branch_color_local, "%d", num_ours);
} else { } else {
color_fprintf(s->fp, header_color, _("ahead ")); color_fprintf(s->fp, header_color, LABEL(N_(("ahead "))));
color_fprintf(s->fp, branch_color_local, "%d", num_ours); color_fprintf(s->fp, branch_color_local, "%d", num_ours);
color_fprintf(s->fp, header_color, _(", behind ")); color_fprintf(s->fp, header_color, ", %s", LABEL(N_("behind ")));
color_fprintf(s->fp, branch_color_remote, "%d", num_theirs); color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
} }
@ -1540,5 +1542,6 @@ void wt_porcelain_print(struct wt_status *s)
s->use_color = 0; s->use_color = 0;
s->relative_paths = 0; s->relative_paths = 0;
s->prefix = NULL; s->prefix = NULL;
s->no_gettext = 1;
wt_shortstatus_print(s); wt_shortstatus_print(s);
} }

1
wt-status.h
View File

@ -50,6 +50,7 @@ struct wt_status {
enum commit_whence whence; enum commit_whence whence;
int nowarn; int nowarn;
int use_color; int use_color;
int no_gettext;
int display_comment_prefix; int display_comment_prefix;
int relative_paths; int relative_paths;
int submodule_summary; int submodule_summary;