i18n: rebase: mark messages for translation

Mark messages in git-rebase.sh for translation.  While doing this
Jonathan noticed that the comma usage and sentence structure of the
resolvemsg was not quite right, so correct that and its cousins in
git-am.sh and t/t0201-gettext-fallbacks.sh at the same time.

Some tests would start to fail with GETTEXT_POISON turned on after
this update.  Use test_i18ncmp and test_i18ngrep where appropriate
to mark strings that should only be checked in the C locale output
to avoid such issues.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index b6a530018e18527efc8ed788e815b380d0206787..98eecdb6b112925a6a4d06ab3fbf279a773be842 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -102,9 +102,9 @@ stop_here_user_resolve () {
            printf '%s\n' "$resolvemsg"
            stop_here $1
     fi
            printf '%s\n' "$resolvemsg"
            stop_here $1
     fi

-    eval_gettextln "When you have resolved this problem run \"\$cmdline --resolved\".
-If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
-To restore the original branch and stop patching run \"\$cmdline --abort\"."
+    eval_gettextln "When you have resolved this problem, run \"\$cmdline --resolved\".
+If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
+To restore the original branch and stop patching, run \"\$cmdline --abort\"."

 
     stop_here $1
 }
 
     stop_here $1
 }

diff --git a/git-rebase.sh b/git-rebase.sh
index 1cd0633b80a8daf00dbc50657ccba228bd578a73..8710d35ab31fa9a116a52feeadb48daece9213cf 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -65,6 +65,7 @@ abort!             abort and check out the original branch
 skip!              skip current patch and continue
 "
 . git-sh-setup
 skip!              skip current patch and continue
 "
 . git-sh-setup

+. git-sh-i18n

 set_reflog_action rebase
 require_work_tree_exists
 cd_to_toplevel
 set_reflog_action rebase
 require_work_tree_exists
 cd_to_toplevel


@@ -73,9 +74,9 @@ LF='
 '
 ok_to_skip_pre_rebase=
 resolvemsg="
 '
 ok_to_skip_pre_rebase=
 resolvemsg="

-When you have resolved this problem run \"git rebase --continue\".
-If you would prefer to skip this patch, instead run \"git rebase --skip\".
-To check out the original branch and stop rebasing run \"git rebase --abort\".
+$(gettext 'When you have resolved this problem, run "git rebase --continue".
+If you prefer to skip this patch, run "git rebase --skip" instead.
+To check out the original branch and stop rebasing, run "git rebase --abort".')

 "
 unset onto
 cmd=
 "
 unset onto
 cmd=


@@ -161,7 +162,7 @@ move_to_original_branch () {
                git symbolic-ref \
                        -m "rebase finished: returning to $head_name" \
                        HEAD $head_name ||
                git symbolic-ref \
                        -m "rebase finished: returning to $head_name" \
                        HEAD $head_name ||

-               die "Could not move back to $head_name"
+               die "$(gettext "Could not move back to $head_name")"

                ;;
        esac
 }
                ;;
        esac
 }


@@ -180,12 +181,12 @@ run_pre_rebase_hook () {
           test -x "$GIT_DIR/hooks/pre-rebase"
        then
                "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
           test -x "$GIT_DIR/hooks/pre-rebase"
        then
                "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||

-               die "The pre-rebase hook refused to rebase."
+               die "$(gettext "The pre-rebase hook refused to rebase.")"

        fi
 }
 
 test -f "$apply_dir"/applying &&
        fi
 }
 
 test -f "$apply_dir"/applying &&

-       die 'It looks like git-am is in progress. Cannot rebase.'
+       die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"

 
 if test -d "$apply_dir"
 then
 
 if test -d "$apply_dir"
 then


@@ -316,12 +317,12 @@ test $# -gt 2 && usage
 if test -n "$cmd" &&
    test "$interactive_rebase" != explicit
 then
 if test -n "$cmd" &&
    test "$interactive_rebase" != explicit
 then

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

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

