X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-lang.c;h=a7c9ccc53bb53f24b755a2d2c3109752dc4da05e;hp=5e927072c42d57bbb71e4909e6b2582e70277fc9;hb=646d77d8156ad72da1c24f734a029a525ba4bed9;hpb=b793eb6e80e002208ef0c5d149f786c44e3c86a0

diff --git a/ui/ncurses/nc-lang.c b/ui/ncurses/nc-lang.c
index 5e92707..a7c9ccc 100644
--- a/ui/ncurses/nc-lang.c
+++ b/ui/ncurses/nc-lang.c
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <locale.h>
 
 #include <talloc/talloc.h>
 #include <types/types.h>
@@ -38,7 +39,17 @@ static struct lang {
 	const char	*name;
 	const wchar_t	*label;
 } languages[] = {
+	{ "de_DE.utf8",	L"Deutsch"},
 	{ "en_US.utf8",	L"English"},
+	{ "es_ES.utf8",	L"Espa\u00f1ol"},
+	{ "fr_FR.utf8",	L"Fran\u00e7ais"},
+	{ "it_IT.utf8",	L"Italiano"},
+	{ "ja_JP.utf8",	L"\u65e5\u672c\u8a9e"},
+	{ "ko_KR.utf8",	L"\ud55c\uad6d\uc5b4"},
+	{ "pt_BR.utf8",	L"Portugu\u00eas/Brasil"},
+	{ "ru_RU.utf8",	L"\u0420\u0443\u0441\u0441\u043a\u0438\u0439"},
+	{ "zh_CN.utf8",	L"\u7b80\u4f53\u4e2d\u6587"},
+	{ "zh_TW.utf8",	L"\u7e41\u9ad4\u4e2d\u6587"},
 };
 
 struct lang_screen {
@@ -121,7 +132,6 @@ static int lang_screen_post(struct nc_scr *scr)
 	struct lang_screen *screen = lang_screen_from_scr(scr);
 	widgetset_post(screen->widgetset);
 	nc_scr_frame_draw(scr);
-	redrawwin(scr->main_ncw);
 	wrefresh(screen->scr.main_ncw);
 	pad_refresh(screen);
 	return 0;
@@ -220,7 +230,7 @@ static void lang_screen_layout_widgets(struct lang_screen *screen)
 	widget_move(widget_button_base(screen->widgets.ok_b),
 			y, screen->field_x);
 	widget_move(widget_button_base(screen->widgets.cancel_b),
-			y, screen->field_x + 10);
+			y, screen->field_x + 14);
 }
 
 static void lang_screen_setup_empty(struct lang_screen *screen)
@@ -228,7 +238,7 @@ static void lang_screen_setup_empty(struct lang_screen *screen)
 	widget_new_label(screen->widgetset, 2, screen->field_x,
 			_("Waiting for configuration data..."));
 	screen->widgets.cancel_b = widget_new_button(screen->widgetset,
-			4, screen->field_x, 6, _("Cancel"),
+			4, screen->field_x, 9, _("Cancel"),
 			cancel_click, screen);
 }
 
@@ -256,8 +266,14 @@ static void lang_screen_setup_widgets(struct lang_screen *screen,
 
 		len = wcstombs(NULL, lang->label, 0);
 		assert(len >= 0);
-		label = talloc_array(screen, char, len + 1);
-		wcstombs(label, lang->label, len + 1);
+		if (len < 0) {
+			label = talloc_asprintf(screen,
+				"Unable to display text in this locale (%s)\n",
+				setlocale(LC_ALL, NULL));
+		} else {
+			label = talloc_array(screen, char, len + 1);
+			wcstombs(label, lang->label, len + 1);
+		}
 
 		selected = config->lang && !strcmp(lang->name, config->lang);
 		found |= selected;
@@ -277,9 +293,9 @@ static void lang_screen_setup_widgets(struct lang_screen *screen,
 		screen->widgets.safe_mode = widget_new_label(set, 0, 0,
 			 _("Selecting 'OK' will exit safe mode"));
 
-	screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
+	screen->widgets.ok_b = widget_new_button(set, 0, 0, 10, _("OK"),
 			ok_click, screen);
-	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 6, _("Cancel"),
+	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 10, _("Cancel"),
 			cancel_click, screen);
 }
 
@@ -375,7 +391,7 @@ struct lang_screen *lang_screen_init(struct cui *cui,
 			_("Petitboot Language Selection"));
 	screen->scr.frame.rtitle = NULL;
 	screen->scr.frame.help = talloc_strdup(screen,
-			_("tab=next, shift+tab=previous, x=exit, h=help"));
+			_("tab=next, shift+tab=previous, x=exit"));
 	nc_scr_frame_draw(&screen->scr);
 
 	scrollok(screen->scr.sub_ncw, true);