From: Junio C Hamano <gitster@pobox.com>
To: Jean-Noel Avila <jn.avila@free.fr>
Cc: git@vger.kernel.org, Jiang Xin <worldhello.net@gmail.com>
Subject: Re: [PATCH 1/3] i18n: fix typos for translation
Date: Wed, 24 Aug 2016 08:45:41 -0700 [thread overview]
Message-ID: <xmqqshturx0a.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqk2f7xyfe.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 23 Aug 2016 09:06:13 -0700")
And here is the second one, using wording suggested by Jiang.
-- >8 --
From: Jean-Noel Avila <jn.avila@free.fr>
Date: Sun, 21 Aug 2016 16:50:38 +0200
Subject: [PATCH] i18n: fix git rebase interactive commit messages
For proper i18n, the logic cannot embed english specific processing.
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
git-rebase--interactive.sh | 45 +++------------------------------------------
1 file changed, 3 insertions(+), 42 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index e2da524..7e558b0 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -404,51 +404,12 @@ pick_one_preserving_merges () {
this_nth_commit_message () {
n=$1
- case "$n" in
- 1) gettext "This is the 1st commit message:";;
- 2) gettext "This is the 2nd commit message:";;
- 3) gettext "This is the 3rd commit message:";;
- 4) gettext "This is the 4th commit message:";;
- 5) gettext "This is the 5th commit message:";;
- 6) gettext "This is the 6th commit message:";;
- 7) gettext "This is the 7th commit message:";;
- 8) gettext "This is the 8th commit message:";;
- 9) gettext "This is the 9th commit message:";;
- 10) gettext "This is the 10th commit message:";;
- # TRANSLATORS: if the language you are translating into
- # doesn't allow you to compose a sentence in this fashion,
- # consider translating as if this and the following few strings
- # were "This is the commit message ${n}:"
- *1[0-9]|*[04-9]) eval_gettext "This is the \${n}th commit message:";;
- *1) eval_gettext "This is the \${n}st commit message:";;
- *2) eval_gettext "This is the \${n}nd commit message:";;
- *3) eval_gettext "This is the \${n}rd commit message:";;
- *) eval_gettext "This is the commit message \${n}:";;
- esac
+ eval_gettext "This is the commit message #\${n}:"
}
+
skip_nth_commit_message () {
n=$1
- case "$n" in
- 1) gettext "The 1st commit message will be skipped:";;
- 2) gettext "The 2nd commit message will be skipped:";;
- 3) gettext "The 3rd commit message will be skipped:";;
- 4) gettext "The 4th commit message will be skipped:";;
- 5) gettext "The 5th commit message will be skipped:";;
- 6) gettext "The 6th commit message will be skipped:";;
- 7) gettext "The 7th commit message will be skipped:";;
- 8) gettext "The 8th commit message will be skipped:";;
- 9) gettext "The 9th commit message will be skipped:";;
- 10) gettext "The 10th commit message will be skipped:";;
- # TRANSLATORS: if the language you are translating into
- # doesn't allow you to compose a sentence in this fashion,
- # consider translating as if this and the following few strings
- # were "The commit message ${n} will be skipped:"
- *1[0-9]|*[04-9]) eval_gettext "The \${n}th commit message will be skipped:";;
- *1) eval_gettext "The \${n}st commit message will be skipped:";;
- *2) eval_gettext "The \${n}nd commit message will be skipped:";;
- *3) eval_gettext "The \${n}rd commit message will be skipped:";;
- *) eval_gettext "The commit message \${n} will be skipped:";;
- esac
+ eval_gettext "The commit message #\${n} will be skipped:"
}
update_squash_messages () {
--
2.10.0-rc1-130-gf5df0f2
next prev parent reply other threads:[~2016-08-24 15:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 15:04 [L10N] Kickoff of translation for Git 2.10.0 round 1 Jiang Xin
2016-08-20 16:01 ` Jean-Noël AVILA
2016-08-20 18:03 ` Junio C Hamano
2016-08-20 18:38 ` Jean-Noël AVILA
2016-08-21 15:45 ` Jiang Xin
2016-08-23 15:58 ` Junio C Hamano
2016-08-23 18:16 ` Jean-Noël AVILA
2016-08-21 14:50 ` [PATCH 1/3] i18n: fix typos for translation Jean-Noel Avila
2016-08-21 14:50 ` [PATCH 2/3] i18n: fix git rebase interactive commit messages Jean-Noel Avila
2016-08-21 14:50 ` [PATCH 3/3] i18n: simplify numeric error reporting Jean-Noel Avila
2016-08-24 15:48 ` Junio C Hamano
2016-08-23 16:06 ` [PATCH 1/3] i18n: fix typos for translation Junio C Hamano
2016-08-24 15:44 ` Junio C Hamano
2016-08-24 15:45 ` Junio C Hamano [this message]
2016-08-25 5:24 ` [L10N] Kickoff of translation for Git 2.10.0 round 1 Alex Henrie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqshturx0a.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).