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

i18n: parseopt: lookup help and argument translations when showing usage

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2012-05-06 21:23:51 +07:00
committed by Junio C Hamano
parent a3935e6791
commit 54e6dc7daf
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
parse-options.c
View File

@ -490,7 +490,7 @@ static int usage_argh(const struct option *opts, FILE *outfile)
s = literal ? "[%s]" : "[<%s>]";
else
s = literal ? " %s" : " <%s>";
return fprintf(outfile, s, opts->argh ? opts->argh : "...");
return fprintf(outfile, s, opts->argh ? _(opts->argh) : _("..."));
}
#define USAGE_OPTS_WIDTH 24
@ -508,13 +508,16 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
if (!err && ctx && ctx->flags & PARSE_OPT_SHELL_EVAL)
fprintf(outfile, "cat <<\\EOF\n");
fprintf(outfile, "usage: %s\n", *usagestr++);
fprintf_ln(outfile, _("usage: %s"), _(*usagestr++));
while (*usagestr && **usagestr)
fprintf(outfile, " or: %s\n", *usagestr++);
/* TRANSLATORS: the colon here should align with the
one in "usage: %s" translation */
fprintf_ln(outfile, _(" or: %s"), _(*usagestr++));
while (*usagestr) {
fprintf(outfile, "%s%s\n",
**usagestr ? " " : "",
*usagestr);
if (**usagestr)
fprintf_ln(outfile, _(" %s"), _(*usagestr));
else
putchar('\n');
usagestr++;
}
@ -528,7 +531,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
if (opts->type == OPTION_GROUP) {
fputc('\n', outfile);
if (*opts->help)
fprintf(outfile, "%s\n", opts->help);
fprintf(outfile, "%s\n", _(opts->help));
continue;
}
if (!full && (opts->flags & PARSE_OPT_HIDDEN))
@ -558,7 +561,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
fputc('\n', outfile);
pad = USAGE_OPTS_WIDTH;
}
fprintf(outfile, "%*s%s\n", pad + USAGE_GAP, "", opts->help);
fprintf(outfile, "%*s%s\n", pad + USAGE_GAP, "", _(opts->help));
}
fputc('\n', outfile);