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>
Jiang Xin committed
Jul 25, 2012 at 22:53 UTC
465d6a00e9bae9786d2b12cfda4fd80d937cad9b
3 files changed
+3
-3
git-rebase.sh
+1
-1
@@ -317,7 +317,7 @@ test $# -gt 2 && usage
317
if test -n "$cmd" &&
318
test "$interactive_rebase" != explicit
319
then
320
- die "$(gettext -- "--exec option must be used with --interactive option")"
320
+ die "$(gettext "The --exec option must be used with the --interactive option")"
321
fi
322
323
if test -n "$action"
git-submodule.sh
+1
-1
@@ -746,7 +746,7 @@ cmd_summary() {
746
if [ -n "$files" ]
747
then
748
test -n "$cached" &&
749
- die "$(gettext -- "--cached cannot be used with --files")"
749
+ die "$(gettext "The --cached option cannot be used with the --files option")"
750
diff_cmd=diff-files
751
head=
752
fi
t/t3404-rebase-interactive.sh
+1
-1
@@ -858,7 +858,7 @@ test_expect_success 'rebase -ix with --autosquash' '
858
test_expect_success 'rebase --exec without -i shows error message' '
859
git reset --hard execute &&
860
test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
861
- echo "--exec option must be used with --interactive option" >expected &&
861
+ echo "The --exec option must be used with the --interactive option" >expected &&
862
test_i18ncmp expected actual
863
'
864