From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sat, 8 May 2010 16:55:25 +0000 (-0400)
Subject: Show time as well
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=81245991409033d835df2d81ccc47a41524e7b60;p=horde.git

Show time as well
---

diff --git a/kronolith/templates/edit/edit.inc b/kronolith/templates/edit/edit.inc
index e1c7e1a04..76d8021d1 100644
--- a/kronolith/templates/edit/edit.inc
+++ b/kronolith/templates/edit/edit.inc
@@ -273,7 +273,7 @@ if ($event->alarm) {
 <tr>
 <?php if (!empty($event->baseid)):?>
  <td>&nbsp;</td>
- <td colspan="4"><?php echo sprintf(_("This is an exception to a recurring event originally scheduled on %s"), $event->exceptionoriginaldate->strftime($GLOBALS['prefs']->getValue('date_format')));?></td>
+ <td colspan="4"><?php echo sprintf(_("This is an exception to a recurring event originally scheduled on %s at %s"), $event->exceptionoriginaldate->strftime($GLOBALS['prefs']->getValue('date_format')), $this->event->exceptionoriginaldate->strftime(($GLOBALS['prefs']->getValue('twentyFour') ? '%H:%M' : '%I:%M %p')));?></td>
 <?php else:?>
  <td class="rightAlign" valign="top"><strong><?php echo Horde::label('recurnone', _("Pattern")) ?></strong></td>
  <td valign="top" colspan="4">
diff --git a/kronolith/templates/view/view.inc b/kronolith/templates/view/view.inc
index bd002d2cc..9d3941007 100644
--- a/kronolith/templates/view/view.inc
+++ b/kronolith/templates/view/view.inc
@@ -95,7 +95,7 @@ if ($this->event->initialized && $this->event->alarm > 0):
  <td class="rightAlign" valign="top"><strong><?php echo _("Pattern") ?>&nbsp;&nbsp;</strong></td>
  <td valign="top">
 <?php if ($this->event->baseid):?>
-   <?php echo sprintf(_("This is an exception to a recurring event originally scheduled on %s"), $this->event->exceptionoriginaldate->strftime($GLOBALS['prefs']->getValue('date_format')));?>
+   <?php echo sprintf(_("This is an exception to a recurring event originally scheduled on %s at %s"), $this->event->exceptionoriginaldate->strftime($GLOBALS['prefs']->getValue('date_format')), $this->event->exceptionoriginaldate->strftime(($GLOBALS['prefs']->getValue('twentyFour') ? '%H:%M' : '%I:%M %p')));?>
 <?php elseif ($this->event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_DAILY)): ?>
    <?php echo _("Daily: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("day(s)") ?>
 <?php elseif ($this->event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_WEEKLY)):