X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwx-console%2Fconsole_conf.c;h=bbfca2dafceb8f890232362782f763f16417836e;hb=c87eb430746cb5d98d0f2016ac0165b39aba61e8;hp=7e33ca6531609a4fb155f822fc5021d7e1933dcc;hpb=e0097c86a4fc9507ec8b00ee6189a78998df4cda;p=bacula%2Fbacula diff --git a/bacula/src/wx-console/console_conf.c b/bacula/src/wx-console/console_conf.c index 7e33ca6531..bbfca2dafc 100644 --- a/bacula/src/wx-console/console_conf.c +++ b/bacula/src/wx-console/console_conf.c @@ -24,7 +24,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License - version 2 as ammended with additional clauses defined in the + version 2 as amended with additional clauses defined in the file LICENSE in the main source directory. This program is distributed in the hope that it will be useful, @@ -34,6 +34,10 @@ */ +/* _("...") macro returns a wxChar*, so if we need a char*, we need to convert it with: + * wxString(_("...")).mb_str(*wxConvCurrent) */ + +#include #include "bacula.h" #include "console_conf.h" @@ -77,8 +81,8 @@ static RES_ITEM cons_items[] = { {"rcfile", store_dir, ITEM(res_cons.rc_file), 0, 0, 0}, {"historyfile", store_dir, ITEM(res_cons.hist_file), 0, 0, 0}, {"password", store_password, ITEM(res_cons.password), 0, ITEM_REQUIRED, 0}, - {"tlsenable", store_yesno, ITEM(res_cons.tls_enable), 1, ITEM_DEFAULT, 0}, - {"tlsrequire", store_yesno, ITEM(res_cons.tls_require), 1, ITEM_DEFAULT, 0}, + {"tlsenable", store_yesno, ITEM(res_cons.tls_enable), 0, 0, 0}, + {"tlsrequire", store_yesno, ITEM(res_cons.tls_require), 0, 0, 0}, {"tlscacertificatefile", store_dir, ITEM(res_cons.tls_ca_certfile), 0, 0, 0}, {"tlscacertificatedir", store_dir, ITEM(res_cons.tls_ca_certdir), 0, 0, 0}, {"tlscertificate", store_dir, ITEM(res_cons.tls_certfile), 0, 0, 0}, @@ -94,8 +98,8 @@ static RES_ITEM dir_items[] = { {"dirport", store_int, ITEM(res_dir.DIRport), 0, ITEM_DEFAULT, 9101}, {"address", store_str, ITEM(res_dir.address), 0, 0, 0}, {"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0}, - {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 1, ITEM_DEFAULT, 0}, - {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 1, ITEM_DEFAULT, 0}, + {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 0, 0, 0}, + {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 0, 0, 0}, {"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0}, {"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0}, {"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0}, @@ -121,7 +125,7 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm int recurse = 1; if (res == NULL) { - printf("No record for %d %s\n", type, res_to_str(type)); + printf(wxString(_("No record for %d %s\n")).mb_str(*wxConvCurrent), type, res_to_str(type)); return; } if (type < 0) { /* no recursion */ @@ -130,15 +134,15 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm } switch (type) { case R_CONSOLE: - printf("Console: name=%s rcfile=%s histfile=%s\n", reshdr->name, + printf(wxString(_("Console: name=%s rcfile=%s histfile=%s\n")).mb_str(*wxConvCurrent), reshdr->name, res->res_cons.rc_file, res->res_cons.hist_file); break; case R_DIRECTOR: - printf("Director: name=%s address=%s DIRport=%d\n", reshdr->name, + printf(wxString(_("Director: name=%s address=%s DIRport=%d\n")).mb_str(*wxConvCurrent), reshdr->name, res->res_dir.address, res->res_dir.DIRport); break; default: - printf("Unknown resource type %d\n", type); + printf(wxString(_("Unknown resource type %d\n")).mb_str(*wxConvCurrent), type); } if (recurse && res->res_dir.hdr.next) { dump_resource(type, res->res_dir.hdr.next, sendit, sock); @@ -213,7 +217,7 @@ void free_resource(RES *sres, int type) } break; default: - printf("Unknown resource type %d\n", type); + printf(wxString(_("Unknown resource type %d\n")).mb_str(*wxConvCurrent), type); } /* Common stuff again -- free the resource, recurse to next one */ free(res); @@ -239,7 +243,7 @@ void save_resource(int type, RES_ITEM *items, int pass) for (i=0; items[i].name; i++) { if (items[i].flags & ITEM_REQUIRED) { if (!bit_is_set(i, res_all.res_dir.hdr.item_present)) { - Emsg2(M_ABORT, 0, "%s item is required in %s resource, but not found.\n", + Emsg2(M_ABORT, 0, wxString(_("%s item is required in %s resource, but not found.\n")).mb_str(*wxConvCurrent), items[i].name, resources[rindex]); } } @@ -258,7 +262,7 @@ void save_resource(int type, RES_ITEM *items, int pass) break; default: - Emsg1(M_ERROR, 0, "Unknown resource type %d\n", type); + Emsg1(M_ERROR, 0, wxString(_("Unknown resource type %d\n")).mb_str(*wxConvCurrent), type); error = 1; break; } @@ -285,7 +289,7 @@ void save_resource(int type, RES_ITEM *items, int pass) size = sizeof(DIRRES); break; default: - printf("Unknown resource type %d\n", type); + printf(wxString(_("Unknown resource type %d\n")).mb_str(*wxConvCurrent), type); error = 1; size = 1; break; @@ -301,7 +305,7 @@ void save_resource(int type, RES_ITEM *items, int pass) for (next=res_head[rindex]; next->next; next=next->next) { if (strcmp(next->name, res->res_dir.hdr.name) == 0) { Emsg2(M_ERROR_TERM, 0, - _("Attempt to define second %s resource named \"%s\" is not permitted.\n"), + wxString(_("Attempt to define second %s resource named \"%s\" is not permitted.\n")).mb_str(*wxConvCurrent), resources[rindex].name, res->res_dir.hdr.name); } }