extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 2609day/name2609 for name of week, change 2609range/month2609 to name of month instead of number

Browse Source
This commit is contained in:
Nathan Gray 2011-02-22 18:45:33 +00:00
parent 127976b1ef
commit 6554ca4c09
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
calendar/inc/class.calendar_merge.inc.php
View File

@ -47,7 +47,7 @@ class calendar_merge extends bo_merge
protected static $range_tags = array( protected static $range_tags = array(
'start' => 'Y-m-d', 'start' => 'Y-m-d',
'end' => 'Y-m-d', 'end' => 'Y-m-d',
'month' => 'm', 'month' => 'F',
'year' => 'Y' 'year' => 'Y'
); );
@ -122,7 +122,9 @@ class calendar_merge extends bo_merge
{ {
foreach(self::$range_tags as $key => $format) foreach(self::$range_tags as $key => $format)
{ {
$values["$\$range/$key$$"] = date($format, $key == 'end' ? $id['end'] : $id['start']); $value = date($format, $key == 'end' ? $id['end'] : $id['start']);
if($key == 'month') $value = lang($value);
$values["$\$range/$key$$"] = $value;
} }
} }
$replacements += $values; $replacements += $values;
@ -226,8 +228,11 @@ class calendar_merge extends bo_merge
} }
$days[date('Ymd',$_date)][$dow][] = $this->calendar_replacements($event); $days[date('Ymd',$_date)][$dow][] = $this->calendar_replacements($event);
} }
if(strpos($repeat, '$$day/date$$') !== false) { if(strpos($repeat, '$$day/date$$') !== false || strpos($repeat, '$$day/name$$') !== false) {
$date_marker = array('$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day))); $date_marker = array(
'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
'$$day/name$$' => lang(date('l', strtotime($day)))
);
if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) { if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) {
$blank = $this->calendar_replacements(array()); $blank = $this->calendar_replacements(array());
foreach($blank as &$value) $value = ''; foreach($blank as &$value) $value = '';
@ -295,8 +300,11 @@ class calendar_merge extends bo_merge
{ {
$days[date('Ymd',$_date)][$plugin][] = $this->calendar_replacements($event); $days[date('Ymd',$_date)][$plugin][] = $this->calendar_replacements($event);
} }
if(strpos($repeat, '$$day/date$$') !== false) { if(strpos($repeat, '$$day/date$$') !== false || strpos($repeat, '$$day/name$$') !== false) {
$date_marker = array('$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day))); $date_marker = array(
'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
'$$day/name$$' => lang(date('l', strtotime($day)))
);
if(!is_array($days[date('Ymd',$_date)][$plugin])) { if(!is_array($days[date('Ymd',$_date)][$plugin])) {
$blank = $this->calendar_replacements(array()); $blank = $this->calendar_replacements(array());
foreach($blank as &$value) $value = ''; foreach($blank as &$value) $value = '';
@ -478,7 +486,8 @@ class calendar_merge extends bo_merge
} }
echo '<tr><td>{{table/day_n}} ... {{endtable}}</td><td>1 <= n <= 31</td></tr>'; echo '<tr><td>{{table/day_n}} ... {{endtable}}</td><td>1 <= n <= 31</td></tr>';
echo '</table></td></tr>'; echo '</table></td></tr>';
echo '<tr><td>{{day/date}}</td><td>'.lang('Date for the day of the week, available for the first entry inside each day of week or daily table inside the selected range.').'</td></tr>'; echo '<tr><td>{{day/date}}</td><td colspan="3">'.lang('Date for the day of the week, available for the first entry inside each day of week or daily table inside the selected range.').'</td></tr>';
echo '<tr><td>{{day/name}}</td><td colspan="3">'.lang('Name of the week (ex: Monday), available for the first entry inside each day of week or daily table inside the selected range.').'</td></tr>';
echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>"; echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
foreach(array( foreach(array(