# [PATCH 1/2] Command names should not be translated. 3 messages from 2010-09-12 to 2010-09-13. Participants: Peter Krefting, Ævar Arnfjörð Bjarmason. Thread: https://gitlist.dev/t/25082 ## Peter Krefting, 2010-09-12 20:09 Subject: [PATCH 1/2] Command names should not be translated. Message-ID: <20100912202105.DA51D2FC00@perkele> URL: https://gitlist.dev/e/20100912202105.DA51D2FC00%40perkele ``` Signed-off-by: Peter Krefting --- builtin/notes.c | 12 ++++++------ wt-status.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index e33e39a..6679322 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -502,7 +502,7 @@ static int list(int argc, const char **argv, const char *prefix) usage_with_options(git_notes_list_usage, options); } - t = init_notes_check(N_("list")); + t = init_notes_check("list"); if (argc) { if (get_sha1(argv[0], object)) die(_("Failed to resolve '%s' as a valid ref."), argv[0]); @@ -559,7 +559,7 @@ static int add(int argc, const char **argv, const char *prefix) if (get_sha1(object_ref, object)) die(_("Failed to resolve '%s' as a valid ref."), object_ref); - t = init_notes_check(N_("add")); + t = init_notes_check("add"); note = get_note(t, object); if (note) { @@ -635,7 +635,7 @@ static int copy(int argc, const char **argv, const char *prefix) if (get_sha1(object_ref, object)) die(_("Failed to resolve '%s' as a valid ref."), object_ref); - t = init_notes_check(N_("copy")); + t = init_notes_check("copy"); note = get_note(t, object); if (note) { @@ -751,7 +751,7 @@ static int show(int argc, const char **argv, const char *prefix) if (get_sha1(object_ref, object)) die(_("Failed to resolve '%s' as a valid ref."), object_ref); - t = init_notes_check(N_("show")); + t = init_notes_check("show"); note = get_note(t, object); if (!note) @@ -788,7 +788,7 @@ static int remove_cmd(int argc, const char **argv, const char *prefix) if (get_sha1(object_ref, object)) die(_("Failed to resolve '%s' as a valid ref."), object_ref); - t = init_notes_check(N_("remove")); + t = init_notes_check("remove"); retval = remove_note(t, object); if (retval) @@ -822,7 +822,7 @@ static int prune(int argc, const char **argv, const char *prefix) usage_with_options(git_notes_prune_usage, options); } - t = init_notes_check(N_("prune")); + t = init_notes_check("prune"); prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) | (show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) ); diff --git a/wt-status.c b/wt-status.c index f6946e1..7d4719f 100644 --- a/wt-status.c +++ b/wt-status.c @@ -663,9 +663,9 @@ void wt_status_print(struct wt_status *s) wt_status_print_submodule_summary(s, 1); /* unstaged */ } if (s->show_untracked_files) { - wt_status_print_other(s, &s->untracked, _("Untracked"), _("add")); + wt_status_print_other(s, &s->untracked, _("Untracked"), "add"); if (s->show_ignored_files) - wt_status_print_other(s, &s->ignored, _("Ignored"), _("add -f")); + wt_status_print_other(s, &s->ignored, _("Ignored"), "add -f"); } else if (s->commitable) fprintf(s->fp, _("# Untracked files not listed%s\n"), advice_status_hints -- 1.7.1 ``` ## Ævar Arnfjörð Bjarmason, 2010-09-12 22:51 Subject: Re: [PATCH 1/2] Command names should not be translated. Message-ID: URL: https://gitlist.dev/e/AANLkTinN_fDAVVuT1ygCe7gMpHqAhL4GGjrZ98igbbP3%40mail.gmail.com In-Reply-To: <20100912202105.DA51D2FC00@perkele> ``` On Sun, Sep 12, 2010 at 20:09, Peter Krefting wrote: First off, thanks for contributing to this. > -       t = init_notes_check(N_("list")); > +       t = init_notes_check("list"); > -       t = init_notes_check(N_("add")); > +       t = init_notes_check("add"); > -       t = init_notes_check(N_("copy")); > +       t = init_notes_check("copy"); > -       t = init_notes_check(N_("show")); > +       t = init_notes_check("show"); > -       t = init_notes_check(N_("remove")); > +       t = init_notes_check("remove"); > -       t = init_notes_check(N_("prune")); > +       t = init_notes_check("prune"); I disagree with all those. These don't end up being used in a context like: die("git-%s: error ...", command); But: die(_("Refusing to %s notes in %s (outside of refs/notes/)"), _(subcommand), t->ref); I.e. here the git notes command name should be translated as a verb in the native language (or not, that's up to the translator). E.g. I'd translate that as: add: Neita að bæta við copy: Neita að afrita etc. into Icelandic. Other languages will probably also want to translate that. >        prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) | >                (show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) ); > diff --git a/wt-status.c b/wt-status.c > index f6946e1..7d4719f 100644 > --- a/wt-status.c > +++ b/wt-status.c > @@ -663,9 +663,9 @@ void wt_status_print(struct wt_status *s) >                wt_status_print_submodule_summary(s, 1);  /* unstaged */ >        } >        if (s->show_untracked_files) { > -               wt_status_print_other(s, &s->untracked, _("Untracked"), _("add")); > +               wt_status_print_other(s, &s->untracked, _("Untracked"), "add"); >                if (s->show_ignored_files) > -                       wt_status_print_other(s, &s->ignored, _("Ignored"), _("add -f")); > +                       wt_status_print_other(s, &s->ignored, _("Ignored"), "add -f"); >        } else if (s->commitable) >                fprintf(s->fp, _("# Untracked files not listed%s\n"), >                        advice_status_hints These however are good, because here it gets used as: color_fprintf_ln(s->fp, c, _("# (use \"git %s ...\" to include in what will be committed)"), how); I.e. this is purely a hardcoded command name. ``` ## Peter Krefting, 2010-09-13 05:07 Subject: Re: [PATCH 1/2] Command names should not be translated. Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.00.1009130706450.29710%40perkele.intern.softwolves.pp.se In-Reply-To: ``` Ævar Arnfjörð Bjarmason: > I disagree with all those. These don't end up being used in a context like: > > die("git-%s: error ...", command); > > But: > > die(_("Refusing to %s notes in %s (outside of refs/notes/)"), > _(subcommand), t->ref); You are right. I saw the first as a duplicate source of the wt-status.c command name that I got for translation. Drop these, then. Still the construct is a bit awkward, but possibly doable, at least for my language. > These however are good, because here it gets used as: > > color_fprintf_ln(s->fp, c, _("# (use \"git %s ...\" to > include in what will be committed)"), how); > > I.e. this is purely a hardcoded command name. Indeed. -- \\// Peter - http://www.softwolves.pp.se/ ```