From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiang Xin Subject: [PATCH v2 2/7] i18n: rebase: mark strings for translation Date: Sun, 22 Jul 2012 09:26:06 +0800 Message-ID: <724ca3989123159c9970b3276b4764dcbd5fd56e.1342920089.git.worldhello.net@gmail.com> References: Cc: Git List , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Stefano Lattarini , Jiang Xin To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Jul 22 03:27:52 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Sskxb-00012u-GC for gcvg-git-2@plane.gmane.org; Sun, 22 Jul 2012 03:27:51 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752216Ab2GVB1W (ORCPT ); Sat, 21 Jul 2012 21:27:22 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:52289 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751938Ab2GVB1D (ORCPT ); Sat, 21 Jul 2012 21:27:03 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so8575153pbb.19 for ; Sat, 21 Jul 2012 18:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=IZljz2lqyyRF1+QHiL4o2Fh6q2EtOA+cXN1j2Kbg0wo=; b=LeVxusAom5+pkDxZ7jSptU5X2ESP97zT3PnQfIFgroqoPDAaa4uX+trXN7DSNOTbXI Y5SMq8dw9VADZOjyfBih9KGJKXxY+1pC2WX+7gFqmiBR2ESjH/8McrOHPAXWU5j2QVIv 2V97458RGP2ADpGT5LETXpsNdUN0EvSnYZKd5swTGxLffeELobLcQSCmKRyjwnPKF/Fm n0srjtlQOzaDoq2ejS+V4e19aF5o359U7mSbzD5Jk2EcrcL9yfY+nHL04Of90Vkn9MLJ 3Q9X0ok/PVZWOL+Xs61CySFU4MGKePNEa0+Sy5rMwbCFcSik4M+dMjYJdUpFas7pixBF 4OQg== Received: by 10.66.73.202 with SMTP id n10mr21188894pav.80.1342920423169; Sat, 21 Jul 2012 18:27:03 -0700 (PDT) Received: from localhost.foo.bar ([123.116.228.123]) by mx.google.com with ESMTPS id rg10sm6946850pbc.54.2012.07.21.18.26.58 (version=SSLv3 cipher=OTHER); Sat, 21 Jul 2012 18:27:02 -0700 (PDT) X-Mailer: git-send-email 1.7.11.2.259.g37fc0e1 In-Reply-To: In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Jiang Xin --- git-rebase.sh | 58 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 1cd06..df5998 100755 --- 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 +. git-sh-i18n set_reflog_action rebase require_work_tree_exists cd_to_toplevel @@ -72,11 +73,11 @@ cd_to_toplevel LF=' ' ok_to_skip_pre_rebase= -resolvemsg=" +resolvemsg="$(gettext " 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\". -" +")" unset onto cmd= strategy= @@ -161,7 +162,7 @@ move_to_original_branch () { 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 } @@ -180,12 +181,12 @@ run_pre_rebase_hook () { 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 && - 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 @@ -316,12 +317,12 @@ test $# -gt 2 && usage 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 - 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 @@ -334,11 +335,11 @@ case "$action" in 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 || { - 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 @@ -355,7 +356,7 @@ abort) 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 @@ -367,15 +368,16 @@ esac # 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 + state_dir_base=${state_dir##*/} + die "$(eval_gettext " +It seems that there is already a \$state_dir_base directory, and I wonder if you are in the middle of another rebase. If that is the case, please try git rebase (--continue | --abort | --skip) If that is not the case, please - rm -fr '"$state_dir"' + rm -fr \"\$state_dir\" 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" @@ -413,7 +415,7 @@ then ;; 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" @@ -437,19 +439,19 @@ case "$onto_name" in 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 - 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") || - die "Does not point to a valid commit: $onto_name" + die "$(eval_gettext "Does not point to a valid commit: \$onto_name")" ;; esac @@ -472,7 +474,7 @@ case "$#" in then head_name="detached HEAD" else - die "fatal: no such branch: $1" + die "$(eval_gettext "fatal: no such branch: \$branch_name")" fi ;; 0) @@ -488,11 +490,11 @@ case "$#" in orig_head=$(git rev-parse --verify "${branch_name}^0") || exit ;; *) - die "BUG: unexpected number of arguments left to parse" + die "$(gettext "BUG: unexpected number of arguments left to parse")" ;; 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 @@ -510,10 +512,10 @@ then 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 - 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 @@ -524,7 +526,7 @@ if test -n "$diffstat" 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" @@ -533,7 +535,7 @@ fi 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 @@ -541,7 +543,7 @@ git update-ref ORIG_HEAD $orig_head # 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 -- 1.7.11.2.259.g37fc0e1