diff -uNrp zabbix-2.0.5.orig/frontends/php/include/maintenances.inc.php zabbix-2.0.5/frontends/php/include/maintenances.inc.php --- zabbix-2.0.5.orig/frontends/php/include/maintenances.inc.php 2013-02-12 20:27:24.000000000 +0900 +++ zabbix-2.0.5/frontends/php/include/maintenances.inc.php 2013-04-04 08:56:19.747433305 +0900 @@ -51,13 +51,24 @@ function shedule2str($timeperiod) { $timeperiod['minute'] = '0'.$timeperiod['minute']; } - $str = _('At').SPACE.$timeperiod['hour'].':'.$timeperiod['minute'].SPACE._('on').SPACE; + $str = ''; if ($timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_ONETIME) { - $str = _('At').SPACE.date('H', $timeperiod['start_date']).':'.date('i',$timeperiod['start_date']).SPACE._('on').SPACE.zbx_date2str(_('d M Y'), $timeperiod['start_date']); + $str = sprintf(_('At %1$s:%2$s on %3$s'), + date('H', $timeperiod['start_date']), + date('i',$timeperiod['start_date']), + zbx_date2str(_('d M Y'), $timeperiod['start_date'])); } elseif ($timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_DAILY) { - $str .= _('every').SPACE.(($timeperiod['every'] > 1) ? $timeperiod['every'].SPACE._('days') : _('day')); + if ($timeperiod['every'] > 1) + $str = sprintf(_('At %1$s:%2$s on every %3$s days'), + $timeperiod['hour'], + $timeperiod['minute'], + $timeperiod['every']); + else + $str = sprintf(_('At %1$s:%2$s on every day'), + $timeperiod['hour'], + $timeperiod['minute']); } elseif ($timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_WEEKLY) { $days = ''; @@ -71,7 +82,17 @@ function shedule2str($timeperiod) { $days .= getDayOfWeekCaption($i + 1); } } - $str.= _('every').SPACE.$days.SPACE._('of every').SPACE.(($timeperiod['every'] > 1) ? $timeperiod['every'].SPACE._('weeks') : _('week')); + if ($timeperiod['every'] > 1) + $str = sprintf(_('At %1$s:%2$s on every %3$s of every %4$s weeks'), + $timeperiod['hour'], + $timeperiod['minute'], + $days, + $timeperiod['every']); + else + $str = sprintf(_('At %1$s:%2$s on every %3$s of every week'), + $timeperiod['hour'], + $timeperiod['minute'], + $days); } elseif ($timeperiod['timeperiod_type'] == TIMEPERIOD_TYPE_MONTHLY) { $months = ''; @@ -106,10 +127,19 @@ function shedule2str($timeperiod) { case 4: $every = _('Fourth'); break; case 5: $every = _('Last'); break; } - $str .= $every.SPACE.$days.SPACE._('of every').SPACE.$months; + $str = sprintf(_('At %1$s:%2$s on %3$s %4$s of every %5$s'), + $timeperiod['hour'], + $timeperiod['minute'], + $every, + $days, + $months); } else { - $str .= _('day').SPACE.$timeperiod['day'].SPACE._('of every').SPACE.$months; + $str = sprintf(_('At %1$s:%2$s on day %3$s of every %4$s'), + $timeperiod['hour'], + $timeperiod['minute'], + $timeperiod['day'], + $months); } } return $str;