gitweb: Unify the way long timestamp is displayed
format_timestamp_html loses its "-localtime => 1" option, and now always print the local time (in author/comitter/tagger local timezone), with "atnight" warning if needed. This means that both 'summary' and 'log' views now display localtime. In the case of 'log' view this can be thought as an improvement, as now one can easily see which commits in a series are made "atnight" and should be examined closer. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
256b7b4883
commit
ce71b07632
@ -3939,11 +3939,9 @@ sub git_print_section {
|
||||
}
|
||||
|
||||
sub format_timestamp_html {
|
||||
my ($date, %opts) = @_;
|
||||
my $date = shift;
|
||||
my $strtime = $date->{'rfc2822'};
|
||||
|
||||
return $strtime unless $opts{'-localtime'};
|
||||
|
||||
my $localtime_format = '(%02d:%02d %s)';
|
||||
if ($date->{'hour_local'} < 6) {
|
||||
$localtime_format = '(<span class="atnight">%02d:%02d</span> %s)';
|
||||
@ -3965,7 +3963,7 @@ sub git_print_authorship {
|
||||
my %ad = parse_date($co->{'author_epoch'}, $co->{'author_tz'});
|
||||
print "<$tag class=\"author_date\">" .
|
||||
format_search_author($author, "author", esc_html($author)) .
|
||||
" [".format_timestamp_html(\%ad, %opts)."]".
|
||||
" [".format_timestamp_html(\%ad)."]".
|
||||
git_get_avatar($co->{'author_email'}, -pad_before => 1) .
|
||||
"</$tag>\n";
|
||||
}
|
||||
@ -3992,7 +3990,7 @@ sub git_print_authorship_rows {
|
||||
"</td></tr>\n" .
|
||||
"<tr>" .
|
||||
"<td></td><td>" .
|
||||
format_timestamp_html(\%wd, -localtime=>1) .
|
||||
format_timestamp_html(\%wd) .
|
||||
"</td>" .
|
||||
"</tr>\n";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user