From 203ad2cb596a4b8df13df4afdc8d7e0d999a5fd5 Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Tue, 15 Sep 2015 16:24:24 +1000 Subject: [PATCH] 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 --- discover/device-handler.c | 12 ++++++------ ui/ncurses/nc-subset.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/discover/device-handler.c b/discover/device-handler.c index 4e25e07..69665fa 100644 --- 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->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); @@ -887,7 +887,7 @@ int device_handler_discover(struct device_handler *handler, 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); @@ -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->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); @@ -918,7 +918,7 @@ int device_handler_dhcp(struct device_handler *handler, 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); @@ -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->message = talloc_asprintf(status, "Processing user config"); + status->message = talloc_asprintf(status, _("Processing user config")); 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, - "Processing user config complete"); + _("Processing user config complete")); boot_status(handler, status); talloc_free(status); diff --git a/ui/ncurses/nc-subset.c b/ui/ncurses/nc-subset.c index 0faed3b..8336725 100644 --- 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, - _("tab=next, shift+tab=previous, x=exit")); + _("tab=next, shift+tab=previous, x=exit, h=help")); scrollok(screen->scr.sub_ncw, true); -- 2.39.2