kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'dr/i18n-die-warn-error-usage' 

Give _() markings to fatal/warning/usage: labels that are shown in
front of these messages.

* dr/i18n-die-warn-error-usage:
  i18n: mark message helpers prefix for translation
maint
Junio C Hamano 2022-07-13 14:54:54 -07:00
parent 81705c4ee6 a1fd2cf8cd
commit 884339a15f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usage.c
View File

@ -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)