[Jifty-commit] r4116 - in jifty/trunk: lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sat Sep 15 03:00:08 EDT 2007
Author: sartak
Date: Sat Sep 15 03:00:08 2007
New Revision: 4116
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/DateTime.pm
Log:
r42711 at onn: sartak | 2007-09-15 02:59:55 -0400
Fix mismerge..
Modified: jifty/trunk/lib/Jifty/DateTime.pm
==============================================================================
--- jifty/trunk/lib/Jifty/DateTime.pm (original)
+++ jifty/trunk/lib/Jifty/DateTime.pm Sat Sep 15 03:00:08 2007
@@ -162,15 +162,18 @@
my $tz = $self->current_user_has_timezone || $self->time_zone;
my $rel = DateTime->now( time_zone => $tz );
+ # Is it today?
if ($ymd eq $rel->ymd) {
return "today";
}
-
+
+ # Is it yesterday?
my $yesterday = $rel->clone->subtract(days => 1);
if ($ymd eq $yesterday->ymd) {
return "yesterday";
}
-
+
+ # Is it tomorrow?
my $tomorrow = $rel->clone->add(days => 1);
if ($ymd eq $tomorrow->ymd) {
return "tomorrow";
More information about the Jifty-commit
mailing list