From 4e30f260106ac5f7007e213db1d1e54298393290 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 24 Jun 2014 13:18:03 +0800 Subject: 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 --- ui/ncurses/nc-config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/ncurses/nc-config.c') diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c index 54eb7ac..a095353 100644 --- a/ui/ncurses/nc-config.c +++ b/ui/ncurses/nc-config.c @@ -35,7 +35,7 @@ #define N_FIELDS 25 -extern const char *config_help_text; +extern struct help_text config_help_text; enum autoboot_type { AUTOBOOT_ANY, @@ -146,7 +146,7 @@ static void config_screen_process_key(struct nc_scr *scr, int key) } else if (screen->show_help) { screen->show_help = false; cui_show_help(screen->cui, _("System Configuration"), - config_help_text); + &config_help_text); } else if (handled) { pad_refresh(screen); -- cgit v1.2.1