@matheusbsbs / matheus-bagliano / commits / 98f5e24b90
Fork 0

i18n: git-status shortstatus messages

Make the messages added in v1.7.2-rc0~54^2~1 translatable. Some of these could use the to be implemented plural support in the gettext library. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Feb 22, 2011 at 23:42 UTC 98f5e24b9020578e4526eb1cc9588871350e5c01
1 file changed +6 -6
wt-status.c
+6 -6
@@ -878,13 +878,13 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
878 if (!prefixcmp(branch_name, "refs/heads/"))
879 branch_name += 11;
880 else if (!strcmp(branch_name, "HEAD")) {
881 - branch_name = "HEAD (no branch)";
881 + branch_name = _("HEAD (no branch)");
882 branch_color_local = color(WT_STATUS_NOBRANCH, s);
883 }
884
885 branch = branch_get(s->branch + 11);
886 if (s->is_initial)
887 - color_fprintf(s->fp, header_color, "Initial commit on ");
887 + color_fprintf(s->fp, header_color, _("Initial commit on "));
888 if (!stat_tracking_info(branch, &num_ours, &num_theirs)) {
889 color_fprintf_ln(s->fp, branch_color_local,
890 "%s", branch_name);
@@ -899,15 +899,15 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
899
900 color_fprintf(s->fp, header_color, " [");
901 if (!num_ours) {
902 - color_fprintf(s->fp, header_color, "behind ");
902 + color_fprintf(s->fp, header_color, _("behind "));
903 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
904 } else if (!num_theirs) {
905 - color_fprintf(s->fp, header_color, "ahead ");
905 + color_fprintf(s->fp, header_color, _("ahead "));
906 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
907 } else {
908 - color_fprintf(s->fp, header_color, "ahead ");
908 + color_fprintf(s->fp, header_color, _("ahead "));
909 color_fprintf(s->fp, branch_color_local, "%d", num_ours);
910 - color_fprintf(s->fp, header_color, ", behind ");
910 + color_fprintf(s->fp, header_color, _(", behind "));
911 color_fprintf(s->fp, branch_color_remote, "%d", num_theirs);
912 }
913