-       test -z "$in_progress" && die "No rebase in progress?"
+       test -z "$in_progress" && die "$(gettext "No rebase in progress?")"

        # Only interactive rebase uses detailed reflog messages
        if test "$type" = interactive && test "$GIT_REFLOG_ACTION" = rebase
        then
        # Only interactive rebase uses detailed reflog messages
        if test "$type" = interactive && test "$GIT_REFLOG_ACTION" = rebase
        then


@@ -334,11 +335,11 @@ case "$action" in
 continue)
        # Sanity check
        git rev-parse --verify HEAD >/dev/null ||
 continue)
        # Sanity check
        git rev-parse --verify HEAD >/dev/null ||

-               die "Cannot read HEAD"
+               die "$(gettext "Cannot read HEAD")"

        git update-index --ignore-submodules --refresh &&
        git diff-files --quiet --ignore-submodules || {
        git update-index --ignore-submodules --refresh &&
        git diff-files --quiet --ignore-submodules || {

-               echo "You must edit all merge conflicts and then"
-               echo "mark them as resolved using git add"
+               echo "$(gettext "You must edit all merge conflicts and then
+mark them as resolved using git add")"

                exit 1
        }
        read_basic_state
                exit 1
        }
        read_basic_state


@@ -355,7 +356,7 @@ abort)
        case "$head_name" in
        refs/*)
                git symbolic-ref -m "rebase: aborting" HEAD $head_name ||
        case "$head_name" in
        refs/*)
                git symbolic-ref -m "rebase: aborting" HEAD $head_name ||

-               die "Could not move back to $head_name"
+               die "$(eval_gettext "Could not move back to \$head_name")"

                ;;
        esac
        output git reset --hard $orig_head
                ;;
        esac
        output git reset --hard $orig_head


@@ -367,15 +368,18 @@ esac
 # Make sure no rebase is in progress
 if test -n "$in_progress"
 then
 # Make sure no rebase is in progress
 if test -n "$in_progress"
 then

-       die '
-It seems that there is already a '"${state_dir##*/}"' directory, and
-I wonder if you are in the middle of another rebase.  If that is the
+       state_dir_base=${state_dir##*/}
+       cmd_live_rebase="git rebase (--continue | --abort | --skip)"
+       cmd_clear_stale_rebase="rm -fr \"$state_dir\""
+       die "
+$(eval_gettext 'It seems that there is already a $state_dir_base directory, and
+I wonder if you ware in the middle of another rebase.  If that is the

 case, please try
 case, please try

-       git rebase (--continue | --abort | --skip)
+       $cmd_live_rebase

 If that is not the case, please
 If that is not the case, please

-       rm -fr '"$state_dir"'
+       $cmd_clear_stale_rebase

 and run me again.  I am stopping in case you still have something
 and run me again.  I am stopping in case you still have something

-valuable there.'
+valuable there.')"

 fi
 
 if test -n "$rebase_root" && test -z "$onto"
 fi
 
 if test -n "$rebase_root" && test -z "$onto"


@@ -413,7 +417,7 @@ then
                ;;
        esac
        upstream=`git rev-parse --verify "${upstream_name}^0"` ||
                ;;
        esac
        upstream=`git rev-parse --verify "${upstream_name}^0"` ||

-       die "invalid upstream $upstream_name"
+       die "$(eval_gettext "invalid upstream \$upstream_name")"

        upstream_arg="$upstream_name"
 else
        if test -z "$onto"
        upstream_arg="$upstream_name"
 else
        if test -z "$onto"


@@ -437,19 +441,19 @@ case "$onto_name" in
        then
                case "$onto" in
                ?*"$LF"?*)
        then
                case "$onto" in
                ?*"$LF"?*)

-                       die "$onto_name: there are more than one merge bases"
+                       die "$(eval_gettext "\$onto_name: there are more than one merge bases")"

                        ;;
                '')
                        ;;
                '')

