From db1743437461dfd791bd6cc55c4288417a9b4a09 Mon Sep 17 00:00:00 2001
From: carstenklapp <carstenklapp@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sun, 3 Feb 2002 22:12:34 +0000
Subject: [PATCH] Enhancements to format dates as relative dates, such as
 "Today" or "Yesterday" when appropriate.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@1824 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/Theme.php                            | 27 ++++++++++++++++++------
 lib/stdlib.php                           |  9 +++++++-
 themes/default/templates/browse.tmpl     | 21 ++++++++++++------
 themes/default/templates/viewsource.tmpl | 22 +++++++++++++------
 4 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/lib/Theme.php b/lib/Theme.php
index fbd174af0..7d2e72c99 100644
--- a/lib/Theme.php
+++ b/lib/Theme.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: Theme.php,v 1.30 2002-02-03 19:04:42 carstenklapp Exp $');
+<?php rcs_id('$Id: Theme.php,v 1.31 2002-02-03 22:12:34 carstenklapp Exp $');
 
 require_once('lib/HtmlElement.php');
 
@@ -174,15 +174,23 @@ class Theme {
     
     var $_dateTimeFormat = "%B %e, %Y";
     var $_dateFormat = "%B %e, %Y";
+    var $_timeFormat = "%l:%M %p";
+    //var $_timeFormat = "%l:%M:%S %p";
 
     function setDateFormat ($fs) {
         $this->_dateFormat = $fs;
     }
 
     function formatDate ($time_t) {
-        return HTML(strftime($this->_dateFormat,
-                             $time_t + PrefTimezoneOffset()),
-                    HTML::small("*"));
+        $offset_time = $time_t + PrefTimezoneOffset();
+
+        if (istoday($offset_time))
+            $date = _("Today");
+        else if (isyesterday($offset_time))
+            $date = _("Yesterday");
+        else
+            $date = strftime($this->_dateFormat, $offset_time);
+        return HTML($date, HTML::small("*"));
         // The asterisk is temporary, for debugging it indicates a
         // time has been converted to the user's local time.
     }
@@ -192,9 +200,14 @@ class Theme {
     }
 
     function formatDateTime ($time_t) {
-        return HTML(strftime($this->_dateTimeFormat,
-                             $time_t + PrefTimezoneOffset()),
-                    HTML::small("*"));
+        $offset_time = $time_t + PrefTimezoneOffset();
+        if (istoday($offset_time))
+            $date = sprintf(_("Today at %s"), strtolower(strftime($this->_timeFormat, $offset_time)));
+        else if (isyesterday($offset_time))
+            $date = sprintf(_("Yesterday at %s"), strtolower(strftime($this->_timeFormat, $offset_time)));
+        else
+            $date = strftime($this->_dateTimeFormat, $offset_time);
+        return HTML($date, HTML::small("*"));
         // The asterisk is temporary, for debugging it indicates a
         // time has been converted to the user's local time.
     }
diff --git a/lib/stdlib.php b/lib/stdlib.php
index 308730066..895d12505 100644
--- a/lib/stdlib.php
+++ b/lib/stdlib.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: stdlib.php,v 1.98 2002-02-03 19:03:44 carstenklapp Exp $');
+<?php rcs_id('$Id: stdlib.php,v 1.99 2002-02-03 22:12:34 carstenklapp Exp $');
 
 /*
   Standard functions for Wiki functionality
@@ -436,6 +436,13 @@ function PrefTimezoneOffset () {
     return $offset_secs;
 }
 
+function istoday($time_secs) {
+    return date("Ymd", time()) == date("Ymd", $time_secs);
+}
+function isyesterday($time_secs) {
+    return date("Ymd", time()-60*60*24) == date("Ymd", $time_secs);
+}
+
 /**
  * Format time in ISO-8601 format.
  *
diff --git a/themes/default/templates/browse.tmpl b/themes/default/templates/browse.tmpl
index 38c83c111..188b4a788 100644
--- a/themes/default/templates/browse.tmpl
+++ b/themes/default/templates/browse.tmpl
@@ -1,13 +1,22 @@
 <?php // -*-html-*- ?>
-<!-- $Id: browse.tmpl,v 1.14 2002-02-03 21:32:08 carstenklapp Exp $ -->
+<!-- $Id: browse.tmpl,v 1.15 2002-02-03 22:12:33 carstenklapp Exp $ -->
 <?php 
-  $mtime = $Theme->formatDateTime($revision->get('mtime'));
+  $mtime = $revision->get('mtime');
+  $fmtime = $Theme->formatDateTime($mtime);
 
-  if ($revision->isCurrent())
-      $LastModifiedMsg = fmt("Last edited on %s.", $mtime);
-  else
+  if ($revision->isCurrent()) {
+    if (istoday($mtime) || isyesterday($mtime))
+      $LastModifiedMsg = fmt("Last edited %s.", $fmtime);
+    else
+      $LastModifiedMsg = fmt("Last edited on %s.", $fmtime);
+  } else {
+    if (istoday($mtime) || isyesterday($mtime))
+      $LastModifiedMsg = fmt("Version %s, saved %s.",
+                             $revision->getVersion(), $fmtime);
+    else
       $LastModifiedMsg = fmt("Version %s, saved on %s.",
-                             $revision->getVersion(), $mtime);
+                             $revision->getVersion(), $fmtime);
+  }
 ?>
 
 <div class="br"><br clear="all" class="ignore" /></div>
diff --git a/themes/default/templates/viewsource.tmpl b/themes/default/templates/viewsource.tmpl
index 70a2616e3..1c552fef7 100644
--- a/themes/default/templates/viewsource.tmpl
+++ b/themes/default/templates/viewsource.tmpl
@@ -1,12 +1,22 @@
 <!-- -*-html-*- -->
-<!-- $Id: viewsource.tmpl,v 1.11 2002-02-03 21:32:08 carstenklapp Exp $ -->
+<!-- $Id: viewsource.tmpl,v 1.12 2002-02-03 22:12:33 carstenklapp Exp $ -->
 <?php
-  $mtime = $Theme->formatDateTime($revision->get('mtime'));
-  if ($revision->isCurrent())
-      $LastModifiedMsg = fmt("Last edited on %s.", $mtime);
-  else
+  $mtime = $revision->get('mtime');
+  $fmtime = $Theme->formatDateTime($mtime);
+
+  if ($revision->isCurrent()) {
+    if (istoday($mtime) || isyesterday($mtime))
+      $LastModifiedMsg = fmt("Last edited %s.", $fmtime);
+    else
+      $LastModifiedMsg = fmt("Last edited on %s.", $fmtime);
+  } else {
+    if (istoday($mtime) || isyesterday($mtime))
+      $LastModifiedMsg = fmt("Version %s, saved %s.",
+                             $revision->getVersion(), $fmtime);
+    else
       $LastModifiedMsg = fmt("Version %s, saved on %s.",
-                             $revision->getVersion(), $mtime);
+                             $revision->getVersion(), $fmtime);
+  }
 ?>
 
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
-- 
2.45.0