From 09db837fcd5ccea151d535ac09f05729e10f0538 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Mon, 9 Mar 2020 17:42:15 -0400 Subject: [PATCH] Prepared strings for translation --- include/waybox/server.h | 4 ++++ waybox/main.c | 23 ++++++++++++++++------- waybox/server.c | 9 ++++----- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/include/waybox/server.h b/include/waybox/server.h index ecad2a6..2e354eb 100644 --- a/include/waybox/server.h +++ b/include/waybox/server.h @@ -20,6 +20,10 @@ #include #include +#include +#include +#define _ gettext + #include "waybox/output.h" #include "waybox/cursor.h" #include "waybox/seat.h" diff --git a/waybox/main.c b/waybox/main.c index d3c3113..fc9ec92 100644 --- a/waybox/main.c +++ b/waybox/main.c @@ -6,19 +6,28 @@ #include "waybox/server.h" int main(int argc, char **argv) { + textdomain(GETTEXT_PACKAGE); + bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); + setlocale(LC_ALL, ""); + char *startup_cmd = NULL; if (argc > 0) { int i; for (i = 0; i < argc; i++) { - if (!strcmp("--debug", argv[i]) || !strcmp("-v", argv[i]) || !strcmp("--exit", argv[i])) { - printf("Warning: option %s is currently unimplemented\n", argv[i]); - } else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i])) && i < argc) { - startup_cmd = argv[i + 1]; + if (!strcmp("--debug", argv[i]) || !strcmp("-v", argv[i]) || + !strcmp("--exit", argv[i])) { + fprintf(stderr, _("Warning: option %s is currently unimplemented\n"), argv[i]); + } else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i]))) { + if (i < argc - 1) { + startup_cmd = argv[i + 1]; + } else { + fprintf(stderr, _("%s requires an argument\n"), argv[i]); + } } else if (!strcmp("--version", argv[i]) || !strcmp("-V", argv[i])) { printf(PACKAGE_NAME " " PACKAGE_VERSION "\n"); return 0; } else if (argv[i][0] == '-') { - printf("Usage: %s [--debug] [--exit] [--help] [--startup CMD] [--version]\n", argv[0]); + printf(_("Usage: %s [--debug] [--exit] [--help] [--startup CMD] [--version]\n"), argv[0]); return strcmp("--help", argv[i]) != 0 && strcmp("-h", argv[i]) != 0; } } @@ -27,12 +36,12 @@ int main(int argc, char **argv) { struct wb_server server = {0}; if (!wb_create_backend(&server)) { - printf("Failed to create backend\n"); + fprintf(stderr, _("Failed to create backend\n")); exit(EXIT_FAILURE); } if (!wb_start_server(&server)) { - printf("Failed to start server\n"); + fprintf(stderr, _("Failed to start server\n")); wb_terminate(&server); exit(EXIT_FAILURE); } diff --git a/waybox/server.c b/waybox/server.c index 3f99ba2..cc2bf7b 100644 --- a/waybox/server.c +++ b/waybox/server.c @@ -5,14 +5,13 @@ bool wb_create_backend(struct wb_server* server) { // create display server->wl_display = wl_display_create(); if (server->wl_display == NULL) { - fprintf(stderr, "Failed to connect to a Wayland display\n"); + fprintf(stderr, _("Failed to connect to a Wayland display\n")); return false; } // create backend server->backend = wlr_backend_autocreate(server->wl_display, NULL); if (server->backend == NULL) { - printf("Failed to create backend\n"); return false; } @@ -41,13 +40,13 @@ bool wb_start_server(struct wb_server* server) { } if (!wlr_backend_start(server->backend)) { - fprintf(stderr, "Failed to start backend\n"); + fprintf(stderr, _("Failed to start backend\n")); wlr_backend_destroy(server->backend); wl_display_destroy(server->wl_display); return false; } - printf("Running Wayland compositor on Wayland display '%s'\n", socket); + printf(_("Running Wayland compositor on Wayland display '%s'\n"), socket); setenv("WAYLAND_DISPLAY", socket, true); wlr_gamma_control_manager_v1_create(server->wl_display); @@ -69,7 +68,7 @@ bool wb_terminate(struct wb_server* server) { wlr_output_layout_destroy(server->layout); wl_display_destroy(server->wl_display); - printf("Display destroyed.\n"); + printf(_("Display destroyed.\n")); return true; }