diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 22:43:52 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 22:57:14 +0400 |
| commit | dff1a98350c97c6ce207c582c8fd042bc6c04cd2 (patch) | |
| tree | 3ffed10778ec8745ba197c3e6fc84cb8abd72e66 /t | |
| parent | 865207a6dd9f7cc0c0941798b6ab4115b14f97a7 (diff) | |
i18n: git-am core say messages
Make the core git-am messages that use say() translatable. These are
visible on almost every git am invocation.
There are tests that depend on the "Applying" output that need to be
changed to use the test_i18* functions along with this translation.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4150-am.sh | 2 | ||||
| -rwxr-xr-x | t/t4151-am-abort.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 850fc96d1f..151404e090 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -465,7 +465,7 @@ test_expect_success 'am newline in subject' ' test_tick && sed -e "s/second/second \\\n foo/" patch1 >patchnl && git am <patchnl >output.out 2>&1 && - grep "^Applying: second \\\n foo$" output.out + test_i18ngrep "^Applying: second \\\n foo$" output.out ' test_expect_success 'am -q is quiet' ' diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index c95c4ccc39..1176bcccf3 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -45,8 +45,9 @@ do test_expect_success "am$with3 --skip continue after failed am$with3" ' test_must_fail git am$with3 --skip >output && - test "$(grep "^Applying" output)" = "Applying: 6" && - test_cmp file-2-expect file-2 && + test_i18ngrep "^Applying" output >output.applying && + test_i18ngrep "^Applying: 6$" output.applying && + test_i18ncmp file-2-expect file-2 && test ! -f .git/MERGE_RR ' |