mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: i18n: diff: mark die messages for translation

Browse Source 
While marking individual messages for translation, consolidate some
messages "option 'foo' requires a value" that is used for many
options into one by introducing a helper function to die with the
message with the option name embedded in it, and ask the translators
to localize that single message instead.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jean-Noël AVILA
2016-09-20 21:04:27 +02:00
committed by Junio C Hamano
parent f2b93b388c
commit a2f05c9454
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
diff.c
View File

@ -54,6 +54,11 @@ static char diff_colors[][COLOR_MAXLEN] = {
GIT_COLOR_NORMAL, /* FUNCINFO */ GIT_COLOR_NORMAL, /* FUNCINFO */
}; };
static NORETURN void die_want_option(const char *option_name)
{
die(_("option '%s' requires a value"), option_name);
}
static int parse_diff_color_slot(const char *var) static int parse_diff_color_slot(const char *var)
{ {
if (!strcasecmp(var, "context") || !strcasecmp(var, "plain")) if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
@ -3322,7 +3327,7 @@ void diff_setup_done(struct diff_options *options)
if (options->output_format & DIFF_FORMAT_NO_OUTPUT) if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
count++; count++;
if (count > 1) if (count > 1)
die("--name-only, --name-status, --check and -s are mutually exclusive"); die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
/* /*
* Most of the time we can say "there are changes" * Most of the time we can say "there are changes"
@ -3518,7 +3523,7 @@ static int stat_opt(struct diff_options *options, const char **av)
if (*arg == '=') if (*arg == '=')
width = strtoul(arg + 1, &end, 10); width = strtoul(arg + 1, &end, 10);
else if (!*arg && !av[1]) else if (!*arg && !av[1])
die("Option '--stat-width' requires a value"); die_want_option("--stat-width");
else if (!*arg) { else if (!*arg) {
width = strtoul(av[1], &end, 10); width = strtoul(av[1], &end, 10);
argcount = 2; argcount = 2;
@ -3527,7 +3532,7 @@ static int stat_opt(struct diff_options *options, const char **av)
if (*arg == '=') if (*arg == '=')
name_width = strtoul(arg + 1, &end, 10); name_width = strtoul(arg + 1, &end, 10);
else if (!*arg && !av[1]) else if (!*arg && !av[1])
die("Option '--stat-name-width' requires a value"); die_want_option("--stat-name-width");
else if (!*arg) { else if (!*arg) {
name_width = strtoul(av[1], &end, 10); name_width = strtoul(av[1], &end, 10);
argcount = 2; argcount = 2;
@ -3536,7 +3541,7 @@ static int stat_opt(struct diff_options *options, const char **av)
if (*arg == '=') if (*arg == '=')
graph_width = strtoul(arg + 1, &end, 10); graph_width = strtoul(arg + 1, &end, 10);
else if (!*arg && !av[1]) else if (!*arg && !av[1])
die("Option '--stat-graph-width' requires a value"); die_want_option("--stat-graph-width");
else if (!*arg) { else if (!*arg) {
graph_width = strtoul(av[1], &end, 10); graph_width = strtoul(av[1], &end, 10);
argcount = 2; argcount = 2;
@ -3545,7 +3550,7 @@ static int stat_opt(struct diff_options *options, const char **av)
if (*arg == '=') if (*arg == '=')
count = strtoul(arg + 1, &end, 10); count = strtoul(arg + 1, &end, 10);
else if (!*arg && !av[1]) else if (!*arg && !av[1])
die("Option '--stat-count' requires a value"); die_want_option("--stat-count");
else if (!*arg) { else if (!*arg) {
count = strtoul(av[1], &end, 10); count = strtoul(av[1], &end, 10);
argcount = 2; argcount = 2;