Re: [PATCH 04/13] i18n: blame: mark error messages for translation

From

Junio C Hamano <gitster@pobox.com>

Date

Sep 12, 2016, 15:40 UTC

Message-ID

<xmqq37l55dol.fsf@gitster.mtv.corp.google.com>

In-Reply-To

<2532042.KMOOJ8STkh@cayenne>

Jean-Noël AVILA <jn.avila@free.fr> writes:

>> @@ -2820,7 +2820,7 @@ int cmd_blame(int argc, const char **argv, const char
>> *prefix) &bottom, &top, sb.path))
>>  			usage(blame_usage);
>>  		if (lno < top || ((lno || bottom) && lno < bottom))
>> -			die("file %s has only %lu lines", path, lno);
>> +			die(_("file %s has only %lu lines"), path, lno);
>
> Here a plural version is needed.

Good eyes, like this?

 builtin/blame.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/blame.c b/builtin/blame.c
index 3fee197..cb12085 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2820,7 +2820,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 				    &bottom, &top, sb.path))
 			usage(blame_usage);
 		if (lno < top || ((lno || bottom) && lno < bottom))
-			die(_("file %s has only %lu lines"), path, lno);
+			die(Q_("file %s has only %lu line",
+			       "file %s has only %lu lines", lno),
+			    path, lno);
 		if (bottom < 1)
 			bottom = 1;
 		if (top < 1)