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>

1 files changed, 10 insertions, 10 deletions

diff --git a/ui/ncurses/nc-textscreen.h b/ui/ncurses/nc-textscreen.h
index 72b8c8a..25107cb 100644
--- a/ui/ncurses/nc-textscreen.h
+++ b/ui/ncurses/nc-textscreen.h
@@ -22,15 +22,15 @@
 #include "nc-cui.h"
 
 struct text_screen {
-	struct nc_scr	scr;
-	struct cui	*cui;
-	const char	**lines;
-	int		n_lines;
-	int		n_alloc_lines;
-	int		scroll_y;
-	const char	*help_title;
-	const char	*help_text;
-	void		(*on_exit)(struct cui *);
+	struct nc_scr		scr;
+	struct cui		*cui;
+	const char		**lines;
+	int			n_lines;
+	int			n_alloc_lines;
+	int			scroll_y;
+	const char		*help_title;
+	const struct help_text	*help_text;
+	void			(*on_exit)(struct cui *);
 };
 
 void text_screen_init(struct text_screen *screen, struct cui *cui,
@@ -45,7 +45,7 @@ void text_screen_append_line(struct text_screen *screen,
 		const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 void text_screen_set_text(struct text_screen *screen, const char *text);
 void text_screen_set_help(struct text_screen *screen, const char *title,
-		const char *text);
+		const struct help_text *text);
 
 /* interaction */
 void text_screen_process_key(struct nc_scr *scr, int key);