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/t0201-gettext-fallbacks.sh | |
| parent | c2d140db08e772e14ca17044821bcf94ae09cd0f (diff) | |
| download | git-c7108bf9ed72403bdf6274bf46263731590bffcf.tar.gz git-c7108bf9ed72403bdf6274bf46263731590bffcf.tar.xz | |
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/t0201-gettext-fallbacks.sh')
| -rwxr-xr-x | t/t0201-gettext-fallbacks.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh index 52b1c27c2..5d80a985f 100755 --- a/t/t0201-gettext-fallbacks.sh +++ b/t/t0201-gettext-fallbacks.sh @@ -51,16 +51,16 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' ' cmdline="git am" && export cmdline; - printf "When you have resolved this problem run git am --resolved." >expect && - eval_gettext "When you have resolved this problem run \$cmdline --resolved." >actual + printf "When you have resolved this problem, run git am --resolved." >expect && + eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual test_i18ncmp expect actual ' test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' ' cmdline="git am" && export cmdline; - printf "When you have resolved this problem run \"git am --resolved\"." >expect && - eval_gettext "When you have resolved this problem run \"\$cmdline --resolved\"." >actual + printf "When you have resolved this problem, run \"git am --resolved\"." >expect && + eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual test_i18ncmp expect actual ' |