vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* grub-core/normal/main.c (grub_normal_read_line_real): Gettext
	prompt here.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-12 19:24:23 +01:00
parent b4ba8e025b
commit a9e9dc7c5e
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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

3
grub-core/normal/cmdline.c
View file

@ -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;

11
grub-core/normal/main.c
View file

@ -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