From 20a87752b06b8b8b1cdc0a2bbc0080ddc0af047a Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Tue, 5 Dec 2006 14:35:15 +0000 Subject: [PATCH] Use charset from config file for XML export SVN revision: 1769 --- resources/eloglang.czech | 12 +++++------- src/elogd.c | 6 ++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/eloglang.czech b/resources/eloglang.czech index 91808c7a..d8aa438c 100644 --- a/resources/eloglang.czech +++ b/resources/eloglang.czech @@ -131,6 +131,7 @@ Display = Zobraz entries per page = položek na stránku Toggle all = Odeber vše Selected entries = Označené položky +Enable email notifications = Povol oznámení příchodu Emailu A old entry has been updated on %s = Položka %s byla obnovena Collapse = Sbalit Expand = Rozbalit @@ -406,10 +407,7 @@ User name may not contain blanks = Uživatelské jméno nesmí obsahovat mezery Empty password not allowed = Prázdné heslo není povoleno Password may not contain blanks = Heslo nesmí obsahovat mezery Anonymous = Anonym - -# -#---- please translate following items and then remove this comment ----# -# -Activation notice has been sent to %s = -Your request has been forwarded to the administrator = -You will be notified by email upon activation of your new account = +Activation notice has been sent to %s = Oznámení o aktivaci bylo zasláno na %s +Your request has been forwarded to the administrator = Váš požadavek byl odeslán na administrátora +You will be notified by email upon activation of your new account = O aktivaci vašeho nového účtu budete informován emailem + diff --git a/src/elogd.c b/src/elogd.c index 27dbb9db..934d34fe 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -16891,7 +16891,7 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], str[NAME_LENGTH], ref[256], img[80], comment[NAME_LENGTH], mode[80], mid[80], menu_str[1000], menu_item[MAX_N_LIST][NAME_LENGTH], param[NAME_LENGTH], format[80], - sort_attr[MAX_N_ATTR + 4][NAME_LENGTH], mode_cookie[80]; + sort_attr[MAX_N_ATTR + 4][NAME_LENGTH], mode_cookie[80], charset[25]; char *p, *pt, *pt1, *pt2, *slist, *svalue, *gattr, line[1024], iattr[256]; BOOL show_attachments, threaded, csv, xml, raw, mode_commands, expand, filtering, disp_filter, show_text, text_in_attr, searched, found, disp_attr_link[MAX_N_ATTR + 4]; @@ -17732,7 +17732,9 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa /* no menus and tables */ show_plain_header(0, "export.xml"); - rsprintf("\n", DEFAULT_HTTP_CHARSET); + if (!getcfg("global", "charset", charset, sizeof(charset))) + strcpy(charset, DEFAULT_HTTP_CHARSET); + rsprintf("\n", charset); rsprintf("\n", VERSION); rsprintf("\n");