Use charset from config file for XML export

SVN revision: 1769
This commit is contained in:
Stefan Ritt 2006-12-05 14:35:15 +00:00
parent 7ef4b06936
commit 20a87752b0
2 changed files with 9 additions and 9 deletions

View File

@ -131,6 +131,7 @@ Display = Zobraz
entries per page = položek na stránku entries per page = položek na stránku
Toggle all = Odeber vše Toggle all = Odeber vše
Selected entries = Označené položky 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 A old entry has been updated on %s = Položka %s byla obnovena
Collapse = Sbalit Collapse = Sbalit
Expand = Rozbalit 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 Empty password not allowed = Prázdné heslo není povoleno
Password may not contain blanks = Heslo nesmí obsahovat mezery Password may not contain blanks = Heslo nesmí obsahovat mezery
Anonymous = Anonym Anonymous = Anonym
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
#
#---- 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 =

View File

@ -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], 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], 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], 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]; 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, 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]; 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 */ /* no menus and tables */
show_plain_header(0, "export.xml"); show_plain_header(0, "export.xml");
rsprintf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", DEFAULT_HTTP_CHARSET); if (!getcfg("global", "charset", charset, sizeof(charset)))
strcpy(charset, DEFAULT_HTTP_CHARSET);
rsprintf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", charset);
rsprintf("<!-- ELOGD Version %s export.xml -->\n", VERSION); rsprintf("<!-- ELOGD Version %s export.xml -->\n", VERSION);
rsprintf("<ELOG_LIST>\n"); rsprintf("<ELOG_LIST>\n");