i18n: Add english translation

[petitboot] / ui / ncurses / nc-cui.c

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 1f163b9ed10f3323a016a28c64bc5d71d96f8c32..761edb39e905ee5d7c5e51601be734759239cafb 100644 (file)
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <locale.h>
 #include <sys/ioctl.h>
 
 #include "log/log.h"
@@ -32,6 +31,7 @@
 #include "talloc/talloc.h"
 #include "waiter/waiter.h"
 #include "process/process.h"
+#include "i18n/i18n.h"
 #include "ui/common/discover-client.h"
 #include "ui/common/ui-system.h"
 #include "nc-cui.h"
@@ -117,7 +117,7 @@ int cui_run_cmd(struct pmenu_item *item)
        struct cui *cui = cui_from_item(item);
        const char **cmd_argv = item->data;
 
-       nc_scr_status_printf(cui->current, "Running %s...", cmd_argv[0]);
+       nc_scr_status_printf(cui->current, _("Running %s..."), cmd_argv[0]);
 
        def_prog_mode();
 
@@ -128,7 +128,8 @@ int cui_run_cmd(struct pmenu_item *item)
 
        if (result) {
                pb_log("%s: failed: '%s'\n", __func__, cmd_argv[0]);
-               nc_scr_status_printf(cui->current, "Failed: %s", cmd_argv[0]);
+               nc_scr_status_printf(cui->current, _("Failed: %s"),
+                               cmd_argv[0]);
        }
 
        return result;
@@ -148,13 +149,13 @@ static int cui_boot(struct pmenu_item *item)
 
        pb_debug("%s: %s\n", __func__, cod->name);
 
-       nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
+       nc_scr_status_printf(cui->current, _("Booting %s..."), cod->name);
 
        result = discover_client_boot(cui->client, NULL, cod->opt, cod->bd);
 
        if (result) {
                nc_scr_status_printf(cui->current,
-                               "Failed: boot %s", cod->bd->image);
+                               _("Failed: boot %s"), cod->bd->image);
        }
 
        return 0;
