Chris Packham [off-list ref] writes:
On Thu, Dec 15, 2016 at 7:04 AM, Junio C Hamano [off-list ref] wrote:
quoted
The last one 3/3 is a nice touch that makes sure that we do not
forget what we discovered during the discussion. Very much
appreciated.
Will queue. Thanks.
Did you want me to send a v4 to mark the strings for translation or
will you apply a fixup your end?
I didn't follow the _() discussion (was there any?)
I do not think lack of _() is a show-stopper and my preference is to
keep what I queued that does not have _(), and receive a separate
follow-up patch that changes "msg" to _("msg") and does nothing
else.
Thanks.
On Thu, Dec 15, 2016 at 09:36:17AM -0800, Junio C Hamano wrote:
quoted
Did you want me to send a v4 to mark the strings for translation or
will you apply a fixup your end?
I didn't follow the _() discussion (was there any?)
I think the discussion was just "we should do that".
I do not think lack of _() is a show-stopper and my preference is to
keep what I queued that does not have _(), and receive a separate
follow-up patch that changes "msg" to _("msg") and does nothing
else.
Here's a patch.
-- >8 --
Subject: merge: mark usage error strings for translation
The nearby error messages are already marked for
translation, but these new ones aren't.
Signed-off-by: Jeff King <redacted>
---
builtin/merge.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 668aaffb8..599d25c4c 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1164,7 +1164,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
const char *nargv[] = {"reset", "--merge", NULL};
if (orig_argc != 2)
- usage_msg_opt("--abort expects no arguments",
+ usage_msg_opt(_("--abort expects no arguments"),
builtin_merge_usage, builtin_merge_options);
if (!file_exists(git_path_merge_head()))@@ -1180,7 +1180,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
const char *nargv[] = {"commit", NULL};
if (orig_argc != 2)
- usage_msg_opt("--continue expects no arguments",
+ usage_msg_opt(_("--continue expects no arguments"),
builtin_merge_usage, builtin_merge_options);
if (!file_exists(git_path_merge_head()))--
2.11.0.348.g960a0b554