Thread (63 messages) flat view 63 messages, 5 authors, 2016-06-15

Re: [PATCH 06/25] gettextize: git-fetch formatting messages

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:49:28

On Thu, Sep 2, 2010 at 20:28, Jeff King [off-list ref] wrote:
On Thu, Sep 02, 2010 at 02:59:37PM -0500, Jonathan Nieder wrote:
quoted
(+cc: some fetch ui authors, just as a heads up)
Thanks. I think Nico actually did the fetch code, though, and I more or
less copied it for push.
quoted
quoted
@@ -249,8 +249,8 @@ static int update_local_ref(struct ref *ref,
             * If this is the head, and it's not okay to update
             * the head, and the old value of the head isn't empty...
             */
-           sprintf(display, "! %-*s %-*s -> %s  (can't fetch in current branch)",
-                   TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
+           sprintf(display, _("! %-*s %-*s -> %s  (can't fetch in current branch)"),
+                   TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
Regardless of the answer, we should probably be either consistently
translating or not translating it within this patch.  e.g. for not
translating (though I suspect translating is the better choice):

              sprintf(display, "! %-*s %-*s -> %s  %s",
                      TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
                      pretty_ref, _("(can't fetch in current branch)"));
I think you can translate "[rejected]" here, too.
Thanks. I missed that one.
However, do be aware of the --porcelain output for git-push. It was
tacked on much later, and I fear it may use some of the same strings.
Some of them are perhaps OK to translate (the human readable bit at the
end, e.g.), but others maybe not. I haven't looked closely.
There's probably more potential issues like that because I didn't know
the code well, but hopefully not too many.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help