@@ -181,7 +182,7 @@ static void cui_boot_editor_on_exit(struct cui *cui,
                int insert_pt;
 
                cod = talloc_zero(NULL, struct cui_opt_data);
-               cod->name = talloc_asprintf(cod, "User item %u", ++user_idx);
+               cod->name = talloc_asprintf(cod, _("User item %u"), ++user_idx);
 
                item = pmenu_item_create(menu, cod->name);
                if (!item) {
@@ -269,7 +270,8 @@ static void cui_help_exit(struct cui *cui)
        cui->help_screen = NULL;
 }
 
-void cui_show_help(struct cui *cui, const char *title, const char *text)
+void cui_show_help(struct cui *cui, const char *title,
+               const struct help_text *text)
 {
        if (!cui->current)
                return;
@@ -405,12 +407,14 @@ static void cui_handle_resize(struct cui *cui)
 static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
                void *arg)
 {
+       struct pmenu_item *i, *dev_hdr = NULL;
        struct cui *cui = cui_from_arg(arg);
        struct cui_opt_data *cod;
+       const char *tab = "  ";
        unsigned int insert_pt;
        int result, rows, cols;
-       struct pmenu_item *i;
        ITEM *selected;
+       char *name;
 
        pb_debug("%s: %p %s\n", __func__, opt, opt->id);
 
@@ -420,9 +424,16 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
        if (cui->current == &cui->main->scr)
                nc_scr_unpost(cui->current);
 
-       /* Save the item in opt->ui_info for cui_device_remove() */
+       /* Check if the boot device is new */
+       dev_hdr = pmenu_find_device(cui->main, dev, opt);
+
+       /* All actual boot entries are 'tabbed' across */
+       name = talloc_asprintf(cui->main, "%s%s",
+                       tab, opt->name ? : "Unknown Name");
 
-       opt->ui_info = i = pmenu_item_create(cui->main, opt->name);
+       /* Save the item in opt->ui_info for cui_device_remove() */
+       opt->ui_info = i = pmenu_item_create(cui->main, name);
+       talloc_free(name);
        if (!i)
                return -1;
 
@@ -448,8 +459,16 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
                pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
        /* Insert new items at insert_pt. */
-       insert_pt = pmenu_grow(cui->main, 1);
-       pmenu_item_insert(cui->main, i, insert_pt);
+       if (dev_hdr) {
+               insert_pt = pmenu_grow(cui->main, 2);
+               pmenu_item_insert(cui->main, dev_hdr, insert_pt);
+               pb_log("%s: adding new device hierarchy %s\n",
+                       __func__,opt->device_id);
+               pmenu_item_insert(cui->main, i, insert_pt+1);
+       } else {
+               insert_pt = pmenu_grow(cui->main, 1);
+               pmenu_item_add(cui->main, i, insert_pt);
+       }
 
        pb_log("%s: adding opt '%s'\n", __func__, cod->name);
        pb_log("   image  '%s'\n", cod->bd->image);
@@ -499,8 +518,9 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
 static void cui_device_remove(struct device *dev, void *arg)
 {
        struct cui *cui = cui_from_arg(arg);
-       int result;
        struct boot_option *opt;
+       unsigned int i;
+       int result;
 
        pb_log("%s: %p %s\n", __func__, dev, dev->id);
 
@@ -515,10 +535,21 @@ static void cui_device_remove(struct device *dev, void *arg)
                pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
        list_for_each_entry(&dev->boot_options, opt, list) {
-               struct pmenu_item *i = pmenu_item_from_arg(opt->ui_info);
+               struct pmenu_item *item = pmenu_item_from_arg(opt->ui_info);
+
+               assert(pb_protocol_device_cmp(dev, cod_from_item(item)->dev));
+               pmenu_remove(cui->main, item);
+       }
 
-               assert(pb_protocol_device_cmp(dev, cod_from_item(i)->dev));
-               pmenu_remove(cui->main, i);
+       /* Manually remove remaining device hierarchy item */
+       for (i=0; i < cui->main->item_count; i++) {
+               struct pmenu_item *item = item_userptr(cui->main->items[i]);
+               if (!item || !item->data )
+                       continue;
+
+               struct cui_opt_data *data = item->data;
+               if (data && data->dev && data->dev == dev)
+                       pmenu_remove(cui->main,item);
        }
 
        /* Re-attach the items array. */
@@ -544,7 +575,8 @@ static void cui_update_status(struct boot_status *status, void *arg)
 
        nc_scr_status_printf(cui->current,
                        "%s: %s",
-                       status->type == BOOT_STATUS_ERROR ? "Error" : "Info",
+                       status->type == BOOT_STATUS_ERROR ?
+                               _("Error") : _("Info"),
                        status->message);
 
 }
@@ -595,8 +627,8 @@ static void cui_update_config(struct config *config, void *arg)
 
        if (config->safe_mode)
                nc_scr_status_printf(cui->current,
-                               "SAFE MODE: select '%s' to continue",
-                               "Rescan devices");
+                               _("SAFE MODE: select '%s' to continue"),
+                               _("Rescan devices"));
 }
 
 int cui_send_config(struct cui *cui, struct config *config)
@@ -638,7 +670,7 @@ struct cui *cui_init(void* platform_info,
 
        if (!cui) {
                pb_log("%s: alloc cui failed.\n", __func__);
-               fprintf(stderr, "%s: alloc cui failed.\n", __func__);
+               fprintf(stderr, _("%s: alloc cui failed.\n"), __func__);
                goto fail_alloc;
        }
 
@@ -648,8 +680,6 @@ struct cui *cui_init(void* platform_info,
 
        process_init(cui, cui->waitset, false);
 
-       setlocale(LC_ALL, "");
-
        /* Loop here for scripts that just started the server. */
 
 retry_start:
@@ -673,19 +703,19 @@ retry_start:
                        goto retry_start;
 
                pb_log("%s: discover_client_init failed.\n", __func__);
-               fprintf(stderr, "%s: error: discover_client_init failed.\n",
+               fprintf(stderr, _("%s: error: discover_client_init failed.\n"),
                        __func__);
-               fprintf(stderr, "could not start pb-discover, the petitboot "
-                       "daemon.\n");
+               fprintf(stderr, _("could not start pb-discover, the petitboot "
+                       "daemon.\n"));
                goto fail_client_init;
        }
 
        if (!cui->client) {
                pb_log("%s: discover_client_init failed.\n", __func__);
-               fprintf(stderr, "%s: error: discover_client_init failed.\n",
+               fprintf(stderr, _("%s: error: discover_client_init failed.\n"),
                        __func__);
-               fprintf(stderr, "check that pb-discover, "
-                       "the petitboot daemon is running.\n");
+               fprintf(stderr, _("check that pb-discover, "
+                       "the petitboot daemon is running.\n"));
                goto fail_client_init;
        }