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, 12 insertions, 1 deletions

diff --git a/ui/ncurses/nc-helpscreen.h b/ui/ncurses/nc-helpscreen.h
index f104411..99b99f7 100644
--- a/ui/ncurses/nc-helpscreen.h
+++ b/ui/ncurses/nc-helpscreen.h
@@ -19,13 +19,24 @@
 #define _NC_HELPSCREEN_H
 
 struct help_screen;
+struct cui;
+
+/* Container struct for type-safety; we need to use gettext() before
+ * displaying the untranslated string. */
+struct help_text {
+	const char *text;
+};
+
+#define define_help_text(s) { .text = s }
 
 struct nc_scr *help_screen_scr(struct help_screen *screen);
 struct nc_scr *help_screen_return_scr(struct help_screen *screen);
 
 struct help_screen *help_screen_init(struct cui *cui,
 		struct nc_scr *current_scr,
-		const char *title_suffix, const char *text,
+		const char *title_suffix,
+		const struct help_text *text,
 		void (*on_exit)(struct cui *));
 
+
 #endif /* defined _NC_HELPSCREEN_H */