Mark dirstat error messages for translation

Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index 5f497fac527362960560534b4285e69d4ed51176..097eb4c47a99eee2e6c82641a3be43264a97d66e 100644 (file)
--- 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 {
                        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 {
                                            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++;
                }
                                    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))
                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;
                                errmsg.buf);
                strbuf_release(&errmsg);
                diff_dirstat_permille_default = default_diff_options.dirstat_permille;


@@ -3260,7 +3260,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))
 {
        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);
        /*
                    errmsg.buf);
        strbuf_release(&errmsg);
        /*

diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index cc947fde9134ae6f08c1332a5193c771e07c08c2..29e80a58cdcf43077bcc5bf42834aa8b4daad93d 100755 (executable)
--- 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 &&
        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 &&
 '
 
 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 &&
 '
 
 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 &&
 
        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 &&
 
        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
 '
 
 test_done