git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH/RFC 06/20] gettextize: git-stash die + eval_gettext $* messages
Date: Tue, 14 Sep 2010 13:52:06 +0000	[thread overview]
Message-ID: <1284472340-7049-7-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1284472340-7049-1-git-send-email-avarab@gmail.com>

Gettextize messages that used the $* variable. Since it's subroutine
local we have to provide an alias for it for eval_gettext.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-stash.sh |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/git-stash.sh b/git-stash.sh
index 38720b8..f3ea9e8 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -337,7 +337,10 @@ is_stash_like()
 }
 
 assert_stash_like() {
-	is_stash_like "$@" || die "'$*' is not a stash-like commit"
+	is_stash_like "$@" || {
+		args="$*"
+		die "$(eval_gettext "'\$args' is not a stash-like commit")"
+	}
 }
 
 is_stash_ref() {
@@ -345,7 +348,10 @@ is_stash_ref() {
 }
 
 assert_stash_ref() {
-	is_stash_ref "$@" || die "'$*' is not a stash reference"
+	is_stash_ref "$@" || {
+		args="$*"
+		die "$(eval_gettext "'\$args' is not a stash reference")"
+	}
 }
 
 apply_stash () {
-- 
1.7.3.rc1.234.g8dc15

  parent reply	other threads:[~2010-09-14 13:53 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-14 13:52 [PATCH/RFC 00/20] gettextize: git-stash & git-bisect Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 01/20] gettextize: git-stash add git-sh-i18n Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 02/20] gettextize: git-stash echo + gettext message Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 03/20] gettextize: git-stash say + gettext messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 04/20] gettextize: git-stash die " Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 05/20] gettextize: git-stash die + eval_gettext messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` Ævar Arnfjörð Bjarmason [this message]
2010-09-14 13:52 ` [PATCH/RFC 07/20] gettextize: git-stash die + eval_gettext $1 messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 08/20] gettextize: git-stash "unknown option" message Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 09/20] gettextize: git-stash drop_stash say/die messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 10/20] gettextize: git-bisect add git-sh-i18n Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 11/20] gettextize: git-bisect gettext + echo message Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 12/20] gettextize: git-bisect echo + gettext messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 13/20] gettextize: git-bisect echo + eval_gettext message Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 14/20] gettextize: git-bisect die + gettext messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 15/20] gettextize: git-bisect die + eval_gettext messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 16/20] gettextize: git-bisect bisect_run + $@ messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 17/20] gettextize: git-bisect bisect_reset + $1 messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 18/20] gettextize: git-bisect bisect_replay " Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 19/20] gettextize: git-bisect [Y/n] messages Ævar Arnfjörð Bjarmason
2010-09-14 13:52 ` [PATCH/RFC 20/20] gettextize: git-bisect bisect_next_check "You need to" message Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1284472340-7049-7-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).