X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=d3529d1ba011e2200df64247beb022fe9f8fe139;hb=0303df2c1d860cb0384b1d1c30729561ac2f2117;hp=432a92a7e2f2205d35aa39d2327c2802d30da4a6;hpb=4051815230f443ac4b052a4cf0f55a951e3f88c8;p=petitboot

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 432a92a..d3529d1 100644
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -22,9 +22,11 @@
 
 #include <assert.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
+#include "i18n/i18n.h"
 #include "nc-boot-editor.h"
 #include "nc-widgets.h"
 
@@ -72,7 +74,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)
 {
@@ -220,8 +222,8 @@ static void boot_editor_process_key(struct nc_scr *scr, int key)
 		break;
 	case STATE_HELP:
 		boot_editor->state = STATE_EDIT;
-		cui_show_help(boot_editor->cui, "Boot Option Editor",
-				boot_editor_help_text);
+		cui_show_help(boot_editor->cui, _("Boot Option Editor"),
+				&boot_editor_help_text);
 		break;
 	default:
 		break;
@@ -304,7 +306,7 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor)
 	y++;
 	widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
 	widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19);
-	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29);
+	widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 32);
 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
@@ -365,7 +367,7 @@ static void boot_editor_populate_device_select(struct boot_editor *boot_editor,
 	 * changed. */
 	selected = !boot_editor->selected_device;
 
-	widget_select_add_option(select, -1, "Specify paths/URLs manually",
+	widget_select_add_option(select, -1, _("Specify paths/URLs manually"),
 			selected);
 }
 
@@ -445,7 +447,8 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 	widgetset_set_widget_focus(boot_editor->widgetset,
 			boot_editor_widget_focus, boot_editor);
 
-	boot_editor->widgets.device_l = widget_new_label(set, 0, 0, "Device:");
+	boot_editor->widgets.device_l = widget_new_label(set, 0, 0,
+			_("Device:"));
 	boot_editor->widgets.device_f = widget_new_select(set, 0, 0,
 						field_size);
 	widget_select_on_change(boot_editor->widgets.device_f,
@@ -454,32 +457,32 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 	boot_editor_populate_device_select(boot_editor, sysinfo);
 
 	boot_editor->widgets.image_l = widget_new_label(set, 0, 0,
-			"Kernel:");
+			_("Kernel:"));
 	boot_editor->widgets.image_f = widget_new_textbox(set, 0, 0,
 						field_size, boot_editor->image);
 
 	boot_editor->widgets.initrd_l = widget_new_label(set, 0, 0,
-			"Initrd:");
+			_("Initrd:"));
 	boot_editor->widgets.initrd_f = widget_new_textbox(set, 0, 0,
 						field_size,
 						boot_editor->initrd);
 
 	boot_editor->widgets.dtb_l = widget_new_label(set, 0, 0,
-			"Device tree:");
+			_("Device tree:"));
 	boot_editor->widgets.dtb_f = widget_new_textbox(set, 0, 0,
 						field_size, boot_editor->dtb);
 
 	boot_editor->widgets.args_l = widget_new_label(set, 0, 0,
-			"Boot arguments:");
+			_("Boot arguments:"));
 	boot_editor->widgets.args_f = widget_new_textbox(set, 0, 0,
 					field_size, boot_editor->args);
 
 	boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 6,
-					"OK", ok_click, boot_editor);
-	boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 6,
-					"Help", help_click, boot_editor);
-	boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 6,
-					"Cancel", cancel_click, boot_editor);
+					_("OK"), ok_click, boot_editor);
+	boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 9,
+					_("Help"), help_click, boot_editor);
+	boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 9,
+					_("Cancel"), cancel_click, boot_editor);
 }
 
 void boot_editor_update(struct boot_editor *boot_editor,
@@ -507,6 +510,36 @@ void boot_editor_update(struct boot_editor *boot_editor,
 	pad_refresh(boot_editor);
 }
 
+/* Return the number of columns required to display a localised string */
+static int strncols(const char *str)
+{
+	int i, wlen, ncols = 0;
+	wchar_t *wstr;
+
+	wlen = mbstowcs(NULL, str, 0);
+	if (wlen <= 0)
+		return wlen;
+
+	wstr = malloc(sizeof(wchar_t) * wlen + 1);
+	if (!wstr)
+		return -1;
+
+	wlen = mbstowcs(wstr, str, wlen);
+	if (wlen <= 0) {
+		free(wstr);
+		return wlen;
+	}
+
+	/* Processing each character individually lets us use the same
+	 * check for all languages */
+	for (i = 0; i < wlen; i++) {
+		ncols += wcwidth(wstr[i]);
+	}
+
+	free(wstr);
+	return ncols;
+}
+
 struct boot_editor *boot_editor_init(struct cui *cui,
 		struct pmenu_item *item,
 		const struct system_info *sysinfo,
@@ -527,18 +560,21 @@ struct boot_editor *boot_editor_init(struct cui *cui,
 	boot_editor->on_exit = on_exit;
 	boot_editor->state = STATE_EDIT;
 
+	int ncols1 = strncols(_("Device tree:"));
+	int ncols2 = strncols(_("Boot arguments:"));
+
 	boot_editor->label_x = 1;
-	boot_editor->field_x = 17;
+	boot_editor->field_x = 2 + max(ncols1, ncols2);
 
 	nc_scr_init(&boot_editor->scr, pb_boot_editor_sig, 0,
 			cui, boot_editor_process_key,
 		boot_editor_post, boot_editor_unpost, boot_editor_resize);
 
 	boot_editor->scr.frame.ltitle = talloc_strdup(boot_editor,
-			"Petitboot Option Editor");
+			_("Petitboot Option Editor"));
 	boot_editor->scr.frame.rtitle = NULL;
 	boot_editor->scr.frame.help = talloc_strdup(boot_editor,
-			"Enter=accept");
+			_("tab=next, shift+tab=previous, x=exit, h=help"));
 	nc_scr_frame_draw(&boot_editor->scr);
 
 	if (item) {