diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2014-06-24 13:18:03 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2014-07-28 13:20:34 +0800 |
| commit | 4e30f260106ac5f7007e213db1d1e54298393290 (patch) | |
| tree | 1d215a8c2e5895844f486d8b371c731d3b34f83b /ui/ncurses/generic-main.c | |
| parent | 494988c501287e03da3becba5c03cbce7c3d9d20 (diff) | |
| download | talos-petitboot-4e30f260106ac5f7007e213db1d1e54298393290.tar.gz talos-petitboot-4e30f260106ac5f7007e213db1d1e54298393290.zip | |
ui/ncurses: Use a separate type for help text
Because it's initialised statically, help text won't be directly
gettext()-ed. Instead, we need to perform the gettext translation at
runtime, and pass untranslated strings into the help_screen code.
Instead of trusting callers to pass the untranslated strings though, we
encapsulate the help text data into struct help_text, so we know we have
an unstranslated string.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'ui/ncurses/generic-main.c')
| -rw-r--r-- | ui/ncurses/generic-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c index abf3356..f253469 100644 --- a/ui/ncurses/generic-main.c +++ b/ui/ncurses/generic-main.c @@ -40,7 +40,7 @@ #include "ui/common/discover-client.h" #include "nc-cui.h" -extern const char *main_menu_help_text; +extern const struct help_text main_menu_help_text; static void print_version(void) { @@ -234,7 +234,7 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui) } m->help_title = _("main menu"); - m->help_text = main_menu_help_text; + m->help_text = &main_menu_help_text; menu_opts_off(m->ncm, O_SHOWDESC); set_menu_mark(m->ncm, " *"); |
