| author | Lars Hjemli <hjemli@gmail.com> | 2007-11-05 23:38:18 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-05 23:38:18 (UTC) |
| commit | 55ac326ecb01161bf62865ae3350acf85db97d63 (patch) (unidiff) | |
| tree | e37bcd8fef5523aa627ec9fdcd3401105f8e579d /ui-shared.c | |
| parent | d04c4734bcf40b1d17c55b18fba2aa8344678e8f (diff) | |
| parent | a2ebbd6948da96172108db5e9c02c141923ad05c (diff) | |
| download | cgit-55ac326ecb01161bf62865ae3350acf85db97d63.zip cgit-55ac326ecb01161bf62865ae3350acf85db97d63.tar.gz cgit-55ac326ecb01161bf62865ae3350acf85db97d63.tar.bz2 | |
Merge branch 'iconv-rebased' of http://x2a.org/pub/git/cgit
* 'iconv-rebased' of http://x2a.org/pub/git/cgit:
Use utf8::reencode_string from git
Convert subject and message with iconv_msg.
Add iconv_msg function.
Set msg_encoding according to the header.
Add commit->msg_encoding, allocate msg dynamicly.
| -rw-r--r-- | ui-shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..7c69f60 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -331,49 +331,49 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
| 331 | secs * 1.0 / TM_HOUR); | 331 | secs * 1.0 / TM_HOUR); |
| 332 | return; | 332 | return; |
| 333 | } | 333 | } |
| 334 | if (secs < TM_WEEK * 2) { | 334 | if (secs < TM_WEEK * 2) { |
| 335 | htmlf("<span class='age-days'>%.0f days</span>", | 335 | htmlf("<span class='age-days'>%.0f days</span>", |
| 336 | secs * 1.0 / TM_DAY); | 336 | secs * 1.0 / TM_DAY); |
| 337 | return; | 337 | return; |
| 338 | } | 338 | } |
| 339 | if (secs < TM_MONTH * 2) { | 339 | if (secs < TM_MONTH * 2) { |
| 340 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 340 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
| 341 | secs * 1.0 / TM_WEEK); | 341 | secs * 1.0 / TM_WEEK); |
| 342 | return; | 342 | return; |
| 343 | } | 343 | } |
| 344 | if (secs < TM_YEAR * 2) { | 344 | if (secs < TM_YEAR * 2) { |
| 345 | htmlf("<span class='age-months'>%.0f months</span>", | 345 | htmlf("<span class='age-months'>%.0f months</span>", |
| 346 | secs * 1.0 / TM_MONTH); | 346 | secs * 1.0 / TM_MONTH); |
| 347 | return; | 347 | return; |
| 348 | } | 348 | } |
| 349 | htmlf("<span class='age-years'>%.0f years</span>", | 349 | htmlf("<span class='age-years'>%.0f years</span>", |
| 350 | secs * 1.0 / TM_YEAR); | 350 | secs * 1.0 / TM_YEAR); |
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | void cgit_print_docstart(char *title, struct cacheitem *item) | 353 | void cgit_print_docstart(char *title, struct cacheitem *item) |
| 354 | { | 354 | { |
| 355 | html("Content-Type: text/html; charset=utf-8\n"); | 355 | html("Content-Type: text/html; charset=" PAGE_ENCODING "\n"); |
| 356 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 356 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
| 357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
| 358 | ttl_seconds(item->ttl))); | 358 | ttl_seconds(item->ttl))); |
| 359 | html("\n"); | 359 | html("\n"); |
| 360 | html(cgit_doctype); | 360 | html(cgit_doctype); |
| 361 | html("<html>\n"); | 361 | html("<html>\n"); |
| 362 | html("<head>\n"); | 362 | html("<head>\n"); |
| 363 | html("<title>"); | 363 | html("<title>"); |
| 364 | html_txt(title); | 364 | html_txt(title); |
| 365 | html("</title>\n"); | 365 | html("</title>\n"); |
| 366 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 366 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
| 367 | html("<link rel='stylesheet' type='text/css' href='"); | 367 | html("<link rel='stylesheet' type='text/css' href='"); |
| 368 | html_attr(cgit_css); | 368 | html_attr(cgit_css); |
| 369 | html("'/>\n"); | 369 | html("'/>\n"); |
| 370 | html("</head>\n"); | 370 | html("</head>\n"); |
| 371 | html("<body>\n"); | 371 | html("<body>\n"); |
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | void cgit_print_docend() | 374 | void cgit_print_docend() |
| 375 | { | 375 | { |
| 376 | html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); | 376 | html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); |
| 377 | } | 377 | } |
| 378 | 378 | ||
| 379 | int print_branch_option(const char *refname, const unsigned char *sha1, | 379 | int print_branch_option(const char *refname, const unsigned char *sha1, |