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

	* include/grub/misc.h (grub_printf_): New declaration.
	* kern/misc.c (grub_printf_): New definition.
	* normal/main.c (grub_normal_reader_init): Use `grub_printf_' and `N_'
	instead of `grub_printf' and `_'.
	* normal/menu_entry.c (store_completion): Likewise.
	(run): Likewise.
	(grub_menu_entry_run): Likewise.
	* normal/menu_text.c (grub_wait_after_message): Likewise.
	(notify_booting): Likewise.
	(notify_fallback): Likewise.
	(notify_execution_failure): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5acbe49453fe4689c2b1361efe28129e1dbb2104..dc475c96cf165d25315aab8aee700a07d03b6e68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-08  Carles Pina i Estany  <carles@pina.cat>
+
+       * include/grub/misc.h (grub_printf_): New declaration.
+       * kern/misc.c (grub_printf_): New definition.
+       * normal/main.c (grub_normal_reader_init): Use `grub_printf_' and `N_'
+       instead of `grub_printf' and `_'.
+       * normal/menu_entry.c (store_completion): Likewise.
+       (run): Likewise.
+       (grub_menu_entry_run): Likewise.
+       * normal/menu_text.c (grub_wait_after_message): Likewise.
+       (notify_booting): Likewise.
+       (notify_fallback): Likewise.
+       (notify_execution_failure): Likewise.
+
 2009-12-07  Colin Watson  <cjwatson@ubuntu.com>
 
        * configure.ac: Check for vasprintf.

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 79dafa831cb7c3d1c549fedd3c437b39b00e22fb..1ab63ac0b1d59629bf4f684949feaf4124c24733 100644 (file)
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -171,6 +171,7 @@ char *EXPORT_FUNC(grub_strndup) (const char *s, grub_size_t n);
 void *EXPORT_FUNC(grub_memset) (void *s, int c, grub_size_t n);
 grub_size_t EXPORT_FUNC(grub_strlen) (const char *s);
 int EXPORT_FUNC(grub_printf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+int EXPORT_FUNC(grub_printf_) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 void EXPORT_FUNC(grub_real_dprintf) (const char *file,
                                      const int line,
                                      const char *condition,

diff --git a/kern/misc.c b/kern/misc.c
index 9f9a3ae652087741d0cae752e54549f1fbf15f7a..4415b8204b55b2af72a17c0ab9532392b8b45a2b 100644 (file)
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -126,6 +126,19 @@ grub_printf (const char *fmt, ...)
   return ret;
 }
 
+int
+grub_printf_ (const char *fmt, ...)
+{
+  va_list ap;
+  int ret;
+
+  va_start (ap, fmt);
+  ret = grub_vprintf (_(fmt), ap);
+  va_end (ap);
+
+  return ret;
+}
+
 #if defined (APPLE_CC) && ! defined (GRUB_UTIL)
 int
 grub_err_printf (const char *fmt, ...)

diff --git a/normal/main.c b/normal/main.c
index dcc91c6492a9fea253834f98c6905451d401f795..f080a69713e8dfada5f65cb1dea5536d8415eb20 100644 (file)
--- a/normal/main.c
+++ b/normal/main.c
@@ -509,7 +509,7 @@ grub_normal_reader_init (void)
   grub_normal_init_page ();
   grub_setcursor (1);
 
-  grub_printf (_("\
+  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"),

diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 18d4719dc30a15d4fafb09fd9035a1b4f6475064..7a31c27af13790de0f321067e857f0ca70ae06c1 100644 (file)
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -837,7 +837,7 @@ store_completion (const char *item, grub_completion_type_t type, int count)
 
       grub_gotoxy (0, GRUB_TERM_HEIGHT - 3);
       grub_printf ("   ");
-      grub_printf (_("Possible %s are:"), what);
+      grub_printf_ (N_("Possible %s are:"), what);
       grub_printf ("\n    ");
     }
 
@@ -1000,7 +1000,7 @@ run (struct screen *screen)
 
   grub_cls ();
   grub_printf ("  ");
-  grub_printf (_("Booting a command list"));
+  grub_printf_ (N_("Booting a command list"));
   grub_printf ("\n\n");
 
 
@@ -1182,6 +1182,6 @@ grub_menu_entry_run (grub_menu_entry_t entry)
   grub_print_error ();
   grub_errno = GRUB_ERR_NONE;
   grub_putchar ('\n');
-  grub_printf (_("Press any key to continue..."));
+  grub_printf_ (N_("Press any key to continue..."));
   (void) grub_getkey ();
 }

diff --git a/normal/menu_text.c b/normal/menu_text.c
index c40fd637432fcec1a3e938fc472d0beee08d01a8..bb1f52203a88f7718ff45237c14bbf7803e6e7a8 100644 (file)
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -40,7 +40,7 @@ void
 grub_wait_after_message (void)
 {
   grub_putchar ('\n');
-  grub_printf (_("Press any key to continue..."));
+  grub_printf_ (N_("Press any key to continue..."));
   (void) grub_getkey ();
   grub_putchar ('\n');
 }
@@ -206,7 +206,7 @@ entry is highlighted.");
       if (nested)
         {
           grub_printf ("\n        ");
-          grub_printf (_("ESC to return previous menu."));
+          grub_printf_ (N_("ESC to return previous menu."));
         }
     }
 }
@@ -627,7 +627,7 @@ notify_booting (grub_menu_entry_t entry,
                void *userdata __attribute__((unused)))
 {
   grub_printf ("  ");
-  grub_printf (_("Booting \'%s\'"), entry->title);
+  grub_printf_ (N_("Booting \'%s\'"), entry->title);
   grub_printf ("\n\n");
 }
 
@@ -639,7 +639,7 @@ notify_fallback (grub_menu_entry_t entry,
                 void *userdata __attribute__((unused)))
 {
   grub_printf ("\n   ");
-  grub_printf (_("Falling back to \'%s\'"), entry->title);
+  grub_printf_ (N_("Falling back to \'%s\'"), entry->title);
   grub_printf ("\n\n");
   grub_millisleep (DEFAULT_ENTRY_ERROR_DELAY_MS);
 }
@@ -655,7 +655,7 @@ notify_execution_failure (void *userdata __attribute__((unused)))
       grub_errno = GRUB_ERR_NONE;
     }
   grub_printf ("\n  ");
-  grub_printf (_("Failed to boot default entries.\n"));
+  grub_printf_ (N_("Failed to boot default entries.\n"));
   grub_wait_after_message ();
 }