Re: [PATCH v2 3/3] branch: mark more strings for translation

[Jonathan Nieder]

Nguyễn Thái Ngọc Duy wrote:

 --- 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 );

This worried me for a second --- is it an actual message that gets
emitted, a placeholder used only in code, or some combination of
the two?

Luckily it really is just a message (or rather, a value for the commit
message column in the  f7c0c00 [ahead 58, behind 197] vcs-svn: drop
obj_pool.h message).

For what it's worth, assuming this passes tests,
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 3/3] branch: mark more strings for translation

[Nguyễn Thái Ngọc Duy]

---
 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.0.rc2.23.g1fb49df

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html