* grub-core/gettext/gettext.c (GRUB_MOD_INIT): Handle errors.

diff --git a/ChangeLog b/ChangeLog
index 85a6f74dfccf9a011016c7f327ef686999468adf..872fe61ae78102663ae6d4b1344623c30a0c32f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/gettext/gettext.c (GRUB_MOD_INIT): Handle errors.
+
 2012-03-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/getroot.c (grub_make_system_path_relative_to_its_root): Fix

diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
index 27a47ce56d936e8397af26cc7d2166bdd63ae2cb..b7ad956dc24671d6c8b6adde045af4fb32580ed5 100644 (file)
--- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c
@@ -451,13 +451,18 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
 GRUB_MOD_INIT (gettext)
 {
   const char *lang;
+  grub_err_t err;
 
   lang = grub_env_get ("lang");
 
-  grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"),
-                        grub_env_get ("prefix"));
-  grub_gettext_init_ext (&secondary_context, lang,
-                        grub_env_get ("secondary_locale_dir"), 0);
+  err = grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"),
+                              grub_env_get ("prefix"));
+  if (err)
+    grub_print_error ();
+  err = grub_gettext_init_ext (&secondary_context, lang,
+                              grub_env_get ("secondary_locale_dir"), 0);
+  if (err)
+    grub_print_error ();
 
   grub_register_variable_hook ("locale_dir", NULL, read_main);
   grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);