Skip to content

Commit 8aa6dc1

Browse files
jnavilagitster
authored andcommitted
i18n: fix git rebase interactive commit messages
For proper i18n, the logic cannot embed english specific processing. Signed-off-by: Jean-Noel Avila <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cd3e467 commit 8aa6dc1

File tree

1 file changed

+3
-42
lines changed

1 file changed

+3
-42
lines changed

git-rebase--interactive.sh

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -404,51 +404,12 @@ pick_one_preserving_merges () {
404404

405405
this_nth_commit_message () {
406406
n=$1
407-
case "$n" in
408-
1) gettext "This is the 1st commit message:";;
409-
2) gettext "This is the 2nd commit message:";;
410-
3) gettext "This is the 3rd commit message:";;
411-
4) gettext "This is the 4th commit message:";;
412-
5) gettext "This is the 5th commit message:";;
413-
6) gettext "This is the 6th commit message:";;
414-
7) gettext "This is the 7th commit message:";;
415-
8) gettext "This is the 8th commit message:";;
416-
9) gettext "This is the 9th commit message:";;
417-
10) gettext "This is the 10th commit message:";;
418-
# TRANSLATORS: if the language you are translating into
419-
# doesn't allow you to compose a sentence in this fashion,
420-
# consider translating as if this and the following few strings
421-
# were "This is the commit message ${n}:"
422-
*1[0-9]|*[04-9]) eval_gettext "This is the \${n}th commit message:";;
423-
*1) eval_gettext "This is the \${n}st commit message:";;
424-
*2) eval_gettext "This is the \${n}nd commit message:";;
425-
*3) eval_gettext "This is the \${n}rd commit message:";;
426-
*) eval_gettext "This is the commit message \${n}:";;
427-
esac
407+
eval_gettext "This is the commit message #\${n}:"
428408
}
409+
429410
skip_nth_commit_message () {
430411
n=$1
431-
case "$n" in
432-
1) gettext "The 1st commit message will be skipped:";;
433-
2) gettext "The 2nd commit message will be skipped:";;
434-
3) gettext "The 3rd commit message will be skipped:";;
435-
4) gettext "The 4th commit message will be skipped:";;
436-
5) gettext "The 5th commit message will be skipped:";;
437-
6) gettext "The 6th commit message will be skipped:";;
438-
7) gettext "The 7th commit message will be skipped:";;
439-
8) gettext "The 8th commit message will be skipped:";;
440-
9) gettext "The 9th commit message will be skipped:";;
441-
10) gettext "The 10th commit message will be skipped:";;
442-
# TRANSLATORS: if the language you are translating into
443-
# doesn't allow you to compose a sentence in this fashion,
444-
# consider translating as if this and the following few strings
445-
# were "The commit message ${n} will be skipped:"
446-
*1[0-9]|*[04-9]) eval_gettext "The \${n}th commit message will be skipped:";;
447-
*1) eval_gettext "The \${n}st commit message will be skipped:";;
448-
*2) eval_gettext "The \${n}nd commit message will be skipped:";;
449-
*3) eval_gettext "The \${n}rd commit message will be skipped:";;
450-
*) eval_gettext "The commit message \${n} will be skipped:";;
451-
esac
412+
eval_gettext "The commit message #\${n} will be skipped:"
452413
}
453414

454415
update_squash_messages () {

0 commit comments

Comments
 (0)