From 491858bf3cd7b91029744287f6173f795b3108f9 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 20 Jun 2011 14:25:08 -0600 Subject: [PATCH] virsh: avoid bogus description https://bugzilla.redhat.com/show_bug.cgi?id=682121 Gettext reserves the empty string for internal use, and it must not be passed through _(). We were violating this for commands that (for whatever reason) used "" for their description. * tools/virsh.c (vshCmddefHelp): Don't translate empty string. Reported by Tatsuo Kawasaki. --- tools/virsh.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index a315f05c87..fcd254db7a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12113,7 +12113,8 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) vshError(ctl, _("command '%s' doesn't exist"), cmdname); return false; } else { - const char *desc = _(vshCmddefGetInfo(def, "desc")); + /* Don't translate desc if it is "". */ + const char *desc = vshCmddefGetInfo(def, "desc"); const char *help = _(vshCmddefGetInfo(def, "help")); char buf[256]; uint32_t opts_need_arg; @@ -12167,7 +12168,7 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) if (desc[0]) { /* Print the description only if it's not empty. */ fputs(_("\n DESCRIPTION\n"), stdout); - fprintf(stdout, " %s\n", desc); + fprintf(stdout, " %s\n", _(desc)); } if (def->opts) { -- GitLab