From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC 1/7] i18n: mark init-db messages for translation
Date: Tue, 12 Apr 2011 00:12:30 -0700 [thread overview]
Message-ID: <7v39lorli9.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1302464048-21806-2-git-send-email-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Sun, 10 Apr 2011 19:34:02 +0000")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> fp = fopen(git_link, "w");
> if (!fp)
> - die("Could not create git link %s", git_link);
> - fprintf(fp, "gitdir: %s\n", git_dir);
> + die(_("Could not create git link %s"), git_link);
> + fprintf(fp, _("gitdir: %s\n"), git_dir);
> fclose(fp);
> }
>
> diff --git a/t/t0001-init.sh b/t/t0001-init.sh
> index a5816d0..fa31cbd 100755
> --- a/t/t0001-init.sh
> +++ b/t/t0001-init.sh
> @@ -374,22 +374,28 @@ test_expect_success 'init prefers command line to GIT_DIR' '
> test_expect_success 'init with separate gitdir' '
> rm -rf newdir &&
> git init --separate-git-dir realgitdir newdir &&
> - echo "gitdir: `pwd`/realgitdir" >expected &&
> - test_cmp expected newdir/.git &&
> test -d realgitdir/refs
> '
>
> +test_expect_success C_LOCALE_OUTPUT 'init with separate gitdir: output' '
> + echo "gitdir: `pwd`/realgitdir" >expected &&
> + test_cmp expected newdir/.git
> +'
I don't think this is correct. The file "git_link" refers to .git that is
not a directory but is a regular file whose contents is "gitdir: $path"
and that should _never_ be localized, so the patch to die() message is Ok,
but the string given to fprintf(fp, ...) is _not_.
And t0001 should compare the expected output with "gitdir: $path"
regardless of the poisoning.
next prev parent reply other threads:[~2011-04-12 7:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-10 19:34 [PATCH/RFC 0/7] i18n: mark missing C messages Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 1/7] i18n: mark init-db messages for translation Ævar Arnfjörð Bjarmason
2011-04-12 7:12 ` Junio C Hamano [this message]
2011-04-12 7:15 ` Junio C Hamano
2011-04-12 7:44 ` Ævar Arnfjörð Bjarmason
2011-04-12 18:20 ` Junio C Hamano
2011-04-12 22:55 ` Junio C Hamano
2011-04-12 23:04 ` Junio C Hamano
2011-04-14 20:56 ` [PATCH] i18n: use test_i18n{grep,cmp} in t7508 Junio C Hamano
2011-04-10 19:34 ` [PATCH/RFC 2/7] i18n: mark merge "Could not read from" message for translation Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 3/7] i18n: mark merge "upstream" messages " Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 4/7] i18n: mark merge CHERRY_PICK_HEAD " Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 5/7] i18n: mark clone nonexistent repository message " Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 6/7] i18n: mark checkout --detach messages " Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 7/7] i18n: mark checkout plural warning " Ævar Arnfjörð Bjarmason
2011-04-12 7:19 ` Junio C Hamano
2011-04-12 7:54 ` Ævar Arnfjörð Bjarmason
2011-04-12 20:57 ` Junio C Hamano
2011-04-13 8:30 ` Ævar Arnfjörð Bjarmason
2011-04-13 15:55 ` Junio C Hamano
2011-04-12 7:27 ` [PATCH/RFC 0/7] i18n: mark missing C messages Junio C Hamano
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=7v39lorli9.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.