diff --git a/calendar/inc/class.calendar.inc.php b/calendar/inc/class.calendar.inc.php index 7a615d224a..8e8b68e10f 100755 --- a/calendar/inc/class.calendar.inc.php +++ b/calendar/inc/class.calendar.inc.php @@ -181,16 +181,16 @@ class calendar extends calendar_ switch ($status_short) { case 'A': - $status = 'Accepted'; + $status = lang('Accepted'); break; case 'R': - $status = 'Rejected'; + $status = lang('Rejected'); break; case 'T': - $status = 'Tentative'; + $status = lang('Tentative'); break; case 'U': - $status = 'No Response'; + $status = lang('No Response'); break; } return $status; @@ -1503,7 +1503,7 @@ class calendar extends calendar_ { $repeat_days .= ', '; } - $repeat_days .= $day; + $repeat_days .= $day.' '; } function view_event($event) @@ -1659,7 +1659,7 @@ class calendar extends calendar_ $p->parse('output','list',True); // Repeated Events - $str = $event->rpt_type; + $str = lang($event->rpt_type); if($event->recur_type <> RECUR_NONE) { $str .= ' ('; @@ -1674,33 +1674,43 @@ class calendar extends calendar_ if($event->recur_type == RECUR_WEEKLY || $event->recur_type == RECUR_DAILY) { $repeat_days = ''; - if (!!($event->recur_data & M_SUNDAY) == True) + if($phpgw_info['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday') { - $this->view_add_day(lang('Sunday '),$repeat_days); + if (!!($event->recur_data & M_SUNDAY) == True) + { + $this->view_add_day(lang('Sunday'),$repeat_days); + } } if (!!($event->recur_data & M_MONDAY) == True) { - $this->view_add_day(lang('Monday '),$repeat_days); + $this->view_add_day(lang('Monday'),$repeat_days); } if (!!($event->recur_data & M_TUESDAY) == True) { - $this->view_add_day(lang('Tuesay '),$repeat_days); + $this->view_add_day(lang('Tuesay'),$repeat_days); } if (!!($event->recur_data & M_WEDNESDAY) == True) { - $this->view_add_day(lang('Wednesday '),$repeat_days); + $this->view_add_day(lang('Wednesday'),$repeat_days); } if (!!($event->recur_data & M_THURSDAY) == True) { - $this->view_add_day(lang('Thursday '),$repeat_days); + $this->view_add_day(lang('Thursday'),$repeat_days); } if (!!($event->recur_data & M_FRIDAY) == True) { - $this->view_add_day(lang('Friday '),$repeat_days); + $this->view_add_day(lang('Friday'),$repeat_days); } if (!!($event->recur_data & M_SATURDAY) == True) { - $this->view_add_day(lang('Saturday '),$repeat_days); + $this->view_add_day(lang('Saturday'),$repeat_days); + } + if($phpgw_info['user']['preferences']['calendar']['weekdaystarts'] == 'Monday') + { + if (!!($event->recur_data & M_SUNDAY) == True) + { + $this->view_add_day(lang('Sunday'),$repeat_days); + } } if($repeat_days <> '') { @@ -1774,10 +1784,12 @@ class calendar extends calendar_ $increment = $phpgw_info['user']['preferences']['calendar']['interval']; $interval = (int)(60 / $increment); - $str = '
'.$phpgw->common->show_date($date['raw'],'l, F d, Y').'
'; + $str = '
'.lang($phpgw->common->show_date($date['raw'],'l')); + $str .= ', '.lang($phpgw->common->show_date($date['raw'],'F')); + $str .= ' '.$phpgw->common->show_date($date['raw'],'d, Y').'
'; $str .= ''; $str .= ''; - $str .= ''; + $str .= ''; for($i=0;$i<24;$i++) { for($j=0;$j<$interval;$j++) diff --git a/calendar/search.php b/calendar/search.php index 97e157b441..d8692bab66 100755 --- a/calendar/search.php +++ b/calendar/search.php @@ -92,7 +92,7 @@ if ($matches == 1) { - $quantity = '1 match found.'; + $quantity = lang('1 match found').'.'; } elseif ($matches > 0) { diff --git a/calendar/viewmatrix.php b/calendar/viewmatrix.php index 7d07980cc6..b7959574e1 100755 --- a/calendar/viewmatrix.php +++ b/calendar/viewmatrix.php @@ -86,7 +86,7 @@ { echo ' '."\n"; } - echo ' '."\n"; + echo ' '."\n"; echo ' '."\n"; echo ''."\n"; diff --git a/calendar/year.php b/calendar/year.php index ffcb2d41d7..8c57a4e590 100755 --- a/calendar/year.php +++ b/calendar/year.php @@ -10,26 +10,38 @@ * option) any later version. * \**************************************************************************/ - /* $Id$ */ + /* $Id$ */ - $phpgw_info["flags"] = array("currentapp" => "calendar", "enable_nextmatchs_class" => True); - - if (isset($friendly) && $friendly){ - $phpgw_info["flags"]["noheader"] = True; - $phpgw_info["flags"]["nonavbar"] = True; - $phpgw_info["flags"]["noappheader"] = True; - $phpgw_info["flags"]["noappfooter"] = True; - $phpgw_info["flags"]["nofooter"] = True; - } else { - $friendly = 0; - } - include("../header.inc.php"); + if (isset($friendly) && $friendly) + { + $phpgw_flags = Array( + 'currentapp' => 'calendar', + 'enable_nextmatchs_class' => True, + 'noheader' => True, + 'nonavbar' => True, + 'noappheader' => True, + 'noappfooter' => True, + 'nofooter' => True + ); + } + else + { + $friendly = 0; + $phpgw_flags = Array( + 'currentapp' => 'calendar', + 'enable_nextmatchs_class' => True + ); + } - $view = "year"; + $phpgw_info['flags'] = $phpgw_flags; + include('../header.inc.php'); - if ($friendly) { - echo ''; - } + $view = 'year'; + + if ($friendly) + { + echo ''; + } ?>
@@ -37,30 +49,30 @@
link('/'.$phpgw_info['flags']['currentapp'].'/year.php',"year=" . ($year - 1)) . "\"><<"; + echo ' - link('/'.$phpgw_info['flags']['currentapp'].'/year.php',"year=" . ($year + 1)) . "\">>>"; + echo '"; + echo '"; - if($i==6) echo ""; + echo ''; + if($i==6) echo ''; } ?> @@ -68,12 +80,12 @@ link("year.php","friendly=1&" - . "&year=$year") . "\"TARGET=\"cal_printer_friendly\" onMouseOver=\"window." - . "status = '" . lang("Generate printer-friendly version") . "'\">[" - . lang("Printer Friendly") . "]"; - } + if (! $friendly) + { + echo ' ['.lang('Printer Friendly').']'; + } if(!isset($friendly) || $friendly == False) { $phpgw->common->phpgw_footer(); diff --git a/setup/phpgw_en.lang b/setup/phpgw_en.lang index 06ee909980..94cd687518 100644 --- a/setup/phpgw_en.lang +++ b/setup/phpgw_en.lang @@ -1,6 +1,7 @@ 1 match found calendar en 1 match found 1 message has been deleted email en 1 message has been deleted -a calendar en +a calendar en a +accepted calendar en Accepted access common en Access access not permitted common en Access not permitted access type common en Access type @@ -389,6 +390,7 @@ no common en No no_file_name filemanager en No filename was specified no matches found. calendar en No matches found. no matchs found admin en No matchs found +no repsonse calendar en No Response none common en None non-standard email en Non-Standard normal common en Normal @@ -416,6 +418,7 @@ pager addressbook en Pager parcel addressbook en Parcel parent category common en Parent Category parent project todo en parent project +particpant calendar en Participant participants calendar en Participants password common en Password password has been updated common en Password has been updated @@ -461,10 +464,12 @@ record owner addressbook en Record owner re-edit event calendar en Re-Edit Event re-enter password admin en Re-enter password re-enter your password preferences en Re-Enter your password +refresh calendar en Refresh region admin en Region regions admin en Regions regions weather en Regions region weather en Region +rejected calendar en Rejected remove all users from this group admin en Remove all users from this group rename common en Rename rename_to filemanager en Rename to @@ -546,6 +551,7 @@ switch to bookkeeping en Switch to table admin en Table tables weather en Tables target language transy en Target Language +tentative calendar en Tentative text only preferences en Text only that category name has been used already ! admin en That category name has been used already ! that loginid has already been taken admin en That loginid has already been taken
Participant
'.lang('Participant').'
<<'; ?> " align="center"> - + + >>'; ?>
'; if(!$friendly) - echo $phpgw->calendar->mini_calendar($i,$i,$year,"day.php"); + echo $phpgw->calendar->mini_calendar($i,$i,$year,'day.php'); else echo $phpgw->calendar->mini_calendar($i,$i,$year); - echo "