From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Matthieu Moy" <Matthieu.Moy@grenoble-inp.fr>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 4/4] branch: mark more strings for translation
Date: Mon, 28 Jan 2013 08:18:16 +0700 [thread overview]
Message-ID: <1359335896-24406-4-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1359335896-24406-1-git-send-email-pclouds@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
On Sun, Jan 27, 2013 at 6:55 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> For what it's worth, assuming this passes tests,
It passes the tests. Although I doubt the tests are written to catch
this.
builtin/branch.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index ca61c5b..597b578 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -466,7 +466,7 @@ static void add_verbose_info(struct strbuf *out, struct ref_item *item,
int verbose, int abbrev)
{
struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT;
- const char *sub = " **** invalid ref ****";
+ const char *sub = _(" **** invalid ref ****");
struct commit *commit = item->commit;
if (commit && !parse_commit(commit)) {
@@ -590,7 +590,7 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru
struct commit *filter;
filter = lookup_commit_reference_gently(merge_filter_ref, 0);
if (!filter)
- die("object '%s' does not point to a commit",
+ die(_("object '%s' does not point to a commit"),
sha1_to_hex(merge_filter_ref));
filter->object.flags |= UNINTERESTING;
@@ -854,7 +854,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (!argc) {
if (detached)
- die("Cannot give description to detached HEAD");
+ die(_("Cannot give description to detached HEAD"));
branch_name = head;
} else if (argc == 1)
branch_name = argv[0];
@@ -866,10 +866,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
strbuf_release(&branch_ref);
if (!argc)
- return error("No commit on branch '%s' yet.",
+ return error(_("No commit on branch '%s' yet."),
branch_name);
else
- return error("No such branch '%s'.", branch_name);
+ return error(_("No branch named '%s'."),
+ branch_name);
}
strbuf_release(&branch_ref);
--
1.8.1.1.459.g5970e58
prev parent reply other threads:[~2013-01-28 1:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 8:26 [PATCH] branch: reject -D/-d without branch name Nguyễn Thái Ngọc Duy
2013-01-25 8:45 ` Matthieu Moy
2013-01-25 8:56 ` Duy Nguyen
2013-01-25 12:50 ` [PATCH v2 1/3] " Nguyễn Thái Ngọc Duy
2013-01-25 12:50 ` [PATCH v2 2/3] branch: give a more helpful message on redundant arguments Nguyễn Thái Ngọc Duy
2013-01-27 11:58 ` Jonathan Nieder
2013-01-25 12:50 ` [PATCH v2 3/3] branch: mark more strings for translation Nguyễn Thái Ngọc Duy
2013-01-27 11:55 ` Jonathan Nieder
2013-01-25 19:04 ` [PATCH v2 1/3] branch: reject -D/-d without branch name Junio C Hamano
2013-01-26 3:12 ` Duy Nguyen
2013-01-28 1:18 ` [PATCH v3 1/4] branch: no detached HEAD check when editing another branch's description Nguyễn Thái Ngọc Duy
2013-01-28 1:18 ` [PATCH v3 2/4] branch: reject -D/-d without branch name Nguyễn Thái Ngọc Duy
2013-01-28 1:18 ` [PATCH v3 3/4] branch: give a more helpful message on redundant arguments Nguyễn Thái Ngọc Duy
2013-01-28 1:18 ` Nguyễn Thái Ngọc Duy [this message]
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=1359335896-24406-4-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.