2009-12-20 Carles Pina i Estany <carles@pina.cat>

	* include/grub/auth.h: Include `<grub/i18n.h>'.
	(GRUB_GET_PASSWORD): Gettextizze string.
	* include/grub/normal.h (STANDARD_MARGIN): New macro, moved from
	menu_text.c.
	(grub_utf8_to_ucs4_alloc): Fix indentation.
	(grub_print_ucs4): Likewise.
	(grub_getstringwidth): Likewise.
	(print_message_indented): New declaration.
	* normal/auth.c: Include `<grub/i18n.h>'.
	(grub_auth_check_authentication): Gettexttize string.
	* normal/cmdline.c: Include `<grub/i18n.h>'.
	(grub_cmdline_get): Gettextizze.
	* normal/color.c: Include `<grub/i18n.h>'.
	(grub_parse_color_name_pair): Gettexttize strings.
	* normal/main.c (grub_normal_reader_init): Cleanup gettexttized
	string (use `print_message_indented').
	* normal/menu_text.c (STANDARD_MARGIN): Moved from here to
	`include/grub/normal.h'.
	(print_message_indented): Renamed to ...
	(grub_print_message_indented): ... this. Remove `static' qualifer (now
	used in normal/main.c).
	(print_message): Use `grub_print_message_indented' instead of
	`print_message_indented'.
	(print_timeout): Likewise.
	* normal/misc.c: Include `<grub/term.h>' and `<grub/i18n.h>'.
	(grub_normal_print_device_info): Gettexttize strings.
	* po/POTFILES: Add `auth.c', `color.c' and `misc.c'.

diff --git a/ChangeLog b/ChangeLog
index a0b8ae334793a0a8964167204bf1b37c3169f3a4..da58c702446ad02c1e0167d6b128cc2c9786e0e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2009-12-20 Carles Pina i Estany  <carles@pina.cat>
+ 
+       * include/grub/auth.h: Include `<grub/i18n.h>'.
+       (GRUB_GET_PASSWORD): Gettextizze string.
+       * include/grub/normal.h (STANDARD_MARGIN): New macro, moved from
+       menu_text.c.
+       (grub_utf8_to_ucs4_alloc): Fix indentation.
+       (grub_print_ucs4): Likewise.
+       (grub_getstringwidth): Likewise.
+       (print_message_indented): New declaration.
+       * normal/auth.c: Include `<grub/i18n.h>'.
+       (grub_auth_check_authentication): Gettexttize string.
+       * normal/cmdline.c: Include `<grub/i18n.h>'.
+       (grub_cmdline_get): Gettextizze.
+       * normal/color.c: Include `<grub/i18n.h>'.
+       (grub_parse_color_name_pair): Gettexttize strings.
+       * normal/main.c (grub_normal_reader_init): Cleanup gettexttized
+       string (use `print_message_indented').
+       * normal/menu_text.c (STANDARD_MARGIN): Moved from here to
+       `include/grub/normal.h'.
+       (print_message_indented): Renamed to ...
+       (grub_print_message_indented): ... this. Remove `static' qualifer (now
+       used in normal/main.c).
+       (print_message): Use `grub_print_message_indented' instead of
+       `print_message_indented'.
+       (print_timeout): Likewise.
+       * normal/misc.c: Include `<grub/term.h>' and `<grub/i18n.h>'.
+       (grub_normal_print_device_info): Gettexttize strings.
+       * po/POTFILES: Add `auth.c', `color.c' and `misc.c'.
+
 2009-12-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * kern/parser.c (grub_parser_split_cmdline): Fix incorrect counting

diff --git a/include/grub/auth.h b/include/grub/auth.h
index da930eeda4cab31a2f2b26252fe2cb6529523b91..82344294191743488d4b39de0acaf8e66e70bdd9 100644 (file)
--- a/include/grub/auth.h
+++ b/include/grub/auth.h
@@ -19,10 +19,11 @@
 #define GRUB_AUTH_HEADER       1
 
 #include <grub/err.h>
+#include <grub/i18n.h>
 
 /* Macros for indistinguishibility.  */
 #define GRUB_ACCESS_DENIED grub_error (GRUB_ERR_ACCESS_DENIED, "Access denied.")
-#define GRUB_GET_PASSWORD(string, len) grub_cmdline_get ("Enter password: ", \
+#define GRUB_GET_PASSWORD(string, len) grub_cmdline_get (N_("Enter password:"), \
                                                         string, len,   \
                                                         '*', 0, 0)
 

diff --git a/include/grub/normal.h b/include/grub/normal.h
index ae520c3f9896b3706bec65830a7728382f207376..e55553de54fc7c2941917ab0a146ce1bd67eb013 100644 (file)
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -30,6 +30,9 @@
 /* The maximum size of a command-line.  */
 #define GRUB_MAX_CMDLINE       1600
 
+/* The standard left and right margin for some messages.  */
+#define STANDARD_MARGIN 6
+
 /* The type of a completion item.  */
 enum grub_completion_type
   {
@@ -74,11 +77,13 @@ void grub_parse_color_name_pair (grub_uint8_t *ret, const char *name);
 /* Defined in `menu_text.c'.  */
 void grub_wait_after_message (void);
 int grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
-                       grub_uint32_t **last_position);
+                            grub_uint32_t **last_position);
 void grub_print_ucs4 (const grub_uint32_t * str,
-                       const grub_uint32_t * last_position);
+                     const grub_uint32_t * last_position);
 grub_ssize_t grub_getstringwidth (grub_uint32_t * str,
-                       const grub_uint32_t * last_position);
+                                 const grub_uint32_t * last_position);
+void grub_print_message_indented (const char *msg, int margin_left,
+                                 int margin_right);
 
 /* Defined in `handler.c'.  */
 void read_handler_list (void);

