Re: [PATCH/RFC 1/7] i18n: mark init-db messages for translation

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 12, 2011, 07:12 UTC
Message-ID: <7v39lorli9.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1302464048-21806-2-git-send-email-avarab@gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

Show 26 quoted lines

>  	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.