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

gitster · gitster · commit 884339a15fea · 2022-07-13T14:54:54.000-07:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ static void vreportf(const char prefix, const char err, va_list params)`
`33`	`33`
`34`	`34`	`static NORETURN void usage_builtin(const char *err, va_list params)`
`35`	`35`	`{`
`36`		`- vreportf("usage: ", err, params);`
	`36`	`+ vreportf(_("usage: "), err, params);`
`37`	`37`
`38`	`38`	`/*`
`39`	`39`	`* 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)`
`58`	`58`	`static void die_message_builtin(const char *err, va_list params)`
`59`	`59`	`{`
`60`	`60`	`trace2_cmd_error_va(err, params);`
`61`		`- vreportf("fatal: ", err, params);`
	`61`	`+ vreportf(_("fatal: "), err, params);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/*`
`@@ -78,14 +78,14 @@ static void error_builtin(const char *err, va_list params)`
`78`	`78`	`{`
`79`	`79`	`trace2_cmd_error_va(err, params);`
`80`	`80`
`81`		`- vreportf("error: ", err, params);`
	`81`	`+ vreportf(_("error: "), err, params);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`static void warn_builtin(const char *warn, va_list params)`
`85`	`85`	`{`
`86`	`86`	`trace2_cmd_error_va(warn, params);`
`87`	`87`
`88`		`- vreportf("warning: ", warn, params);`
	`88`	`+ vreportf(_("warning: "), warn, params);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`static int die_is_recursing_builtin(void)`