Re: [PATCH 2/2] i18n: Add extra -- to seperate gettext and message

From: Jiang Xin <worldhello.net@gmail.com>
Date: Jun 4, 2012, 13:55 UTC
Message-ID: <CANYiYbFx=Z7TTYUbAhzgHFYB6O_grROWoWHbtuhuABeXdFk4-Q@mail.gmail.com>
In-Reply-To: <CACBZZX5EGvJm0aqG5iVn7wnoqFATUqP4gbS-2tnAiLqeFQZifg@mail.gmail.com>

2012/6/4 Ævar Arnfjörð Bjarmason <avarab@gmail.com>:

Show 5 quoted lines

> 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". ;-)

-- 
Jiang Xin