[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.31,1.71.2.32 class.uicalendar.inc.php,1.66.2.52,1.66.2.53

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv22310/calendar/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php class.uicalendar.inc.php 
Log Message:
Modified all x's into %'s in lang calls and lang files.


Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.31
retrieving revision 1.71.2.32
diff -C2 -r1.71.2.31 -r1.71.2.32
*** class.bocalendar.inc.php    26 Feb 2003 16:21:29 -0000      1.71.2.31
--- class.bocalendar.inc.php    27 Feb 2003 22:27:21 -0000      1.71.2.32
***************
*** 2210,2214 ****
                                                        $action_date = 
$old_event_date;
                                                        $body = 'On 
'.$GLOBALS['phpgw']->common->show_date(time() - 
$GLOBALS['phpgw']->datetime->tz_offset).' 
'.$GLOBALS['phpgw']->common->grab_owner_name($GLOBALS['phpgw_info']['user']['account_id']).'
 '.$action.' your meeting request for '.$old_event_date;
!                                                       $body = lang('On x x x 
your meeting request for x',$GLOBALS['phpgw']->common->show_date(time() - 
$GLOBALS['phpgw']->datetime->tz_offset),$GLOBALS['phpgw']->common->grab_owner_name($GLOBALS['phpgw_info']['user']['account_id']),lang($action),$old_event_date);
                                                        
$event_head=$old_event['title'];
                                                        
$event_description=$old_event['description'];
--- 2210,2214 ----
                                                        $action_date = 
$old_event_date;
                                                        $body = 'On 
'.$GLOBALS['phpgw']->common->show_date(time() - 
$GLOBALS['phpgw']->datetime->tz_offset).' 
'.$GLOBALS['phpgw']->common->grab_owner_name($GLOBALS['phpgw_info']['user']['account_id']).'
 '.$action.' your meeting request for '.$old_event_date;
!                                                       $body = lang('On %1 %2 
%3 your meeting request for %4',$GLOBALS['phpgw']->common->show_date(time() - 
$GLOBALS['phpgw']->datetime->tz_offset),$GLOBALS['phpgw']->common->grab_owner_name($GLOBALS['phpgw_info']['user']['account_id']),lang($action),$old_event_date);
                                                        
$event_head=$old_event['title'];
                                                        
$event_description=$old_event['description'];

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.52
retrieving revision 1.66.2.53
diff -C2 -r1.66.2.52 -r1.66.2.53
*** class.uicalendar.inc.php    26 Feb 2003 18:54:20 -0000      1.66.2.52
--- class.uicalendar.inc.php    27 Feb 2003 22:27:21 -0000      1.66.2.53
***************
*** 2172,2176 ****
                        elseif ($matches > 0)
                        {
!                               $quantity = lang('x matches 
found',$matches).'.';
                        }
                        else
--- 2172,2176 ----
                        elseif ($matches > 0)
                        {
!                               $quantity = lang('%1 matches 
found',$matches).'.';
                        }
                        else
***************
*** 2688,2692 ****
                                'color'         => $this->theme['bg_text'],
                                'overlap_title' => lang('Scheduling Conflict'),
!                               'overlap_text'  => lang('Your suggested time of 
<B> x - x </B> conflicts with the following existing calendar 
entries:',$GLOBALS['phpgw']->common->show_date($start),$GLOBALS['phpgw']->common->show_date($end)),
                                'overlap_list'  => $overlap
                        );
--- 2688,2692 ----
                                'color'         => $this->theme['bg_text'],
                                'overlap_title' => lang('Scheduling Conflict'),
!                               'overlap_text'  => lang('Your suggested time of 
<B> %1 - %2 </B> conflicts with the following existing calendar 
entries:',$GLOBALS['phpgw']->common->show_date($start),$GLOBALS['phpgw']->common->show_date($end)),
                                'overlap_list'  => $overlap
                        );