From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1NCMC7-0001WH-K7
	for mharc-grub-devel@gnu.org; Sun, 22 Nov 2009 18:50:15 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NCMC6-0001W4-HK
	for grub-devel@gnu.org; Sun, 22 Nov 2009 18:50:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NCMC2-0001Pf-5r
	for grub-devel@gnu.org; Sun, 22 Nov 2009 18:50:14 -0500
Received: from [199.232.76.173] (port=41021 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NCMC2-0001PK-0A
	for grub-devel@gnu.org; Sun, 22 Nov 2009 18:50:10 -0500
Received: from 197.red-80-32-81.staticip.rima-tde.net ([80.32.81.197]:41810
	helo=mail.pina.cat) by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <carles@pina.cat>) id 1NCMC1-0003Kc-9d
	for grub-devel@gnu.org; Sun, 22 Nov 2009 18:50:09 -0500
Received: from pinux (82-45-164-87.cable.ubr06.hari.blueyonder.co.uk
	[82.45.164.87])
	by mail.pina.cat (Postfix) with ESMTP id 5C06B288FBA2F
	for <grub-devel@gnu.org>; Mon, 23 Nov 2009 00:50:08 +0100 (CET)
Received: by pinux (Postfix, from userid 1000)
	id 6FC172A01; Sun, 22 Nov 2009 23:50:13 +0000 (GMT)
Date: Sun, 22 Nov 2009 23:50:13 +0000
From: Carles Pina i Estany <carles@pina.cat>
To: grub-devel@gnu.org
Message-ID: <20091122235013.GA12142@pina.cat>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="h31gzZEtNLTqOjlF"
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
Subject: gettextize normal/menu_text.c (print_timeout)
X-BeenThere: grub-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: The development of GNU GRUB <grub-devel@gnu.org>
List-Id: The development of GNU GRUB <grub-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grub-devel>,
	<mailto:grub-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grub-devel>
List-Post: <mailto:grub-devel@gnu.org>
List-Help: <mailto:grub-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grub-devel>,
	<mailto:grub-devel-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Nov 2009 23:50:14 -0000


--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline


Hello,

Attached a proposal of gettextize for normal/menu_text.c

------
2009-11-22  Carles Pina i Estany <carles@pina.cat>

        * normal/menu_text.c (get_spaces): New function.
        (print_timeout): Gettexttize and uses get_spaces.
------

If accepted I can combine with the previous patch gettextizing some
files in normal/*

Cheers,

-- 
Carles Pina i Estany
	http://pinux.info

--h31gzZEtNLTqOjlF
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="gettext_print_timeout.patch"

=== modified file 'normal/menu_text.c'
--- normal/menu_text.c	2009-11-22 22:24:54 +0000
+++ normal/menu_text.c	2009-11-22 23:40:20 +0000
@@ -262,12 +262,34 @@
   return entry;
 }
 
+static char*
+get_spaces (int number_spaces)
+{
+  char* spaces = grub_malloc(number_spaces + 1);
+  int i;
+
+  spaces[0] = '\0';
+  
+  for (i=0;i<number_spaces;i++)
+    {
+      grub_strcat(spaces, " ");
+    }
+  return spaces;
+}
+  
 static void
 print_timeout (int timeout, int offset, int second_stage)
 {
-  /* NOTE: Do not remove the trailing space characters.
-     They are required to clear the line.  */
-  char *msg = "   The highlighted entry will be booted automatically in %ds.    ";
+  const char *msg_localized = _("   The highlighted entry will be booted automatically in %ds.");
+  const int msg_localized_len = grub_strlen (msg_localized);
+  const int number_spaces = GRUB_TERM_WIDTH - msg_localized_len;
+  
+  char *msg = grub_malloc (msg_localized_len + number_spaces + 1);
+  char *spaces = get_spaces (number_spaces);
+
+  grub_sprintf (msg,"%s%s", msg_localized, spaces);
+  grub_free (spaces);
+
   char *msg_end = grub_strchr (msg, '%');
 
   grub_gotoxy (second_stage ? (msg_end - msg) : 0, GRUB_TERM_HEIGHT - 3);


--h31gzZEtNLTqOjlF--