-                       die "$onto_name: there is no merge base"
+                       die "$(eval_gettext "\$onto_name: there is no merge base")"

                        ;;
                esac
        else
                        ;;
                esac
        else

-               die "$onto_name: there is no merge base"
+               die "$(eval_gettext "\$onto_name: there is no merge base")"

        fi
        ;;
 *)
        onto=$(git rev-parse --verify "${onto_name}^0") ||
        fi
        ;;
 *)
        onto=$(git rev-parse --verify "${onto_name}^0") ||

-       die "Does not point to a valid commit: $onto_name"
+       die "$(eval_gettext "Does not point to a valid commit: \$onto_name")"

        ;;
 esac
 
        ;;
 esac
 


@@ -472,7 +476,7 @@ case "$#" in
        then
                head_name="detached HEAD"
        else
        then
                head_name="detached HEAD"
        else

-               die "fatal: no such branch: $1"
+               die "$(eval_gettext "fatal: no such branch: \$branch_name")"

        fi
        ;;
 0)
        fi
        ;;
 0)


@@ -492,7 +496,7 @@ case "$#" in
        ;;
 esac
 
        ;;
 esac
 

-require_clean_work_tree "rebase" "Please commit or stash them."
+require_clean_work_tree "rebase" "$(gettext "Please commit or stash them.")"

 
 # Now we are rebasing commits $upstream..$orig_head (or with --root,
 # everything leading up to $orig_head) on top of $onto
 
 # Now we are rebasing commits $upstream..$orig_head (or with --root,
 # everything leading up to $orig_head) on top of $onto


@@ -510,10 +514,10 @@ then
        then
                # Lazily switch to the target branch if needed...
                test -z "$switch_to" || git checkout "$switch_to" --
        then
                # Lazily switch to the target branch if needed...
                test -z "$switch_to" || git checkout "$switch_to" --

-               say "Current branch $branch_name is up to date."
+               say "$(eval_gettext "Current branch \$branch_name is up to date.")"

                exit 0
        else
                exit 0
        else

-               say "Current branch $branch_name is up to date, rebase forced."
+               say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"

        fi
 fi
 
        fi
 fi
 


@@ -524,7 +528,7 @@ if test -n "$diffstat"
 then
        if test -n "$verbose"
        then
 then
        if test -n "$verbose"
        then

-               echo "Changes from $mb to $onto:"
+               echo "$(eval_gettext "Changes from \$mb to \$onto:")"

        fi
        # We want color (if set), but no pager
        GIT_PAGER='' git diff --stat --summary "$mb" "$onto"
        fi
        # We want color (if set), but no pager
        GIT_PAGER='' git diff --stat --summary "$mb" "$onto"


@@ -533,7 +537,7 @@ fi
 test "$type" = interactive && run_specific_rebase
 
 # Detach HEAD and reset the tree
 test "$type" = interactive && run_specific_rebase
 
 # Detach HEAD and reset the tree

-say "First, rewinding head to replay your work on top of it..."
+say "$(gettext "First, rewinding head to replay your work on top of it...")"

 git checkout -q "$onto^0" || die "could not detach HEAD"
 git update-ref ORIG_HEAD $orig_head
 
 git checkout -q "$onto^0" || die "could not detach HEAD"
 git update-ref ORIG_HEAD $orig_head
 


@@ -541,7 +545,7 @@ git update-ref ORIG_HEAD $orig_head
 # we just fast-forwarded.
 if test "$mb" = "$orig_head"
 then
 # we just fast-forwarded.
 if test "$mb" = "$orig_head"
 then

-       say "Fast-forwarded $branch_name to $onto_name."
+       say "$(eval_gettext "Fast-forwarded \$branch_name to \$onto_name.")"

        move_to_original_branch
        exit 0
 fi
        move_to_original_branch
        exit 0
 fi

diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh
index 52b1c27c2c9d3c6111447df4fa241b724f0e6ee1..5d80a985fb709b2cd278f45555fcdeccf45ebb10 100755 (executable)
--- a/t/t0201-gettext-fallbacks.sh
+++ b/t/t0201-gettext-fallbacks.sh
@@ -51,16 +51,16 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
     cmdline="git am" &&
     export cmdline;
 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
     cmdline="git am" &&
     export cmdline;

-    printf "When you have resolved this problem run git am --resolved." >expect &&
-    eval_gettext "When you have resolved this problem run \$cmdline --resolved." >actual
+    printf "When you have resolved this problem, run git am --resolved." >expect &&
+    eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual

     test_i18ncmp expect actual
 '
 
 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
     cmdline="git am" &&
     export cmdline;
     test_i18ncmp expect actual
 '
 
 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
     cmdline="git am" &&
     export cmdline;

-    printf "When you have resolved this problem run \"git am --resolved\"." >expect &&
-    eval_gettext "When you have resolved this problem run \"\$cmdline --resolved\"." >actual
+    printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
+    eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual

     test_i18ncmp expect actual
 '
 
     test_i18ncmp expect actual
 '
 

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 7788ae02adca18ab1d1f8cf7b76243fbf56377ae..1de0ebda25c1034fc1b343a8f0e3da9c2c7f8c6e 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -68,24 +68,24 @@ test_expect_success 'rebase against master' '
 
 test_expect_success 'rebase against master twice' '
        git rebase master >out &&
 
 test_expect_success 'rebase against master twice' '
        git rebase master >out &&

-       grep "Current branch my-topic-branch is up to date" out
+       test_i18ngrep "Current branch my-topic-branch is up to date" out

 '
 
 test_expect_success 'rebase against master twice with --force' '
        git rebase --force-rebase master >out &&
 '
 
 test_expect_success 'rebase against master twice with --force' '
        git rebase --force-rebase master >out &&

-       grep "Current branch my-topic-branch is up to date, rebase forced" out
+       test_i18ngrep "Current branch my-topic-branch is up to date, rebase forced" out

 '
 
 test_expect_success 'rebase against master twice from another branch' '
        git checkout my-topic-branch^ &&
        git rebase master my-topic-branch >out &&
 '
 
 test_expect_success 'rebase against master twice from another branch' '
        git checkout my-topic-branch^ &&
        git rebase master my-topic-branch >out &&

-       grep "Current branch my-topic-branch is up to date" out
+       test_i18ngrep "Current branch my-topic-branch is up to date" out

 '
 
 test_expect_success 'rebase fast-forward to master' '
        git checkout my-topic-branch^ &&
        git rebase my-topic-branch >out &&
 '
 
 test_expect_success 'rebase fast-forward to master' '
        git checkout my-topic-branch^ &&
        git rebase my-topic-branch >out &&

-       grep "Fast-forwarded HEAD to my-topic-branch" out
+       test_i18ngrep "Fast-forwarded HEAD to my-topic-branch" out

 '
 
 test_expect_success 'the rebase operation should not have destroyed author information' '
 '
 
 test_expect_success 'the rebase operation should not have destroyed author information' '

diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 6898377910f9fce8ccc73fba7b8140dff53d7ec6..e6a9a0d436f3a28a7de6eaadd7f1f223ae740c64 100755 (executable)
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -62,9 +62,16 @@ test_expect_success 'rebase -n overrides config rebase.stat config' '
         ! grep "^ fileX |  *1 +$" diffstat.txt
 '
 
         ! grep "^ fileX |  *1 +$" diffstat.txt
 '
 

+# Output to stderr:
+#
+#     "Does not point to a valid commit: invalid-ref"
+#
+# NEEDSWORK: This "grep" is fine in real non-C locales, but
+# GETTEXT_POISON poisons the refname along with the enclosing
+# error message.

 test_expect_success 'rebase --onto outputs the invalid ref' '
        test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
 test_expect_success 'rebase --onto outputs the invalid ref' '
        test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&

-       grep "invalid-ref" err
+       test_i18ngrep "invalid-ref" err

 '
 
 test_done
 '
 
 test_done