status: disable translation when --porcelain is used

"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>

diff --git a/wt-status.c b/wt-status.c
index 85390b813f12e2392b73dd6dffe8d1b41e838614..b53ce330b9f63974a2f64f28a0697757861fef05 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -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, " [");
        if (upstream_is_gone) {
        color_fprintf(s->fp, header_color, " [");
        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);
        } else if (!num_theirs) {
                color_fprintf(s->fp, branch_color_remote, "%d", 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);
        } else {
                color_fprintf(s->fp, branch_color_local, "%d", num_ours);
        } 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->relative_paths = 0;
        s->prefix = NULL;
        s->use_color = 0;
        s->relative_paths = 0;
        s->prefix = NULL;

+       s->no_gettext = 1;

        wt_shortstatus_print(s);
 }
        wt_shortstatus_print(s);
 }

diff --git a/wt-status.h b/wt-status.h
index 30a481258366733ad5d6a65e3a9c3ae1ee74e833..82f6ce64f8312f9d02e6dc08d46ec8af96a311a3 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -50,6 +50,7 @@ struct wt_status {
        enum commit_whence whence;
        int nowarn;
        int use_color;
        enum commit_whence whence;
        int nowarn;
        int use_color;

+       int no_gettext;

        int display_comment_prefix;
        int relative_paths;
        int submodule_summary;
        int display_comment_prefix;
        int relative_paths;
        int submodule_summary;