Re: [PATCH 1/2] describe: localize debug output fully
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 17, 2017, 18:17 UTC
- Message-ID
- <xmqqpohf7opl.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <105f48ad2ae1aa9c88ce6088e6b304294bec0835.1489763302.git.git@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> writes:
Show 6 quoted lines
> git describe --debug localizes all debug messages but not the terms > head, lightweight, annotated that it outputs for the candidates. > Localize them, too. > > Also, increase the width of that field to create room for the translated > terms.
If you worry about something not fitting within 11, there is no guarantee that 15 is enough. Wouldn't it be saner to make that _("%-11s %8d %s\n") localizable, too?
Alternatively,
if (debug) {
static int label_width = -1;
if (label_width < 0) {
int i;
for (i = 0; i < ARRAY_SIZE(prio_names); i++)
... do a one-time width measurement
... to set label_width
}
fprintf(stderr, "%-.*s %8d %s\n",
label_width, _(prio_names[t->name->prio]),
...);
...or something like that, perhaps?
Show 31 quoted lines
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
> Ralf: this is just the context for the following l10-de patch
>
> builtin/describe.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/describe.c b/builtin/describe.c
> index 76c18059bf..1a760c16f9 100644
> --- a/builtin/describe.c
> +++ b/builtin/describe.c
> @@ -49,7 +49,7 @@ struct commit_name {
> };
>
> static const char *prio_names[] = {
> - "head", "lightweight", "annotated",
> + N_("head"), N_("lightweight"), N_("annotated"),
> };
>
> static int commit_name_cmp(const struct commit_name *cn1,
> @@ -396,8 +396,8 @@ static void describe(const char *arg, int last_one)
> if (debug) {
> for (cur_match = 0; cur_match < match_cnt; cur_match++) {
> struct possible_tag *t = &all_matches[cur_match];
> - fprintf(stderr, " %-11s %8d %s\n",
> - prio_names[t->name->prio],
> + fprintf(stderr, " %-15s %8d %s\n",
> + _(prio_names[t->name->prio]),
> t->depth, t->name->path);
> }
> fprintf(stderr, _("traversed %lu commits\n"), seen_commits);