From ba2f6848e06aa654bf8d6df02d5737aca73035b9 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Thu, 14 Jan 2010 22:31:06 +0000
Subject: [PATCH] 2010-01-14  Carles Pina i Estany  <carles@pina.cat>

	* gettext/gettext.c (grub_gettext_translate): Push and pop
	grub_errno.
	(grub_gettext_delete_list): Change comment style.
	* kern/err.c (grub_error): Gettextizze.
	(grub_fatal): Gettextizze.
---
 ChangeLog         |  8 ++++++++
 gettext/gettext.c | 17 ++++++++++++++---
 kern/err.c        |  4 ++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 652cc145a..17083d1b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-14  Carles Pina i Estany  <carles@pina.cat>
+
+	* gettext/gettext.c (grub_gettext_translate): Push and pop
+	grub_errno.
+	(grub_gettext_delete_list): Change comment style.
+	* kern/err.c (grub_error): Gettextizze.
+	(grub_fatal): Gettextizze.
+
 2010-01-14  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/i386/loader.h (grub_linux16_boot): Renamed to ...
diff --git a/gettext/gettext.c b/gettext/gettext.c
index 6fa6271f2..83497b7f6 100644
--- a/gettext/gettext.c
+++ b/gettext/gettext.c
@@ -148,14 +148,24 @@ grub_gettext_translate (const char *orig)
 
   struct grub_gettext_msg *cur;
 
+  /* Make sure we can use grub_gettext_translate for error messages.  Push
+     active error message to error stack and reset error message.  */
+  grub_error_push ();
+
   cur = grub_named_list_find (GRUB_AS_NAMED_LIST (grub_gettext_msg_list),
 			      orig);
 
   if (cur)
-    return cur->translated;
+    {
+      grub_error_pop ();
+      return cur->translated;
+    }
 
   if (fd_mo == 0)
-    return orig;
+    {
+      grub_error_pop ();
+      return orig;
+    }
 
   min = 0;
   max = grub_gettext_max;
@@ -205,6 +215,7 @@ grub_gettext_translate (const char *orig)
 	grub_errno = GRUB_ERR_NONE;
     }
 
+  grub_error_pop ();
   return ret;
 }
 
@@ -308,7 +319,7 @@ grub_gettext_delete_list (void)
       char *original = (char *) ((struct grub_gettext_msg *) item)->name;
       grub_free (original);
 
-      // Don't delete the translated message because could be in use.
+      /* Don't delete the translated message because could be in use.  */
     }
 }
 
diff --git a/kern/err.c b/kern/err.c
index 02d7d879f..1a881db25 100644
--- a/kern/err.c
+++ b/kern/err.c
@@ -45,7 +45,7 @@ grub_error (grub_err_t n, const char *fmt, ...)
   grub_errno = n;
 
   va_start (ap, fmt);
-  grub_vsprintf (grub_errmsg, fmt, ap);
+  grub_vsprintf (grub_errmsg, _(fmt), ap);
   va_end (ap);
 
   return n;
@@ -57,7 +57,7 @@ grub_fatal (const char *fmt, ...)
   va_list ap;
 
   va_start (ap, fmt);
-  grub_vprintf (fmt, ap);
+  grub_vprintf (_(fmt), ap);
   va_end (ap);
 
   grub_abort ();