Re: [PATCH 16/22] refs.c: mark more strings for translation
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jun 3, 2018, 08:08 UTC
- Message-ID
- <CAPig+cSC0dx9hwMQt9wAMQNezPNm7_GP9UqbxH1ZtuqrqaS=pA@mail.gmail.com>
- In-Reply-To
- <20180602043241.9941-17-pclouds@gmail.com>
On Sat, Jun 2, 2018 at 12:32 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
Show 8 quoted lines
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> 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.
Show 11 quoted lines
> 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.
Show 8 quoted lines
> 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.