Re: [PATCH 16/22] refs.c: mark more strings for translation
From: Eric Sunshine <hidden>
Date: 2018-06-03 08:08:52
On Sat, Jun 2, 2018 at 12:32 AM, Nguyễn Thái Ngọc Duy [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> ---diff --git a/refs.c b/refs.c@@ -1845,7 +1845,7 @@ int ref_update_reject_duplicates(struct string_list *refnames, if (!cmp) { strbuf_addf(err, - "multiple updates for ref '%s' not allowed.", + _("multiple updates for ref '%s' not allowed."),
In other messages in this patch, you dropped the period at the end of the message. Perhaps do so here too.
quoted hunk ↗ jump to hunk
refnames->items[i].string); return 1; } else if (cmp > 0) {diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh@@ -390,7 +390,7 @@ test_expect_success 'Query "master@{2005-05-26 23:33:01}" (middle of history wit test_when_finished "rm -f o e" && git rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e && test $B = $(cat o) && - test "warning: Log for ref $m has gap after $gd." = "$(cat e)" + test_i18ngrep -F "warning: log for ref $m has gap after $gd" e '
The change from '$(cat e)' to bare 'e' caught me off guard for a moment, but use of test_i18ngrep explains it. Okay.
quoted hunk ↗ jump to hunk
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh@@ -541,9 +541,9 @@ EOF - grep -q "refs/notes/m" output && - grep -q "$(git rev-parse refs/notes/m)" output && - grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output && + test_i18ngrep -q "refs/notes/m" output && + test_i18ngrep -q "$(git rev-parse refs/notes/m)" output && + test_i18ngrep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output &&
I hadn't seen test_i18ngrep take argument -q elsewhere, so I wondered if it handled it correctly. Checking the implementation, I see that it does pass it along to the underlying grep. Okay. I also wondered briefly if it made sense to drop -q here since it doesn't necessarily help debugging the test upon failure, but I suppose such a change is outside the scope of this patch series, so probably better not to.