* grub-core/gettext/gettext.c (grub_gettext_init_ext): Ignore errors

	if language is English.

diff --git a/ChangeLog b/ChangeLog
index 27bf885d270280863a20f517b6086c1fa2b4b0a2..e02005b3fbbdf6fe94ab615c3277759bd0f84f94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/gettext/gettext.c (grub_gettext_init_ext): Ignore errors
+       if language is English.
+
 2013-11-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/osdep/linux/getroot.c: Fix cast-align problems.

diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
index 259251d7631713312b6defaabee310cfb3dbbf4b..df7357002b57adb453d0e7e3f3fba14777644a10 100644 (file)
--- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c
@@ -423,6 +423,10 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx,
 
       grub_free (lang);
     }
+
+  if (locale[0] == 'e' && locale[1] == 'n'
+      && (locale[2] == '\0' || locale[2] == '_'))
+    grub_errno = err = GRUB_ERR_NONE;
   return err;
 }