On Tue, Jun 21 2022, Dimitriy Ryazantcev via GitGitGadget wrote: > From: Dimitriy Ryazantcev <dimitriy.ryazantcev@xxxxxxxxx> > > Some messages prefixes like 'usage:'/'fatal:'/'warning:'/'error:' > were not translated. > > Signed-off-by: Dimiytriy Ryazantcev <dimitriy.ryazantcev@xxxxxxxxx> > --- > i18n: mark message helpers prefix for translation > > Some messages prefixes like 'usage:'/'fatal:'/'warning:'/'error:' were > not translated. > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1279%2FDJm00n%2Fl10n-fixes-v2 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1279/DJm00n/l10n-fixes-v2 > Pull-Request: https://github.com/git/git/pull/1279 > > Range-diff vs v1: > > 1: efcf217b361 ! 1: 6f389468631 l10n: mark message helpers prefix for translation. > @@ Metadata > Author: Dimitriy Ryazantcev <dimitriy.ryazantcev@xxxxxxxxx> > > ## Commit message ## > - l10n: mark message helpers prefix for translation. > + i18n: mark message helpers prefix for translation > > - Some messages prefixed like 'usage:'/'fatal:'/'warning:'/'error:' > + Some messages prefixes like 'usage:'/'fatal:'/'warning:'/'error:' > were not translated. > > Signed-off-by: Dimiytriy Ryazantcev <dimitriy.ryazantcev@xxxxxxxxx> > > > usage.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/usage.c b/usage.c > index 56e29d6cd6a..5a7c6c346c1 100644 > --- a/usage.c > +++ b/usage.c > @@ -33,7 +33,7 @@ static void vreportf(const char *prefix, const char *err, va_list params) > > static NORETURN void usage_builtin(const char *err, va_list params) > { > - vreportf("usage: ", err, params); > + vreportf(_("usage: "), err, params); > > /* > * When we detect a usage error *before* the command dispatch in > @@ -58,7 +58,7 @@ static NORETURN void usage_builtin(const char *err, va_list params) > static void die_message_builtin(const char *err, va_list params) > { > trace2_cmd_error_va(err, params); > - vreportf("fatal: ", err, params); > + vreportf(_("fatal: "), err, params); > } > > /* > @@ -78,14 +78,14 @@ static void error_builtin(const char *err, va_list params) > { > trace2_cmd_error_va(err, params); > > - vreportf("error: ", err, params); > + vreportf(_("error: "), err, params); > } > > static void warn_builtin(const char *warn, va_list params) > { > trace2_cmd_error_va(warn, params); > > - vreportf("warning: ", warn, params); > + vreportf(_("warning: "), warn, params); > } > > static int die_is_recursing_builtin(void) I posted this patch[1] to do the same a while ago, except it also translates the "BUG: " message: https://lore.kernel.org/git/RFC-patch-20.21-69426ddb992-20211115T220831Z-avarab@xxxxxxxxx/; I was meaning to submit it sometime soon, one thing it depended on was the recently merged ab/bug-if-bug series (4da14b574f2 (Merge branch 'ab/bug-if-bug', 2022-06-10)). It's more complex because it's handling the "BUG: " case, and was part of a more general change to allow us to emit file & line numbers (as with "BUG: ") for these usage/fatal/error/warning messages. That being said I don't mind this smaller change going in first, but it's perhaps worth noting that you're explicitly omitting one "message helper" variant (BUG), and that unlike for most i18n messages this one uses "lego", i.e. forces the message order to be LTR, so we'll still need to further adjust this for RTL languages (the same is the case with my patch).
