On the commit/commitdiff views, show the author/committer times as
follows:
If $feature{'localtime'} is disabled, display the RFC 2822 date/time in
GMT, then print (HH:MM -TZ) in the author's/committer's local timezone.
(i.e. no change to the current behavior)
If $feature{'localtime'} is enabled, display the RFC 2822 date/time in
the author's/committer's local timezone, then print (HH:MM +0000) in GMT.
Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx>
---
gitweb/gitweb.perl | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 578edc0..6b8f9a7 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3953,22 +3953,27 @@ sub git_print_section {
print $cgi->end_div;
}
-sub print_local_time {
- print format_local_time(@_);
-}
-
-sub format_local_time {
+# If localtime is disabled, show the server's local time in parentheses.
+# If localtime is enabled, show GMT in parentheses.
+sub print_alt_time {
my $localtime = '';
my %date = @_;
+ my ($h, $m, $tz) = ($date{'hour_local'}, $date{'minute_local'},
+ $date{'tz_local'});
+
+ if (gitweb_check_feature('localtime')) {
+ ($h, $m, $tz) = ($date{'hour'}, $date{'minute'}, "+0000");
+ }
+
if ($date{'hour_local'} < 6) {
$localtime .= sprintf(" (<span class=\"atnight\">%02d:%02d</span> %s)",
- $date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
+ $h, $m, $tz);
} else {
$localtime .= sprintf(" (%02d:%02d %s)",
- $date{'hour_local'}, $date{'minute_local'}, $date{'tz_local'});
+ $h, $m, $tz);
}
- return $localtime;
+ print $localtime;
}
# Outputs the author name and date in long form
@@ -3982,7 +3987,6 @@ sub git_print_authorship {
print "<$tag class=\"author_date\">" .
format_search_author($author, "author", esc_html($author)) .
" [$ad{'rfc2822'}";
- print_local_time(%ad) if ($opts{-localtime});
print "]" . git_get_avatar($co->{'author_email'}, -pad_before => 1)
. "</$tag>\n";
}
@@ -4009,7 +4013,7 @@ sub git_print_authorship_rows {
"</td></tr>\n" .
"<tr>" .
"<td></td><td> $wd{'rfc2822'}";
- print_local_time(%wd) if !gitweb_check_feature('localtime');
+ print_alt_time(%wd);
print "</td>" .
"</tr>\n";
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html