alias.c: mark split_cmdline_strerror() strings for translation

This function can be part of translated messages. To make sure we
don't have a sentence with mixed languages, mark the strings for
translation, but only use translated strings in places we know we will
output translated strings.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/alias.c b/alias.c
index a7e4e57130d46188a4a0ee93871375218041344c..c4715380205b5f8dd032b16ade846842fa3c23b9 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -47,8 +47,8 @@ void list_aliases(struct string_list *list)
 #define SPLIT_CMDLINE_BAD_ENDING 1
 #define SPLIT_CMDLINE_UNCLOSED_QUOTE 2
 static const char *split_cmdline_errors[] = {
-       "cmdline ends with \\",
-       "unclosed quote"
+       N_("cmdline ends with \\"),
+       N_("unclosed quote")
 };
 
 int split_cmdline(char *cmdline, const char ***argv)

diff --git a/builtin/merge.c b/builtin/merge.c
index 4aa60715980f2f226d752e9d7fe0df4ecdcc369d..92ba7e1c6dc2a7d3cce1259ec6faaead188f53d9 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -577,7 +577,7 @@ static void parse_branch_merge_options(char *bmo)
        argc = split_cmdline(bmo, &argv);
        if (argc < 0)
                die(_("Bad branch.%s.mergeoptions string: %s"), branch,
-                   split_cmdline_strerror(argc));
+                   _(split_cmdline_strerror(argc)));
        REALLOC_ARRAY(argv, argc + 2);
        MOVE_ARRAY(argv + 1, argv, argc + 1);
        argc++;

diff --git a/git.c b/git.c
index 5fd30da09315ad99049c4b216caa03e82ba79f32..c7e122cfc1483b8d59d75ab12a9902e8d36d34e0 100644 (file)
--- a/git.c
+++ b/git.c
@@ -344,7 +344,7 @@ static int handle_alias(int *argcp, const char ***argv)
                count = split_cmdline(alias_string, &new_argv);
                if (count < 0)
                        die(_("bad alias.%s string: %s"), alias_command,
-                           split_cmdline_strerror(count));
+                           _(split_cmdline_strerror(count)));
                option_count = handle_options(&new_argv, &count, &envchanged);
                if (envchanged)
                        die(_("alias '%s' changes environment variables.\n"