From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jan Krüger" <jk@jk.gs>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 03/15] gettextize: git-clean basic messages
Date: Mon, 6 Sep 2010 12:21:32 +0000 [thread overview]
Message-ID: <1283775704-29440-4-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1283638229-14199-1-git-send-email-avarab@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/clean.c | 20 ++++++++++----------
t/t7012-skip-worktree-writing.sh | 4 ++--
t/t7300-clean.sh | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index b508d2c..10dde87 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -75,7 +75,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
dir.flags |= DIR_SHOW_IGNORED;
if (ignored && ignored_only)
- die("-x and -X cannot be used together");
+ die(_("-x and -X cannot be used together"));
if (!show_only && !force)
die("clean.requireForce %s to true and neither -n nor -f given; "
@@ -87,7 +87,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
if (read_cache() < 0)
- die("index file corrupt");
+ die(_("index file corrupt"));
if (!ignored)
setup_standard_excludes(&dir);
@@ -146,20 +146,20 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
qname = quote_path_relative(directory.buf, directory.len, &buf, prefix);
if (show_only && (remove_directories ||
(matches == MATCHED_EXACTLY))) {
- printf("Would remove %s\n", qname);
+ printf(_("Would remove %s\n"), qname);
} else if (remove_directories ||
(matches == MATCHED_EXACTLY)) {
if (!quiet)
- printf("Removing %s\n", qname);
+ printf(_("Removing %s\n"), qname);
if (remove_dir_recursively(&directory,
rm_flags) != 0) {
- warning("failed to remove '%s'", qname);
+ warning(_("failed to remove '%s'"), qname);
errors++;
}
} else if (show_only) {
- printf("Would not remove %s\n", qname);
+ printf(_("Would not remove %s\n"), qname);
} else {
- printf("Not removing %s\n", qname);
+ printf(_("Not removing %s\n"), qname);
}
strbuf_reset(&directory);
} else {
@@ -167,13 +167,13 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
continue;
qname = quote_path_relative(ent->name, -1, &buf, prefix);
if (show_only) {
- printf("Would remove %s\n", qname);
+ printf(_("Would remove %s\n"), qname);
continue;
} else if (!quiet) {
- printf("Removing %s\n", qname);
+ printf(_("Removing %s\n"), qname);
}
if (unlink(ent->name) != 0) {
- warning("failed to remove '%s'", qname);
+ warning(_("failed to remove '%s'"), qname);
errors++;
}
}
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index 582d0b5..6fccd91 100755
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -124,13 +124,13 @@ cat >expected <<EOF
Would remove expected
Would remove result
EOF
-test_expect_success 'git-clean, absent case' '
+test_expect_success NO_GETTEXT_POISON 'git-clean, absent case' '
setup_absent &&
git clean -n > result &&
test_cmp expected result
'
-test_expect_success 'git-clean, dirty case' '
+test_expect_success NO_GETTEXT_POISON 'git-clean, dirty case' '
setup_dirty &&
git clean -n > result &&
test_cmp expected result
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 7dbbea1..eed032d 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -110,7 +110,7 @@ test_expect_success 'git clean with prefix' '
'
-test_expect_success 'git clean with relative prefix' '
+test_expect_success NO_GETTEXT_POISON 'git clean with relative prefix' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@@ -125,7 +125,7 @@ test_expect_success 'git clean with relative prefix' '
}
'
-test_expect_success 'git clean with absolute path' '
+test_expect_success NO_GETTEXT_POISON 'git clean with absolute path' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@@ -377,7 +377,7 @@ test_expect_success 'clean.requireForce and -f' '
'
-test_expect_success 'core.excludesfile' '
+test_expect_success NO_GETTEXT_POISON 'core.excludesfile' '
echo excludes >excludes &&
echo included >included &&
--
1.7.2.3.313.gcd15
next prev parent reply other threads:[~2010-09-06 12:22 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-04 22:10 [PATCH 00/63] [REDO] Add gettext support to Git Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 01/63] builtin: use builtin.h for all builtin commands Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 02/63] Add infrastructure for translating Git with gettext Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 05/63] tests: locate i18n lib&data correctly under --valgrind Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 21/63] po/is.po: add Icelandic translation Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 26/63] gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 27/63] gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 28/63] gettext tests: skip breaking " Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 51/63] gettextize: git-merge basic messages Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 63/63] po/en_GB.po: add British English Translation Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 00/15] [REDO CONTINUE] Add gettext support to Git Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 01/15] gettextize: git-archive basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 02/15] gettextize: git-bundle " Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` Ævar Arnfjörð Bjarmason [this message]
2010-09-06 12:21 ` [PATCH 04/15] gettextize: git-clean clean.requireForce messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 05/15] gettextize: git-describe basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 06/15] gettextize: git-gc " Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 07/15] gettextize: git-gc "Auto packing the repository" message Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 08/15] gettextize: git-notes basic commands Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 09/15] gettextize: git-notes GIT_NOTES_REWRITE_MODE error message Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 10/15] gettextize: git-notes "Refusing to %s notes in %s" message Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 11/15] gettextize: git-revert basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 12/15] gettextize: git-revert mark the "me" variable for translation Ævar Arnfjörð Bjarmason
2010-09-06 18:45 ` Jonathan Nieder
2010-09-06 20:06 ` Ævar Arnfjörð Bjarmason
2010-09-06 20:08 ` Jonathan Nieder
2010-09-06 12:21 ` [PATCH 13/15] gettextize: git-revert messages using the "me" variable Ævar Arnfjörð Bjarmason
2010-09-06 18:50 ` Jonathan Nieder
2010-09-06 20:12 ` Ævar Arnfjörð Bjarmason
2010-09-07 5:39 ` Jonathan Nieder
2010-09-07 8:51 ` Ævar Arnfjörð Bjarmason
2010-09-10 0:26 ` Junio C Hamano
2010-09-06 12:21 ` [PATCH 14/15] gettextize: git-revert split up "could not revert/apply" message Ævar Arnfjörð Bjarmason
2010-09-06 18:55 ` Jonathan Nieder
2010-09-06 20:25 ` Ævar Arnfjörð Bjarmason
2010-09-07 5:34 ` Jonathan Nieder
2010-09-07 8:47 ` Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 15/15] gettextize: git-shortlog basic messages Ævar Arnfjörð Bjarmason
2010-09-06 18:41 ` Jonathan Nieder
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=1283775704-29440-4-git-send-email-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jk@jk.gs \
/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).