@matheusbsbs / matheus-bagliano / commits / a66f9b2afd
Fork 0

i18n: git-clean clean.requireForce messages

Split up the "clean.requireForce set/defaults to true..." die() message to make it easier to translate. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Feb 22, 2011 at 23:42 UTC a66f9b2afde8ae0d6bd8991e6a8f848904c8bdde
1 file changed +8 -3
builtin/clean.c
+8 -3
@@ -77,9 +77,14 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
77 if (ignored && ignored_only)
78 die(_("-x and -X cannot be used together"));
79
80 - if (!show_only && !force)
81 - die("clean.requireForce %s to true and neither -n nor -f given; "
82 - "refusing to clean", config_set ? "set" : "defaults");
80 + if (!show_only && !force) {
81 + if (config_set)
82 + die(_("clean.requireForce set to true and neither -n nor -f given; "
83 + "refusing to clean"));
84 + else
85 + die(_("clean.requireForce defaults to true and neither -n nor -f given; "
86 + "refusing to clean"));
87 + }
88
89 if (force > 1)
90 rm_flags = 0;