diff --git a/normal/auth.c b/normal/auth.c
index c712625843324e342a6d289081c97fe1f14ba8f6..54107fe0108e59aa8a9c64c6e652d1dc98a077cb 100644 (file)
--- a/normal/auth.c
+++ b/normal/auth.c
@@ -23,6 +23,7 @@
 #include <grub/env.h>
 #include <grub/normal.h>
 #include <grub/time.h>
+#include <grub/i18n.h>
 
 struct grub_auth_user
 {
@@ -237,7 +238,7 @@ grub_auth_check_authentication (const char *userlist)
       return GRUB_ERR_NONE;
     }
 
-  if (!grub_cmdline_get ("Enter username: ", login, sizeof (login) - 1,
+  if (!grub_cmdline_get (N_("Enter username:"), login, sizeof (login) - 1,
                         0, 0, 0))
     goto access_denied;
 

diff --git a/normal/cmdline.c b/normal/cmdline.c
index 7a5b6ec84607246c5aeacfbf01bd4853675a0266..6d74e6e6930d140e1ba16fa68fa2e51d5e5e9e63 100644 (file)
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2009  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 #include <grub/disk.h>
 #include <grub/file.h>
 #include <grub/env.h>
+#include <grub/i18n.h>
 
 static char *kill_buf;
 
@@ -193,6 +194,7 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
   auto void cl_delete (unsigned len);
   auto void cl_print (int pos, int c);
   auto void cl_set_pos (void);
+  const char *prompt_translated = _(prompt);
 
   void cl_set_pos (void)
     {
@@ -266,14 +268,14 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
       grub_refresh ();
     }
 
-  plen = grub_strlen (prompt);
+  plen = grub_strlen (prompt_translated);
   lpos = llen = 0;
   buf[0] = '\0';
 
   if ((grub_getxy () >> 8) != 0)
     grub_putchar ('\n');
 
-  grub_printf ("%s", prompt);
+  grub_printf ("%s", prompt_translated);
 
   xpos = plen;
   ystart = ypos = (grub_getxy () & 0xFF);
@@ -334,7 +336,7 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
                if (restore)
                  {
                    /* Restore the prompt.  */
-                   grub_printf ("\n%s%s", prompt, buf);
+                   grub_printf ("\n%s %s", prompt_translated, buf);
                    xpos = plen;
                    ystart = ypos = (grub_getxy () & 0xFF);
                  }

diff --git a/normal/color.c b/normal/color.c
index 340e43a0281590a05215380514e959a484647aa4..0b9868d3bbd1d748d951ce9a5e99ceac79d8970d 100644 (file)
--- a/normal/color.c
+++ b/normal/color.c
@@ -20,6 +20,7 @@
 #include <grub/mm.h>
 #include <grub/normal.h>
 #include <grub/term.h>
+#include <grub/i18n.h>
 
 /* Borrowed from GRUB Legacy */
 static char *color_list[16] =
@@ -76,7 +77,7 @@ grub_parse_color_name_pair (grub_uint8_t *ret, const char *name)
   bg_name = grub_strchr (fg_name, '/');
   if (bg_name == NULL)
     {
-      grub_printf ("Warning: syntax error (missing slash) in `%s'\n", fg_name);
+      grub_printf_ (N_("Warning: syntax error (missing slash) in `%s'\n"), fg_name);
       grub_wait_after_message ();
       goto free_and_return;
     }
@@ -85,13 +86,13 @@ grub_parse_color_name_pair (grub_uint8_t *ret, const char *name)
 
   if (parse_color_name (&fg, fg_name) == -1)
     {
-      grub_printf ("Warning: invalid foreground color `%s'\n", fg_name);
+      grub_printf_ (N_("Warning: invalid foreground color `%s'\n"), fg_name);
       grub_wait_after_message ();
       goto free_and_return;
     }
   if (parse_color_name (&bg, bg_name) == -1)
     {
-      grub_printf ("Warning: invalid background color `%s'\n", bg_name);
+      grub_printf_ (N_("Warning: invalid background color `%s'\n"), bg_name);
       grub_wait_after_message ();
       goto free_and_return;
     }

diff --git a/normal/main.c b/normal/main.c
index 6a238a08275d33d65ff422cd901e239120821a4e..267ae04abc6653d6cabbcec81a5191c07711edb1 100644 (file)
--- a/normal/main.c
+++ b/normal/main.c
@@ -522,12 +522,21 @@ grub_normal_reader_init (void)
   grub_normal_init_page ();
   grub_setcursor (1);
 
-  grub_printf_ (N_("\
- [ Minimal BASH-like line editing is supported. For the first word, TAB\n\
-   lists possible command completions. Anywhere else TAB lists possible\n\
-   device/file completions.%s ]\n\n"),
-              reader_nested ? " ESC at any time exits." : "");
+  const char *msg = _("Minimal BASH-like line editing is supported. For "
+                     "the first word, TAB lists possible command completions. Anywhere "
+                     "else TAB lists possible device or file completions. %s");
 
+  const char *msg_esc = _("ESC at any time exits.");
+
+  char *msg_formatted = grub_malloc (sizeof (char) * (grub_strlen (msg) + 
+                grub_strlen(msg_esc) + 1));
+
+  grub_sprintf (msg_formatted, msg, reader_nested ? msg_esc : "");
+  grub_print_message_indented (msg_formatted, STANDARD_MARGIN, STANDARD_MARGIN);
+  grub_puts ("\n");
+
+  grub_free (msg_formatted);
+  
   return 0;
 }
 

diff --git a/normal/menu_text.c b/normal/menu_text.c
index f1ac76d358b3ea9c5fcce6a9344fd8b335980aeb..45cf95500865ef7f3c074cd287759e1a2a6c838e 100644 (file)
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -31,8 +31,6 @@
    entry failing to boot.  */
 #define DEFAULT_ENTRY_ERROR_DELAY_MS  2500
 
-#define STANDARD_MARGIN 6
-
 static grub_uint8_t grub_color_menu_normal;
 static grub_uint8_t grub_color_menu_highlight;
 
@@ -106,8 +104,8 @@ grub_getstringwidth (grub_uint32_t * str, const grub_uint32_t * last_position)
   return width;
 }
 
