use local date format

diff --git a/src/bdrem/Renderer.php b/src/bdrem/Renderer.php
index e6f633b5e5138e1ed9aebff935a031ab14dd9702..363d413de11ae6923a62a7ba50892096f24dae33 100644 (file)
--- a/src/bdrem/Renderer.php
+++ b/src/bdrem/Renderer.php
@@ -18,5 +18,19 @@ abstract class Renderer
     }
 
     abstract public function render($arEvents);
+
+    protected function getLocalDate($dateStr)
+    {
+        if ($dateStr{0} != '?') {
+            return strftime('%x', strtotime($dateStr));
+        }
+
+        $dateStr = str_replace('????', '1899', $dateStr);
+        return str_replace(
+            array('1899', '99'),
+            array('????', '??'),
+            strftime('%x', strtotime($dateStr))
+        );
+    }
 }
 ?>

diff --git a/src/bdrem/Renderer/Console.php b/src/bdrem/Renderer/Console.php
index e88d57ae537990dd0cb818bfc3995bbe3d786976..87eeb9a1c4c858bad02a8e00ea833c130304b5e0 100644 (file)
--- a/src/bdrem/Renderer/Console.php
+++ b/src/bdrem/Renderer/Console.php
@@ -60,7 +60,7 @@ class Renderer_Console extends Renderer
                         $event->age,
                         wordwrap($event->title, 30, "\n", true),
                         wordwrap($event->type, 20, "\n", true),
-                        $event->date,
+                        $this->getLocalDate($event->date),
                         strftime('%a', strtotime($event->localDate))
                     ),
                     $colorCode

diff --git a/src/bdrem/Renderer/HtmlTable.php b/src/bdrem/Renderer/HtmlTable.php
index d8a723e6e556570b0fce4ea80d24158e175e81e8..2c792f85ee77f9de9d5fbe96126416088f9883aa 100644 (file)
--- a/src/bdrem/Renderer/HtmlTable.php
+++ b/src/bdrem/Renderer/HtmlTable.php
@@ -38,14 +38,14 @@ HTM;
                 . '<td class="r">%s</td>'
                 . '<td>%s</td>'
                 . '<td>%s</td>'
-                . '<td class="r">%s</td>'
+                . '<td>%s</td>'
                 . '<td>%s</td>'
                 . "</tr>\n",
                 $event->days,
                 $event->age,
                 htmlspecialchars($event->title),
                 htmlspecialchars($event->type),
-                $event->date,
+                $this->getLocalDate($event->date),
                 strftime('%a', strtotime($event->localDate))
             );
         }