[PATCHv6 8/8] Mark dirstat error messages for translation
From: Johan Herland <hidden>
Date: 2016-06-15 22:51:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
Suggested-by: Junio C Hamano <redacted> Signed-off-by: Johan Herland <redacted> --- This patch WILL NOT COMPILE until the topic branch is merged with an i18n/gettext-aware branch (i.e. where _() and test_i18ngrep is present). diff.c | 8 ++++---- t/t4047-diff-dirstat.sh | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/diff.c b/diff.c
index b290543..0f65413 100644
--- a/diff.c
+++ b/diff.c@@ -101,12 +101,12 @@ static int parse_dirstat_params(struct diff_options *options, const char *params if (end - p == p_len) options->dirstat_permille = permille; else { - strbuf_addf(errmsg, " Failed to parse dirstat cut-off percentage '%.*s'\n", + strbuf_addf(errmsg, _(" Failed to parse dirstat cut-off percentage '%.*s'\n"), p_len, p); ret++; } } else { - strbuf_addf(errmsg, " Unknown dirstat parameter '%.*s'\n", + strbuf_addf(errmsg, _(" Unknown dirstat parameter '%.*s'\n"), p_len, p); ret++; }
@@ -202,7 +202,7 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) struct strbuf errmsg = STRBUF_INIT; default_diff_options.dirstat_permille = diff_dirstat_permille_default; if (parse_dirstat_params(&default_diff_options, value, &errmsg)) - warning("Found errors in 'diff.dirstat' config variable:\n%s", + warning(_("Found errors in 'diff.dirstat' config variable:\n%s"), errmsg.buf); strbuf_release(&errmsg); diff_dirstat_permille_default = default_diff_options.dirstat_permille;
@@ -3255,7 +3255,7 @@ static int parse_dirstat_opt(struct diff_options *options, const char *params) { struct strbuf errmsg = STRBUF_INIT; if (parse_dirstat_params(options, params, &errmsg)) - die("Failed to parse --dirstat/-X option parameter:\n%s", + die(_("Failed to parse --dirstat/-X option parameter:\n%s"), errmsg.buf); strbuf_release(&errmsg); /*
diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index cc947fd..29e80a5 100755
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh@@ -943,37 +943,37 @@ test_expect_success '--dirstat=future_param,lines,0 should fail loudly' ' test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_cmp /dev/null actual_diff_dirstat && - grep -q "future_param" actual_error && - grep -q "\--dirstat" actual_error + test_i18ngrep -q "future_param" actual_error && + test_i18ngrep -q "\--dirstat" actual_error ' test_expect_success '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters' ' test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_cmp /dev/null actual_diff_dirstat && - grep -q "dummy1" actual_error && - grep -q "2dummy" actual_error && - grep -q "\--dirstat" actual_error + test_i18ngrep -q "dummy1" actual_error && + test_i18ngrep -q "2dummy" actual_error && + test_i18ngrep -q "\--dirstat" actual_error ' test_expect_success 'diff.dirstat=future_param,0,lines should warn, but still work' ' git -c diff.dirstat=future_param,0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat actual_diff_dirstat && - grep -q "future_param" actual_error && - grep -q "diff\\.dirstat" actual_error && + test_i18ngrep -q "future_param" actual_error && + test_i18ngrep -q "diff\\.dirstat" actual_error && git -c diff.dirstat=future_param,0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat_M actual_diff_dirstat_M && - grep -q "future_param" actual_error && - grep -q "diff\\.dirstat" actual_error && + test_i18ngrep -q "future_param" actual_error && + test_i18ngrep -q "diff\\.dirstat" actual_error && git -c diff.dirstat=future_param,0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC 2>actual_error && test_debug "cat actual_error" && test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC && - grep -q "future_param" actual_error && - grep -q "diff\\.dirstat" actual_error + test_i18ngrep -q "future_param" actual_error && + test_i18ngrep -q "diff\\.dirstat" actual_error ' test_done
--
1.7.5.rc1.3.g4d7b