Fix certain calls to gettext

Properly call gettext for strings in discover/device-handler.c that are
user-visible, and fix the help string in ui/ncurses/nc-subset.c

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 4e25e079ca18185e21ec187e57a5cd09f9315e0f..69665fa00dbf5caaac309c2c17ce5f62e495968d 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -862,7 +862,7 @@ int device_handler_discover(struct device_handler *handler,
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;

-       status->message = talloc_asprintf(status, "Processing %s device %s",
+       status->message = talloc_asprintf(status, _("Processing %s device %s"),

                                device_type_display_name(dev->device->type),
                                dev->device->id);
        boot_status(handler, status);
                                device_type_display_name(dev->device->type),
                                dev->device->id);
        boot_status(handler, status);


@@ -887,7 +887,7 @@ int device_handler_discover(struct device_handler *handler,
        device_handler_discover_context_commit(handler, ctx);
 
 out:
        device_handler_discover_context_commit(handler, ctx);
 
 out:

-       status->message = talloc_asprintf(status,"Processing %s complete\n",
+       status->message = talloc_asprintf(status,_("Processing %s complete\n"),

                                dev->device->id);
        boot_status(handler, status);
 
                                dev->device->id);
        boot_status(handler, status);
 


@@ -906,7 +906,7 @@ int device_handler_dhcp(struct device_handler *handler,
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;

-       status->message = talloc_asprintf(status, "Processing dhcp event on %s",
+       status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),

                                dev->device->id);
        boot_status(handler, status);
 
                                dev->device->id);
        boot_status(handler, status);
 


@@ -918,7 +918,7 @@ int device_handler_dhcp(struct device_handler *handler,
 
        device_handler_discover_context_commit(handler, ctx);
 
 
        device_handler_discover_context_commit(handler, ctx);
 

-       status->message = talloc_asprintf(status,"Processing %s complete\n",
+       status->message = talloc_asprintf(status,_("Processing %s complete\n"),

                                dev->device->id);
        boot_status(handler, status);
 
                                dev->device->id);
        boot_status(handler, status);
 


@@ -937,7 +937,7 @@ int device_handler_conf(struct device_handler *handler,
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;

-       status->message = talloc_asprintf(status, "Processing user config");
+       status->message = talloc_asprintf(status, _("Processing user config"));

        boot_status(handler, status);
 
        /* create our context */
        boot_status(handler, status);
 
        /* create our context */


@@ -949,7 +949,7 @@ int device_handler_conf(struct device_handler *handler,
        device_handler_discover_context_commit(handler, ctx);
 
        status->message = talloc_asprintf(status,
        device_handler_discover_context_commit(handler, ctx);
 
        status->message = talloc_asprintf(status,

-                               "Processing user config complete");
+                               _("Processing user config complete"));

        boot_status(handler, status);
 
        talloc_free(status);
        boot_status(handler, status);
 
        talloc_free(status);

diff --git a/ui/ncurses/nc-subset.c b/ui/ncurses/nc-subset.c
index 0faed3b1d6f1b510fdaa9872f81ab69099c8d4af..8336725d8e39a103816f2e42eb881bcc4bc880f7 100644 (file)
--- a/ui/ncurses/nc-subset.c
+++ b/ui/ncurses/nc-subset.c
@@ -285,7 +285,7 @@ struct subset_screen *subset_screen_init(struct cui *cui,
                        title_suffix);
        screen->scr.frame.rtitle = NULL;
        screen->scr.frame.help = talloc_strdup(screen,
                        title_suffix);
        screen->scr.frame.rtitle = NULL;
        screen->scr.frame.help = talloc_strdup(screen,

-                       _("tab=next, shift+tab=previous, x=exit"));
+                       _("tab=next, shift+tab=previous, x=exit, h=help"));

 
        scrollok(screen->scr.sub_ncw, true);
 
 
        scrollok(screen->scr.sub_ncw, true);