All of lore.kernel.org
 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>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 22/48] i18n: git-submodule "cached cannot be used" message
Date: Sat, 21 May 2011 18:44:03 +0000	[thread overview]
Message-ID: <1306003469-22939-23-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1306003469-22939-1-git-send-email-avarab@gmail.com>

Gettextize the "--cached cannot be used with --files" message. Since
this message starts with "--" we have to pass "--" as the first
argument. This works with both GNU gettext 0.18.1 (as expected), and
the gettext(1) on Solaris 10.

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

diff --git a/git-submodule.sh b/git-submodule.sh
index 7eb1de0..444e1c5 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -617,7 +617,7 @@ cmd_summary() {
 	if [ -n "$files" ]
 	then
 		test -n "$cached" &&
-		die "--cached cannot be used with --files"
+		die "$(gettext -- "--cached cannot be used with --files")"
 		diff_cmd=diff-files
 		head=
 	fi
-- 
1.7.5.1

  parent reply	other threads:[~2011-05-21 18:47 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-21 18:43 [PATCH v2 00/48] i18n: mark core shell programs for translation Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 01/48] i18n: git-am add git-sh-i18n Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 02/48] i18n: git-am one-line gettext $msg; echo Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 03/48] i18n: git-am multi-line getttext " Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 04/48] i18n: git-am eval_gettext messages Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 05/48] i18n: git-am gettext + gettext to stderr message Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 06/48] i18n: git-am die messages Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 07/48] i18n: git-am cannot_fallback messages Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 08/48] i18n: git-am clean_abort messages Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 09/48] i18n: git-am "Apply?" message Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 10/48] i18n: git-am "Falling back" say message Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 11/48] i18n: git-am core say messages Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 12/48] i18n: git-am printf(1) message to eval_gettext Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 13/48] i18n: git-pull add git-sh-i18n Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 14/48] i18n: git-pull die messages Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 15/48] i18n: git-pull eval_gettext + die message Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 16/48] i18n: git-pull eval_gettext + warning message Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 17/48] i18n: git-submodule add git-sh-i18n Ævar Arnfjörð Bjarmason
2011-05-21 18:43 ` [PATCH v2 18/48] i18n: git-submodule echo + eval_gettext messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 19/48] i18n: git-submodule say " Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 20/48] i18n: git-submodule die " Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 21/48] i18n: git-submodule $update_module say + die messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` Ævar Arnfjörð Bjarmason [this message]
2011-05-21 18:44 ` [PATCH v2 23/48] i18n: git-submodule "Submodule change[...]" messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 24/48] i18n: git-submodule $errmsg messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 25/48] i18n: git-submodule "Entering [...]" message Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 26/48] i18n: git-submodule "[...] path is ignored" message Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 27/48] i18n: git-submodule "path not initialized" message Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 28/48] i18n: git-submodule "blob" and "submodule" messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 29/48] i18n: git-stash add git-sh-i18n Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 30/48] i18n: git-stash echo + gettext message Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 31/48] i18n: git-stash say + gettext messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 32/48] i18n: git-stash die " Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 33/48] i18n: git-stash die + eval_gettext messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 34/48] i18n: git-stash die + eval_gettext $* messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 35/48] i18n: git-stash die + eval_gettext $1 messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 36/48] i18n: git-stash "unknown option" message Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 37/48] i18n: git-stash drop_stash say/die messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 38/48] i18n: git-bisect add git-sh-i18n Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 39/48] i18n: git-bisect gettext + echo message Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 40/48] i18n: git-bisect echo + gettext messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 41/48] i18n: git-bisect echo + eval_gettext message Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 42/48] i18n: git-bisect die + gettext messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 43/48] i18n: git-bisect die + eval_gettext messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 44/48] i18n: git-bisect bisect_run + $@ messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 45/48] i18n: git-bisect bisect_reset + $1 messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 46/48] i18n: git-bisect bisect_replay " Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 47/48] i18n: git-bisect [Y/n] messages Ævar Arnfjörð Bjarmason
2011-05-21 18:44 ` [PATCH v2 48/48] i18n: git-bisect bisect_next_check "You need to" message Ævar Arnfjörð Bjarmason
2011-05-21 18:56 ` [PATCH v2 00/48] i18n: mark core shell programs for translation Junio C Hamano
2011-05-22  7:46   ` Æ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=1306003469-22939-23-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.