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-boot-editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/ncurses/nc-boot-editor.c') diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c index 6bc1d89..6da3630 100644 --- a/ui/ncurses/nc-boot-editor.c +++ b/ui/ncurses/nc-boot-editor.c @@ -73,7 +73,7 @@ struct boot_editor { char *args; }; -extern const char *boot_editor_help_text; +extern const struct help_text boot_editor_help_text; static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr) { @@ -222,7 +222,7 @@ static void boot_editor_process_key(struct nc_scr *scr, int key) case STATE_HELP: boot_editor->state = STATE_EDIT; cui_show_help(boot_editor->cui, _("Boot Option Editor"), - boot_editor_help_text); + &boot_editor_help_text); break; default: break; -- cgit v1.1