diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-07-25 22:53:09 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-26 22:33:37 -0700 |
| commit | 465d6a00e9bae9786d2b12cfda4fd80d937cad9b (patch) | |
| tree | 44739ba0d3680d5179d4d1535cdfa86ff8830c8a | |
| parent | c7108bf9ed72403bdf6274bf46263731590bffcf (diff) | |
| download | git-465d6a00e9bae9786d2b12cfda4fd80d937cad9b.tar.gz | |
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>
| -rwxr-xr-x | git-rebase.sh | 2 | ||||
| -rwxr-xr-x | git-submodule.sh | 2 | ||||
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 8710d35ab3..705bd89c67 100755 --- 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 - 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" diff --git a/git-submodule.sh b/git-submodule.sh index 5629d875e6..57f98945cd 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -746,7 +746,7 @@ cmd_summary() { 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 --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 8078db6856..f206a36b00 100755 --- 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 && - 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 ' |