#3390 Events: date isn't localized in some places

modules/boonex/events/classes/BxEventsFormEntry.php

@@ -236,7 +236,7 @@ class BxEventsFormEntry extends BxBaseModGroupsFormEntry
             $aInput['value'] = '';
         else {
             if ($aStartEnd['start']->format('Y-m-d') == $aStartEnd['end']->format('Y-m-d'))
-                $aInput['value'] = _t('_bx_events_txt_from_time_to_time', $aStartEnd['start']->format(getParam('bx_events_time_format')), $aStartEnd['end']->format(getParam('bx_events_time_format')));
+                $aInput['value'] = _t('_bx_events_txt_from_time_to_time', strftime(getParam('bx_events_time_format'), $aStartEnd['start']->getTimestamp()), strftime(getParam('bx_events_time_format'), $aStartEnd['end']->getTimestamp()));
             else
                 $aInput['value'] = '';
         }
@@ -256,7 +256,7 @@ class BxEventsFormEntry extends BxBaseModGroupsFormEntry
 
             $sFormat = getParam($aStartEnd['start']->format('Y-m-d') == $aStartEnd['end']->format('Y-m-d') ? 'bx_events_short_date_format' : 'bx_events_datetime_format');
             $oDate = 'date_start' == $aInput['name'] ? $aStartEnd['start'] : $aStartEnd['end'];
-            return $oDate->format($sFormat);
+            return strftime($sFormat, $oDate->getTimestamp());
         }
         return parent::genViewRowValue($aInput);
     }

modules/boonex/events/classes/BxEventsModule.php

@@ -338,7 +338,7 @@ class BxEventsModule extends BxBaseModGroupsModule implements iBxDolCalendarServ
             'title' => $a['content']['title'],
             'title_attr' => bx_html_attribute($a['content']['title']),
             'url' => $a['content']['url'],
-            'date' => $oDateStart->format(getParam('bx_events_short_date_format')) . ($oDateStart->format('ymd') == $oDateEnd->format('ymd') ? '' : ' - ' . $oDateEnd->format(getParam('bx_events_short_date_format'))),
+            'date' => strftime(getParam('bx_events_short_date_format'), $oDateStart->getTimestamp()) . ($oDateStart->format('ymd') == $oDateEnd->format('ymd') ? '' : ' - ' . strftime(getParam('bx_events_short_date_format'), $oDateEnd->getTimestamp())),
             'date_c' => $oDateStart->format('c'),
             'bx_if:location' => array(
                 'condition' => !!$sLocationString,

modules/boonex/events/classes/BxEventsTemplate.php

@@ -43,9 +43,9 @@ class BxEventsTemplate extends BxBaseModGroupsTemplate
 
         return array_merge($aVars, array(
 			'date_start' => $aData['date_start'],
-			'date_start_f' => $oDateStart->format('j M'),
+			'date_start_f' => strftime('%e %b', $oDateStart->getTimestamp()),
 			'date_end' => $aData['date_end'],
-			'date_end_f' => $oDateEnd->format('j M'),
+			'date_end_f' => strftime('%e %b', $oDateEnd->getTimestamp()),
         ));
     }
 }

modules/boonex/events/install/sql/enable.sql

@@ -17,9 +17,9 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `e
 ('bx_events_per_page_browse_showcase', '32', @iCategId, '_sys_option_per_page_browse_showcase', 'digit', '', '', '', 15),
 ('bx_events_per_page_browse_recommended', '10', @iCategId, '_sys_option_per_page_browse_recommended', 'digit', '', '', '', 16),
 ('bx_events_per_page_for_favorites_lists', '5', @iCategId, '_bx_events_option_per_page_for_favorites_lists', 'digit', '', '', '', 17),
-('bx_events_time_format', 'H:i', @iCategId, '_bx_events_option_time_format', 'digit', '', '', '', 20),
-('bx_events_short_date_format', 'j M y', @iCategId, '_bx_events_option_short_date_format', 'digit', '', '', '', 22),
-('bx_events_datetime_format', 'j M Y H:i', @iCategId, '_bx_events_option_datetime_format', 'digit', '', '', '', 23),
+('bx_events_time_format', '%H:%M', @iCategId, '_bx_events_option_time_format', 'digit', '', '', '', 20),
+('bx_events_short_date_format', '%e %b %Y', @iCategId, '_bx_events_option_short_date_format', 'digit', '', '', '', 22),
+('bx_events_datetime_format', '%e %b %Y %H:%M', @iCategId, '_bx_events_option_datetime_format', 'digit', '', '', '', 23),
 ('bx_events_summary_chars', '700', @iCategId, '_bx_events_option_summary_chars', 'digit', '', '', '', 25),
 ('bx_events_searchable_fields', 'event_name,event_desc', @iCategId, '_bx_events_option_searchable_fields', 'list', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:21:"get_searchable_fields";}', '', '', 30),
 ('bx_events_members_mode', '', @iCategId, '_bx_events_option_members_mode', 'select', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:24:"get_options_members_mode";}', '', '', 40),
@@ -701,4 +701,4 @@ INSERT INTO `sys_objects_uploader` (`object`, `active`, `override_class_name`, `
 -- CRON
 INSERT INTO `sys_cron_jobs` (`name`, `time`, `class`, `file`, `service_call`) VALUES
 ('bx_events_process_reminders', '55 * * * *', 'BxEventsCronProcessReminders', 'modules/boonex/events/classes/BxEventsCronProcessReminders.php', ''),
-('bx_events_pruning', '0 0 * * *', 'BxEventsCronPruning', 'modules/boonex/events/classes/BxEventsCronPruning.php', '');
+('bx_events_pruning', '0 0 * * *', 'BxEventsCronPruning', 'modules/boonex/events/classes/BxEventsCronPruning.php', '');