From 6cd660435ec32266db31e2fe65fbc3997379cbd2 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 3 Nov 2013 05:42:02 +0100 Subject: [PATCH] * grub-core/gettext/gettext.c (grub_gettext_init_ext): Ignore errors if language is English. --- ChangeLog | 5 +++++ grub-core/gettext/gettext.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 27bf885d2..e02005b3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-03 Vladimir Serbinenko + + * grub-core/gettext/gettext.c (grub_gettext_init_ext): Ignore errors + if language is English. + 2013-11-03 Vladimir Serbinenko * 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 259251d76..df7357002 100644 --- 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; }