From: Jiang Xin <worldhello.net@gmail.com>
To: Git List <git@vger.kernel.org>, avarab@gmail.com
Cc: Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH] i18n: format_tracking_info "Your branch is behind" message
Date: Thu, 2 Feb 2012 01:21:54 +0800 [thread overview]
Message-ID: <1328116914-61381-1-git-send-email-worldhello.net@gmail.com> (raw)
Function format_tracking_info in remote.c is called by
wt_status_print_tracking in wt-status.c, which will print
branch tracking message in git-status. git-checkout also
show these messages through it's report_tracking function.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
remote.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/remote.c b/remote.c
index 73a38..51853 100644
--- a/remote.c
+++ b/remote.c
@@ -1572,18 +1572,18 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
base = branch->merge[0]->dst;
base = shorten_unambiguous_ref(base, 0);
if (!num_theirs)
- strbuf_addf(sb, "Your branch is ahead of '%s' "
- "by %d commit%s.\n",
- base, num_ours, (num_ours == 1) ? "" : "s");
+ strbuf_addf(sb, _("Your branch is ahead of '%s' "
+ "by %d %s.\n"),
+ base, num_ours, Q_("commit", "commits", num_ours));
else if (!num_ours)
- strbuf_addf(sb, "Your branch is behind '%s' "
- "by %d commit%s, "
- "and can be fast-forwarded.\n",
- base, num_theirs, (num_theirs == 1) ? "" : "s");
+ strbuf_addf(sb, _("Your branch is behind '%s' "
+ "by %d %s, "
+ "and can be fast-forwarded.\n"),
+ base, num_theirs, Q_("commit", "commits", num_theirs));
else
- strbuf_addf(sb, "Your branch and '%s' have diverged,\n"
+ strbuf_addf(sb, _("Your branch and '%s' have diverged,\n"
"and have %d and %d different commit(s) each, "
- "respectively.\n",
+ "respectively.\n"),
base, num_ours, num_theirs);
return 1;
}
--
1.7.9.3.g1fbd7
next reply other threads:[~2012-02-01 17:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-01 17:21 Jiang Xin [this message]
2012-02-01 17:39 ` [PATCH] i18n: format_tracking_info "Your branch is behind" message Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328116914-61381-1-git-send-email-worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).