From: Junio C Hamano Date: Mon, 04 Jun 2012 16:59:43 GMT Subject: Re: [PATCH 2/2] i18n: Add extra -- to seperate gettext and message Message-ID: <7vpq9ft3ls.fsf@alter.siamese.dyndns.org> In-Reply-To: Jiang Xin writes: > 2012/6/4 Ævar Arnfjörð Bjarmason : >> I think a better solution to this is to just apply this patch: >> >> -               die "$(gettext -- "--cached cannot be used with --files")" >> +               die "$(gettext "the --cached option is incompatible >> with the --files option")" > > The rewrite message is a bit odd for there are 40 more alike > messages (extracted from C files) start with "--”, such as: > > msgid "--delete only accepts plain target ref names" > msgid "--all and --tags are incompatible" > msgid "--all can't be combined with refspecs" > msgid "--mirror and --tags are incompatible" > msgid "--mirror can't be combined with refspecs" > >> I think changing the only message suffering from this >> issue (or likely to suffer from it) beats a solution where starting a >> message with -- only works for some of the xgettext >> commands/functions. > > If I had not changed like this, I would not find out there are 27 > marked messages (by gettext wrappers) have not been > extracted to "po/git.pot". ;-) I think there is value for having a generic solution than declaring "No message shall begin with a dash". I am not convinced that it is ideal for the implementation of gettext_ln to prepend "--" in front when it calls gettext, though. Shouldn't the caller of gettext_ln be the one who is responsible for doing that? After all, that is the one that knows that the MSGID argument needs the quoting.