Re: [PATCH 10/10] i18n: bundle: mark strings for translation

Nguyễn Thái Ngọc Duy  [off-list ref] writes:

This is a problem in the original but we see an unmatched sq here.

On Thu, Apr 26, 2012 at 5:43 AM, Junio C Hamano [off-list ref] wrote:

Nguyễn Thái Ngọc Duy  [off-list ref] writes:

quoted

@@ -283,13 +287,13 @@ int create_bundle(struct bundle_header *header, const char *path,

      strbuf_release(&buf);
      fclose(rls_fout);
      if (finish_command(&rls))
-             return error("rev-list died");
+             return error(_("rev-list died"));

      /* write references */
      argc = setup_revisions(argc, argv, &revs, NULL);

      if (argc > 1)
-             return error("unrecognized argument: %s'", argv[1]);
+             return error(_("unrecognized argument: %s'"), argv[1]);

This is a problem in the original but we see an unmatched sq here.

Yeah. I searched the code and that seems the only place with
unbalanced quotes (both single and double quotes). I'll leave it to
you to either drop it or add another one there.
-- 
Duy

After running rev-list --boundary to retrieve the list of boundary
commits, "git bundle create" runs its own revision walk.  If in this
stage git encounters an unfamiliar option, it writes a message with an
unbalanced quotation mark:

	error: unrecognized argument: --foo'

Drop the stray quote to match the "unrecognized argument: %s" message
used elsewhere and save translators some work.

This is mostly a futureproofing measure: for now, the "rev-list
--boundary" command catches most strange arguments on its own and the
above message is not seen unless you try something esoteric like "git
bundle create test.bundle --header HEAD".

Reported-by: Junio C Hamano <redacted>
Signed-off-by: Jonathan Nieder <redacted>
---
Nguyen Thai Ngoc Duy wrote:

Yeah. I searched the code and that seems the only place with
unbalanced quotes (both single and double quotes). I'll leave it to
you to either drop it or add another one there.

Ok, here you go.

 bundle.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundle.c b/bundle.c
index d9cfd905..27ab32e4 100644
--- a/bundle.c
+++ b/bundle.c

@@ -289,7 +289,7 @@ int create_bundle(struct bundle_header *header, const char *path,
 	argc = setup_revisions(argc, argv, &revs, NULL);
 
 	if (argc > 1)
-		return error("unrecognized argument: %s'", argv[1]);
+		return error("unrecognized argument: %s", argv[1]);
 
 	object_array_remove_duplicates(&revs.pending);
 

-- 
1.7.10