[Phpgroupware-cvs] CVS: calendar/inc class.holidaycalc_JP.inc.php,1.1.2.4,1.1.2.5

[Yoshihiro Kamimura <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.holidaycalc_JP.inc.php 
Log Message:
The correspondence of Bug #1195.

Index: class.holidaycalc_JP.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.holidaycalc_JP.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** class.holidaycalc_JP.inc.php        13 Sep 2002 07:55:12 -0000      1.1.2.4
--- class.holidaycalc_JP.inc.php        13 Sep 2002 09:26:36 -0000      1.1.2.5
***************
*** 103,107 ****
                                $addcnt = count($holidays) + 1;
                                $holidays[$addcnt]['locale'] = 
$holiday['locale'];
!                               $holidays[$addcnt]['name'] = lang('people 
holiday');
                                $holidays[$addcnt]['day'] = $day - 1;
                                $holidays[$addcnt]['month'] = $holiday['month'];
--- 103,114 ----
                                $addcnt = count($holidays) + 1;
                                $holidays[$addcnt]['locale'] = 
$holiday['locale'];
!                               if ($pdow == 1)
!                               {
!                                       $holidays[$addcnt]['name'] = 
lang('overlap holiday');
!                               }
!                               else
!                               {
!                                       $holidays[$addcnt]['name'] = 
lang('people holiday');
!                               }
                                $holidays[$addcnt]['day'] = $day - 1;
                                $holidays[$addcnt]['month'] = $holiday['month'];