DORMANTno replies

[PATCH] parseopt: do not translate empty help string

From: Thomas Rast <hidden>
Date: 2016-06-15 22:54:31
Subsystem: the rest · Maintainer: Linus Torvalds

The gettext .po files have a header, but it looks like the translation
specification for an empty string.  This results in _("") actually
returning that header.

Prevent parseopt from passing empty strings to gettext when it
displays help about commands.  In some instances it already did this,
but git-grep's --or etc. caught another case.

Signed-off-by: Thomas Rast <redacted>
---
 parse-options.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/parse-options.c b/parse-options.c
index c1c66bd..f95bbb2 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -562,7 +562,8 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
 			fputc('\n', outfile);
 			pad = USAGE_OPTS_WIDTH;
 		}
-		fprintf(outfile, "%*s%s\n", pad + USAGE_GAP, "", _(opts->help));
+		fprintf(outfile, "%*s%s\n", pad + USAGE_GAP, "",
+			*opts->help ? _(opts->help) : "");
 	}
 	fputc('\n', outfile);
 
-- 
1.7.12.rc1.203.gc3c8071
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help