diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2014-07-28 12:18:21 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2014-07-28 14:23:11 +0800 |
commit | a5dad9c05cd72820e64e0461889e9e77eaf8202d (patch) | |
tree | 65f3d490743c9300b38be5905a2cdc46216abf7e /discover/boot.c | |
parent | 2a44f3c936f948d6fedc4729dbf2216da558e490 (diff) | |
download | petitboot-a5dad9c05cd72820e64e0461889e9e77eaf8202d.zip petitboot-a5dad9c05cd72820e64e0461889e9e77eaf8202d.tar.gz |
discover: Use translated strings for boot status messages
Since we're operating in the correct locale now, we can send translated
strings in the boot status messages.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/boot.c')
-rw-r--r-- | discover/boot.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/discover/boot.c b/discover/boot.c index ce9c1e0..6e7fda6 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -18,6 +18,7 @@ #include <talloc/talloc.h> #include <url/url.h> #include <util/util.h> +#include <i18n/i18n.h> #include "device-handler.h" #include "boot.h" @@ -235,7 +236,7 @@ static void run_boot_hooks(struct boot_task *task) return; update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO, - "running boot hooks"); + _("running boot hooks")); boot_hook_setenv(task); @@ -298,7 +299,7 @@ static int check_load(struct boot_task *task, const char *name, update_status(task->status_fn, task->status_arg, BOOT_STATUS_ERROR, - "Couldn't load %s", name); + _("Couldn't load %s"), name); return -1; } @@ -381,12 +382,12 @@ static void boot_process(struct load_url_result *result, void *data) run_boot_hooks(task); update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO, - "performing kexec_load"); + _("performing kexec_load")); rc = kexec_load(task); if (rc) { update_status(task->status_fn, task->status_arg, - BOOT_STATUS_ERROR, "kexec load failed"); + BOOT_STATUS_ERROR, _("kexec load failed")); } no_load: @@ -397,13 +398,13 @@ no_load: if (!rc) { update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO, - "performing kexec reboot"); + _("performing kexec reboot")); rc = kexec_reboot(task); if (rc) { update_status(task->status_fn, task->status_arg, BOOT_STATUS_ERROR, - "kexec reboot failed"); + _("kexec reboot failed")); } } } @@ -418,7 +419,7 @@ static int start_url_load(struct boot_task *task, const char *name, if (!*result) { update_status(task->status_fn, task->status_arg, BOOT_STATUS_ERROR, - "Error loading %s", name); + _("Error loading %s"), name); return -1; } return 0; @@ -438,10 +439,10 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt, else if (cmd && cmd->boot_image_file) boot_desc = cmd->boot_image_file; else - boot_desc = "(unknown)"; + boot_desc = _("(unknown)"); update_status(status_fn, status_arg, BOOT_STATUS_INFO, - "Booting %s.", boot_desc); + _("Booting %s."), boot_desc); if (cmd && cmd->boot_image_file) { image = pb_url_parse(opt, cmd->boot_image_file); @@ -450,7 +451,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt, } else { pb_log("%s: no image specified\n", __func__); update_status(status_fn, status_arg, BOOT_STATUS_INFO, - "Boot failed: no image specified"); + _("Boot failed: no image specified")); return NULL; } @@ -501,7 +502,7 @@ void boot_cancel(struct boot_task *task) task->cancelled = true; update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO, - "Boot cancelled"); + _("Boot cancelled")); cleanup_cancellations(task, NULL); } |