From 2b19868bf377139f419cc3d9e76f15f5b2fae75f Mon Sep 17 00:00:00 2001 From: Leho Kraav Date: Sun, 26 Dec 2010 19:39:16 +0200 Subject: [PATCH] feed.php: migrate from no-locale-supporting DateTime->format() -> strftime() --- htdocs/feed.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/feed.php b/htdocs/feed.php index 011dc82e..045beb29 100644 --- a/htdocs/feed.php +++ b/htdocs/feed.php @@ -126,14 +126,14 @@ function caldav_get_feed( $request ) { $dt_start = $event_data[0]->GetProperty('DTSTART'); if ( $dt_start != null ) { $dt_start = new RepeatRuleDateTime($dt_start); - $p_time = '' . translate('Time') . ': ' . $dt_start->format(translate('Y-m-d H:i:s')); + $p_time = '' . translate('Time') . ': ' . strftime(translate('%F %T'), $dt_start->epoch()); $dt_end = $event_data[0]->GetProperty('DTEND'); if ( $dt_end != null ) { $dt_end = new RepeatRuleDateTime($dt_end); $p_time .= ' - ' . ( $dt_end->AsDate() == $dt_start->AsDate() - ? $dt_end->format(translate('H:i:s')) - : $dt_end->format(translate('Y-m-d H:i:s')) + ? strftime(translate('%T'), $dt_end->epoch()) + : strftime(translate('%F %T'), $dt_end->epoch()) ); } $content .= $p_time;