From: Ævar Arnfjörð Bjarmason Date: Mon, 04 Jun 2012 08:56:08 GMT Subject: Re: [PATCH 2/2] i18n: Add extra -- to seperate gettext and message Message-ID: In-Reply-To: <1338764967-30103-2-git-send-email-worldhello.net@gmail.com> On Mon, Jun 4, 2012 at 1:09 AM, Jiang Xin wrote: > In commit b9b9c22, Ævar addressed a issue when gettextized a message > started with "--", such as "--cached cannot be used with --files", the > first word in the message would be treated as an option of gettext, and > might raise a bad option error. > > The solution Ævar provided is to add a extra "--" option between gettext > and the message. But Vincent fount out later that the extra "--" was > extracted as gettext message by xgettext instead of the real message. > See: > >  * http://thread.gmane.org/gmane.comp.version-control.git/199042 > > In order to fix this dilemma, we move the extra "--" option from gettext > to gettext wrapper (gettextln, and eval_gettext), and gettextize the > message using the wrapper function instead of gettext itself. > > But for system with libintl's gettext.sh, eval_gettext and > eval_gettextln won't have this fix. 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")" It's one message only, and this is due to a bug in the xgettext extraction. 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.