-static void
-print_message_indented (const char *msg, int margin_left, int margin_right)
+void
+grub_print_message_indented (const char *msg, int margin_left, int margin_right)
 {
   int line_len;
   line_len = GRUB_TERM_WIDTH - grub_getcharwidth ('m') *
@@ -206,7 +204,7 @@ print_message (int nested, int edit)
   if (edit)
     {
       grub_putchar ('\n');
-      print_message_indented (_("Minimum Emacs-like screen editing is \
+      grub_print_message_indented (_("Minimum Emacs-like screen editing is \
 supported. TAB lists completions. Press Ctrl-x to boot, Ctrl-c for a \
 command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN);
     }
@@ -220,11 +218,11 @@ entry is highlighted.\n");
       grub_sprintf (msg_translated, msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
                    (grub_uint32_t) GRUB_TERM_DISP_DOWN);
       grub_putchar ('\n');
-      print_message_indented (msg_translated, STANDARD_MARGIN, STANDARD_MARGIN);
+      grub_print_message_indented (msg_translated, STANDARD_MARGIN, STANDARD_MARGIN);
 
       grub_free (msg_translated);
 
-      print_message_indented (_("Press enter to boot the selected OS, \
+      grub_print_message_indented (_("Press enter to boot the selected OS, \
 \'e\' to edit the commands before booting or \'c\' for a command-line.\n"), STANDARD_MARGIN, STANDARD_MARGIN);
 
       if (nested)
@@ -403,7 +401,7 @@ print_timeout (int timeout, int offset)
     grub_malloc (sizeof (char) * grub_strlen (msg) + 5);
 
   grub_sprintf (msg_translated, msg, timeout);
-  print_message_indented (msg_translated, 3, 0);
+  grub_print_message_indented (msg_translated, 3, 0);
   
   int posx;
   posx = grub_getxy() >> 8;

diff --git a/normal/misc.c b/normal/misc.c
index 0a1a2f052de3b03cf13bdc533be211b39425ce95..18e20d2fc2fa7ac399635ef736ce29a967f25257 100644 (file)
--- a/normal/misc.c
+++ b/normal/misc.c
@@ -1,7 +1,7 @@
 /* misc.c - miscellaneous functions */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2007,2008,2009  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/datetime.h>
+#include <grub/term.h>
+#include <grub/i18n.h>
 
 /* Print the information on the device NAME.  */
 grub_err_t
@@ -34,13 +36,20 @@ grub_normal_print_device_info (const char *name)
 
   p = grub_strchr (name, ',');
   if (p)
-    grub_printf ("\tPartition %s: ", name);
+    {
+      grub_putchar ('\t');
+      grub_printf_ (N_("Partition %s:"), name);
+      grub_putchar (' ');
+    }
   else
-    grub_printf ("Device %s: ", name);
+    {
+      grub_printf_ (N_("Device %s:"), name);
+      grub_putchar (' ');
+    }
 
   dev = grub_device_open (name);
   if (! dev)
-    grub_printf ("Filesystem cannot be accessed");
+    grub_printf ("%s", _("Filesystem cannot be accessed"));
   else if (dev->disk)
     {
       grub_fs_t fs;
@@ -51,7 +60,7 @@ grub_normal_print_device_info (const char *name)
 
       if (fs)
        {
-         grub_printf ("Filesystem type %s", fs->name);
+         grub_printf_ (N_("Filesystem type %s"), fs->name);
          if (fs->label)
            {
              char *label;
@@ -59,7 +68,7 @@ grub_normal_print_device_info (const char *name)
              if (grub_errno == GRUB_ERR_NONE)
                {
                  if (label && grub_strlen (label))
-                   grub_printf (", Label %s", label);
+                   grub_printf_ (N_("- Label %s"), label);
                  grub_free (label);
                }
              grub_errno = GRUB_ERR_NONE;
@@ -72,8 +81,8 @@ grub_normal_print_device_info (const char *name)
              if (grub_errno == GRUB_ERR_NONE)
                {
                  grub_unixtime2datetime (tm, &datetime);
-                 grub_printf (", Last modification time %d-%02d-%02d "
-                              "%02d:%02d:%02d %s",
+                 grub_printf_ (N_("- Last modification time %d-%02d-%02d "
+                              "%02d:%02d:%02d %s"),
                               datetime.year, datetime.month, datetime.day,
                               datetime.hour, datetime.minute, datetime.second,
                               grub_get_weekday_name (&datetime));
@@ -95,13 +104,13 @@ grub_normal_print_device_info (const char *name)
            }
        }
       else if (! dev->disk->has_partitions || dev->disk->partition)
-       grub_printf ("Unknown filesystem");
+       grub_printf ("%s", _("Unknown filesystem"));
       else
-       grub_printf ("Partition table");
+       grub_printf ("%s", _("Partition table"));
 
       grub_device_close (dev);
     }
 
-  grub_printf ("\n");
+  grub_putchar ('\n');
   return grub_errno;
 }

diff --git a/po/POTFILES b/po/POTFILES
index a7969a15c0e590f202908543ad5589d9d9895814..7b92af44419bfdc9e283f79ccc44cf69a5de0b2a 100644 (file)
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -11,6 +11,9 @@ util/mkisofs/rock.c
 util/mkisofs/tree.c
 util/mkisofs/write.c
 
+normal/auth.c
+normal/color.c
 normal/main.c
 normal/menu_entry.c
 normal/menu_text.c
+normal/misc.c