diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-06-17 20:21:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-17 22:45:48 (GMT) |
| commit | f2d17068fd795f980811a3979d671f7d005d3f5c (patch) | |
| tree | dfce961234a1f2764654793bbbc63c991e14fa25 /t/lib-rebase.sh | |
| parent | b8fc9e43a7da5c8cb1e90eb569b5e821883c2e06 (diff) | |
| download | git-f2d17068fd795f980811a3979d671f7d005d3f5c.zip git-f2d17068fd795f980811a3979d671f7d005d3f5c.tar.gz git-f2d17068fd795f980811a3979d671f7d005d3f5c.tar.bz2 | |
i18n: rebase-interactive: mark comments of squash for translation
Mark comment messages of squash/fixup file ($squash_msg) for
translation.
Helper functions this_nth_commit_message and skip_nth_commit_message
replace the previous method of making the comment messages (such as
"This is the 2nd commit message:") aided by nth_string helper function.
This step was taken as a workaround to enabled translation of entire
sentences. However, doesn't change any text seen in English by the user,
except for string "The first commit's message is:" which was changed to
match the style of other instances.
The test t3404-rebase-interactive.sh resorts to set_fake_editor which
didn't account for GETTEXT_POISON. Fix it by assuming success when we
find dummy gettext poison output where was supposed to find the first
comment line "This is a combination of $count commits.".
For that same message, use plural aware eval_ngettext instead of
eval_gettext, since other languages have more complex plural forms.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 9a96e15..25a77ee 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -29,6 +29,7 @@ set_fake_editor () { */COMMIT_EDITMSG) test -z "$EXPECT_HEADER_COUNT" || test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" || + test "# # GETTEXT POISON #" = "$(sed -n '1p' < "$1")" || exit test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1" test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1" |