[[PATCH] [RESUBMIT] Consistency for substitution hints (i18n) 1/1] parse-options: use localized substitution hints

From

Alexander Shopov <ash@kambanaria.org>

Date

Apr 21, 2024, 18:14 UTC

Message-ID

<20240421181408.82736-2-ash@kambanaria.org>

In-Reply-To

<20240421181408.82736-1-ash@kambanaria.org>

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
---
 parse-options.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/parse-options.c b/parse-options.c
index 63a99dea6e..93712c6904 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -27,6 +27,7 @@ static void optbug(const struct option *opt, const char *reason)
 }
 
 static const char *optname(const struct option *opt, enum opt_parsed flags)
+// FIXME
 {
 	static struct strbuf sb = STRBUF_INIT;
 
@@ -1055,17 +1056,27 @@ int parse_options(int argc, const char **argv,
 }
 
 static int usage_argh(const struct option *opts, FILE *outfile)
+/// Fixme
 {
 	const char *s;
 	int literal = (opts->flags & PARSE_OPT_LITERAL_ARGHELP) ||
 		!opts->argh || !!strpbrk(opts->argh, "()<>[]|");
 	if (opts->flags & PARSE_OPT_OPTARG)
 		if (opts->long_name)
-			s = literal ? "[=%s]" : "[=<%s>]";
+			s = literal ? "[=%s]" :
+			  /* TRANSLATORS: keep as is unless you use hints for substitution other than `<>'
+			     in which case use those */
+			  _("[=<%s>]");
 		else
-			s = literal ? "[%s]" : "[<%s>]";
+			s = literal ? "[%s]" :
+			  /* TRANSLATORS: keep as is unless you use hints for substitution other than `<>'
+			     in which case use those */
+			  _("[<%s>]");
 	else
-		s = literal ? " %s" : " <%s>";
+		s = literal ? " %s" :
+		  /* TRANSLATORS: keep as is unless you use hints for substitution other than `<>'
+		     in which case use those */
+		  _(" <%s>");
 	return utf8_fprintf(outfile, s, opts->argh ? _(opts->argh) : _("..."));
 }
 

-- 
2.44.0