diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-07-25 22:53:08 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-25 10:09:14 -0700 |
| commit | c7108bf9ed72403bdf6274bf46263731590bffcf (patch) | |
| tree | 9745d2a31c61fdb54fd69e2d7974e365df8498da /t/t3406-rebase-message.sh | |
| parent | c2d140db08e772e14ca17044821bcf94ae09cd0f (diff) | |
| download | git-c7108bf9ed72403bdf6274bf46263731590bffcf.tar.gz | |
i18n: rebase: mark messages for translation
Mark messages in git-rebase.sh for translation. While doing this
Jonathan noticed that the comma usage and sentence structure of the
resolvemsg was not quite right, so correct that and its cousins in
git-am.sh and t/t0201-gettext-fallbacks.sh at the same time.
Some tests would start to fail with GETTEXT_POISON turned on after
this update. Use test_i18ncmp and test_i18ngrep where appropriate
to mark strings that should only be checked in the C locale output
to avoid such issues.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3406-rebase-message.sh')
| -rwxr-xr-x | t/t3406-rebase-message.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 6898377910..e6a9a0d436 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -62,9 +62,16 @@ test_expect_success 'rebase -n overrides config rebase.stat config' ' ! grep "^ fileX | *1 +$" diffstat.txt ' +# Output to stderr: +# +# "Does not point to a valid commit: invalid-ref" +# +# NEEDSWORK: This "grep" is fine in real non-C locales, but +# GETTEXT_POISON poisons the refname along with the enclosing +# error message. test_expect_success 'rebase --onto outputs the invalid ref' ' test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err && - grep "invalid-ref" err + test_i18ngrep "invalid-ref" err ' test_done |