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>
Nguyễn Thái Ngọc Duy committed
Nov 10, 2018 at 06:16 UTC
a7412ae1342b09f16d659d75da5d25f137800a60
3 files changed
+4
-4
alias.c
+2
-2
@@ -47,8 +47,8 @@ void list_aliases(struct string_list *list)
47
#define SPLIT_CMDLINE_BAD_ENDING 1
48
#define SPLIT_CMDLINE_UNCLOSED_QUOTE 2
49
static const char *split_cmdline_errors[] = {
50
- "cmdline ends with \\",
51
- "unclosed quote"
50
+ N_("cmdline ends with \\"),
51
+ N_("unclosed quote")
52
};
53
54
int split_cmdline(char *cmdline, const char ***argv)
builtin/merge.c
+1
-1
@@ -577,7 +577,7 @@ static void parse_branch_merge_options(char *bmo)
577
argc = split_cmdline(bmo, &argv);
578
if (argc < 0)
579
die(_("Bad branch.%s.mergeoptions string: %s"), branch,
580
- split_cmdline_strerror(argc));
580
+ _(split_cmdline_strerror(argc)));
581
REALLOC_ARRAY(argv, argc + 2);
582
MOVE_ARRAY(argv + 1, argv, argc + 1);
583
argc++;
git.c
+1
-1
@@ -344,7 +344,7 @@ static int handle_alias(int *argcp, const char ***argv)
344
count = split_cmdline(alias_string, &new_argv);
345
if (count < 0)
346
die(_("bad alias.%s string: %s"), alias_command,
347
- split_cmdline_strerror(count));
347
+ _(split_cmdline_strerror(count)));
348
option_count = handle_options(&new_argv, &count, &envchanged);
349
if (envchanged)
350
die(_("alias '%s' changes environment variables.\n"