* grub-core/normal/cmdline.c (grub_cmdline_get): Don't gettext prompt.

	* grub-core/normal/main.c (grub_normal_read_line_real): Gettext
	prompt here.

diff --git a/ChangeLog b/ChangeLog
index 7fbc46937fbb2976fc204254b591f29b9e60d0df..ba084d9fa503c8cbe307649140b2b76e8e7dcc7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/normal/cmdline.c (grub_cmdline_get): Don't gettext prompt.
+       * grub-core/normal/main.c (grub_normal_read_line_real): Gettext
+       prompt here.
+
 2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/zfs/zfs.c (zfs_fetch_nvlist): Mark unknown member here

diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
index ea06b4cc7db90f266774fd2592c106e28e089fb2..18314cdc0710b4b4a4b42d2cc8e55ad2309ab551 100644 (file)
--- a/grub-core/normal/cmdline.c
+++ b/grub-core/normal/cmdline.c
@@ -211,7 +211,7 @@ struct cmdline_term
    otherwise return command line.  */
 /* FIXME: The dumb interface is not supported yet.  */
 char *
-grub_cmdline_get (const char *prompt)
+grub_cmdline_get (const char *prompt_translated)
 {
   grub_size_t lpos, llen;
   grub_size_t plen;
@@ -228,7 +228,6 @@ grub_cmdline_get (const char *prompt)
   auto void cl_set_pos_all (void);
   auto void init_clterm (struct cmdline_term *cl_term_cur);
   auto void init_clterm_all (void);
-  const char *prompt_translated = _(prompt);
   struct cmdline_term *cl_terms;
   char *ret;
   unsigned nterms;

diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 032b1dbec327147ce595614dac881d242a87ef1f..707917013dc1f4206444145443e0571517dcf7b3 100644 (file)
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -385,9 +385,11 @@ grub_normal_read_line_real (char **line, int cont, int nested)
   const char *prompt;
 
   if (cont)
-    prompt = ">";
+    /* TRANSLATORS: it's command line prompt.  */
+    prompt = _(">");
   else
-    prompt = "grub>";
+    /* TRANSLATORS: it's command line prompt.  */
+    prompt = _("grub>");
 
   if (!prompt)
     return grub_errno;
@@ -396,7 +398,7 @@ grub_normal_read_line_real (char **line, int cont, int nested)
     {
       *line = grub_cmdline_get (prompt);
       if (*line)
-       break;
+       return 0;
 
       if (cont || nested)
        {
@@ -405,8 +407,7 @@ grub_normal_read_line_real (char **line, int cont, int nested)
          return grub_errno;
        }
     }
-  
-  return 0;
+ 
 }
 
 static grub_err_t