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>

diff --git a/git-rebase.sh b/git-rebase.sh
index 8710d35ab31fa9a116a52feeadb48daece9213cf..705bd89c676b836feffb8aac0efef2a524e26418 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -317,7 +317,7 @@ test $# -gt 2 && usage
 if test -n "$cmd" &&
    test "$interactive_rebase" != explicit
 then
 if test -n "$cmd" &&
    test "$interactive_rebase" != explicit
 then

-       die "$(gettext -- "--exec option must be used with --interactive option")"
+       die "$(gettext "The --exec option must be used with the --interactive option")"

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

diff --git a/git-submodule.sh b/git-submodule.sh
index 5629d875e6a0c0a390d046f28bf2d768116bf974..57f98945cdf725636b0c36cdb96541ae280b2095 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -746,7 +746,7 @@ cmd_summary() {
        if [ -n "$files" ]
        then
                test -n "$cached" &&
        if [ -n "$files" ]
        then
                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
                head=
        fi
                diff_cmd=diff-files
                head=
        fi

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 8078db6856ba4428e9d6b13f5e02076da7963b09..f206a36b0003315aa25bc0890aa411b6891c8ba2 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -858,7 +858,7 @@ test_expect_success 'rebase -ix with --autosquash' '
 test_expect_success 'rebase --exec without -i shows error message' '
        git reset --hard execute &&
        test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
 test_expect_success 'rebase --exec without -i shows error message' '
        git reset --hard execute &&
        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
 '