From: Ævar Arnfjörð Bjarmason Date: Sun, 5 Sep 2010 12:31:48 +0000 (+0000) Subject: gettextize: git-clean basic messages X-Git-Tag: ko-pu~10^2~80 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d029d685089d5ed7e9fbc429cf61af58da310bd8;p=git.git gettextize: git-clean basic messages Signed-off-by: Ævar Arnfjörð Bjarmason --- diff --git a/builtin/clean.c b/builtin/clean.c index c8798f549..fec3d7226 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 582d0b54f..6fccd9108 100755 --- a/t/t7012-skip-worktree-writing.sh +++ b/t/t7012-skip-worktree-writing.sh @@ -124,13 +124,13 @@ cat >expected < 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 6c776e9be..996f98c18 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 &&