From e3f54bff43e61934643108ee26bfe1ad0c19c6a3 Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Thu, 15 Sep 2016 14:58:58 +0000 Subject: i18n: blame: mark error messages for translation Mark error messages for translation passed to die() function. Change "Cannot" to lowercase following the usual style. Reflect changes to test by using test_i18ngrep. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- t/t8003-blame-corner-cases.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index e48370dfa0..661f9d430d 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -212,12 +212,12 @@ EOF test_expect_success 'blame -L with invalid start' ' test_must_fail git blame -L5 tres 2>errors && - grep "has only 2 lines" errors + test_i18ngrep "has only 2 lines" errors ' test_expect_success 'blame -L with invalid end' ' test_must_fail git blame -L1,5 tres 2>errors && - grep "has only 2 lines" errors + test_i18ngrep "has only 2 lines" errors ' test_expect_success 'blame parses part of -L' ' -- cgit v1.2.3 From 8d79589ad61132e038dd7312ab018c6d6518ead7 Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Thu, 15 Sep 2016 14:59:04 +0000 Subject: notes: spell first word of error messages in lowercase That's the usual style. Update one test to reflect these changes. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- t/t3320-notes-merge-worktrees.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index 6e0511596b..b9c3bc2487 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -52,7 +52,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' ' cd worktree && git config core.notesRef refs/notes/y && test_must_fail git notes merge z 2>err && - test_i18ngrep "A notes merge into refs/notes/y is already in-progress at" err + test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err ) && test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF ' -- cgit v1.2.3