From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jonathan Niedier" <jrnieder@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jiang Xin" <worldhello.net@gmail.com>,
"Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH] apply: remove lego in i18n string in gitdiff_verify_name
Date: Tue, 8 May 2012 20:38:27 +0700 [thread overview]
Message-ID: <1336484307-31553-1-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <7vwr4n6fcj.fsf@alter.siamese.dyndns.org>
Currently it marks the string "...inconsistent %s filename..." where
%s is either "old" or "new" from caller. From a translator point of
view, nothing hints what "%s" may be. Make it two strings
"...inconsistent new filename..." and "...inconsistent old
filename..."
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
On Tue, May 8, 2012 at 1:00 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> index 725712d..1edd3f7 100644
>> --- a/builtin/apply.c
>> +++ b/builtin/apply.c
>> @@ -919,7 +919,7 @@ static int gitdiff_hdrend(const char *line, struct patch *patch)
>> * their names against any previous information, just
>> * to make sure..
>> */
>> -static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
>> +static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, int new)
>> {
>
> This change is unwarranted, though. The callers were much clearer when
> they passed "old" vs "new"; now they pass an unexplained 0 vs 1.
Hmm.. how about this?
builtin/apply.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 725712d..92ba925 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -933,8 +933,15 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
if (isnull)
die(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"), name, linenr);
another = find_name(line, NULL, p_value, TERM_TAB);
- if (!another || memcmp(another, name, len + 1))
- die(_("git apply: bad git-diff - inconsistent %s filename on line %d"), oldnew, linenr);
+ if (!another || memcmp(another, name, len + 1)) {
+ if (!strcmp(oldnew, "old"))
+ die(_("git apply: bad git-diff - inconsistent old filename on line %d"), linenr);
+ else if (!strcmp(oldnew, "new"))
+ die(_("git apply: bad git-diff - inconsistent new filename on line %d"), linenr);
+ else
+ die("BUG: please add a new full string for '%s' similar to above code.\n"
+ "It makes translators' life much simpler. Thanks!", oldnew);
+ }
free(another);
return orig_name;
}
--
1.7.8.36.g69ee2
next prev parent reply other threads:[~2012-05-08 13:42 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 12:30 [PATCH 00/10] i18n relative dates, help, remote, apply, index-pack and bundle Nguyễn Thái Ngọc Duy
2012-04-23 12:30 ` [PATCH 01/10] Makefile: feed all header files to xgettext Nguyễn Thái Ngọc Duy
2012-04-23 12:30 ` [PATCH 02/10] Add three convenient format printing functions with \n automatically appended Nguyễn Thái Ngọc Duy
2012-04-23 16:15 ` Jonathan Nieder
2012-04-23 12:30 ` [PATCH 03/10] i18n: mark relative dates for translation Nguyễn Thái Ngọc Duy
2012-04-24 20:04 ` Junio C Hamano
2012-04-25 10:46 ` Nguyen Thai Ngoc Duy
2012-04-25 11:07 ` Johannes Sixt
2012-04-25 11:25 ` Zbigniew Jędrzejewski-Szmek
2012-04-25 11:29 ` Nguyen Thai Ngoc Duy
2012-04-25 15:25 ` Jonathan Nieder
2012-04-25 16:27 ` Junio C Hamano
2012-04-25 17:26 ` Jonathan Nieder
2012-04-23 12:30 ` [PATCH 04/10] i18n: help: mark strings " Nguyễn Thái Ngọc Duy
2012-04-23 16:30 ` Jonathan Nieder
2012-04-23 18:18 ` Junio C Hamano
2012-04-23 18:34 ` Jonathan Nieder
2012-04-25 11:21 ` [PATCH] help: replace underlining "help -a" headers using hyphens with a blank line Nguyễn Thái Ngọc Duy
2012-04-25 17:30 ` Junio C Hamano
2012-04-23 12:30 ` [PATCH 05/10] i18n: make warn_dangling_symref() automatically append \n Nguyễn Thái Ngọc Duy
2012-04-23 12:30 ` [PATCH 06/10] i18n: remote: mark strings for translation Nguyễn Thái Ngọc Duy
2012-04-25 22:54 ` Junio C Hamano
2012-04-26 1:12 ` Nguyen Thai Ngoc Duy
2012-04-23 12:30 ` [PATCH 07/10] i18n: apply: " Nguyễn Thái Ngọc Duy
2012-04-25 22:50 ` Junio C Hamano
2012-05-06 13:13 ` [PATCH] apply: remove lego in i18n string in gitdiff_verify_name Nguyễn Thái Ngọc Duy
2012-05-07 18:00 ` Junio C Hamano
2012-05-08 13:38 ` Nguyễn Thái Ngọc Duy [this message]
2012-05-08 17:07 ` Junio C Hamano
2012-05-09 12:29 ` Nguyễn Thái Ngọc Duy
2012-04-23 12:30 ` [PATCH 08/10] i18n: apply: update say_patch_name to give translators complete sentence Nguyễn Thái Ngọc Duy
2012-04-23 12:30 ` [PATCH 09/10] i18n: index-pack: mark strings for translation Nguyễn Thái Ngọc Duy
2012-04-23 12:30 ` [PATCH 10/10] i18n: bundle: " Nguyễn Thái Ngọc Duy
2012-04-25 22:43 ` Junio C Hamano
2012-04-26 1:24 ` Nguyen Thai Ngoc Duy
2012-04-26 5:53 ` [PATCH] bundle: remove stray single-quote from error message Jonathan Nieder
2012-04-23 16:41 ` [PATCH 00/10] i18n relative dates, help, remote, apply, index-pack and bundle Jonathan Nieder
2012-04-23 18:56 ` Junio C Hamano
2012-04-23 20:06 ` Ævar Arnfjörð Bjarmason
2012-04-24 12:19 ` Nguyen Thai Ngoc Duy
2012-04-24 19:50 ` Junio C Hamano
2012-04-25 11:42 ` Nguyen Thai Ngoc Duy
2012-04-25 16:11 ` Jonathan Nieder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336484307-31553-1-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=worldhello.net@gmail.com \
--cc=zbyszek@in.waw.pl \
/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.
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 NNTP newsgroup(s).