kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

i18n: Rewrite gettext messages start with dash 

Gettext message in a shell script should not start with '-', one
workaround is adding '--' between gettext and the message, like:

    gettext -- "--exec option ..."

But due to a bug in the xgettext extraction, xgettext can not
extract the actual message for this case. Rewriting the message
is a simpler and better solution.

Reported-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jiang Xin 2012-07-25 22:53:09 +08:00 committed by Junio C Hamano
parent c7108bf9ed
commit 465d6a00e9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase.sh
View File

@ -317,7 +317,7 @@ test $# -gt 2 && usage
if test -n "$cmd" && if test -n "$cmd" &&
test "$interactive_rebase" != explicit test "$interactive_rebase" != explicit
then then
die "$(gettext -- "--exec option must be used with --interactive option")" die "$(gettext "The --exec option must be used with the --interactive option")"
fi fi


if test -n "$action" if test -n "$action"

2
git-submodule.sh
View File

@ -746,7 +746,7 @@ cmd_summary() {
if [ -n "$files" ] if [ -n "$files" ]
then then
test -n "$cached" && test -n "$cached" &&
die "$(gettext -- "--cached cannot be used with --files")" die "$(gettext "The --cached option cannot be used with the --files option")"
diff_cmd=diff-files diff_cmd=diff-files
head= head=
fi fi

2
t/t3404-rebase-interactive.sh
View File

@ -858,7 +858,7 @@ test_expect_success 'rebase -ix with --autosquash' '
test_expect_success 'rebase --exec without -i shows error message' ' test_expect_success 'rebase --exec without -i shows error message' '
git reset --hard execute && git reset --hard execute &&
test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual && test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
echo "--exec option must be used with --interactive option" >expected && echo "The --exec option must be used with the --interactive option" >expected &&
test_i18ncmp expected actual test_i18ncmp expected actual
' '