[Phpgroupware-cvs] CVS: dj editdirectory.php,1.4,1.5 adddirectory.php,1.4,1.5 import.php,1.12,1.13 scan.php,1.6,1.7

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/dj
In directory subversions:/tmp/cvs-serv19721/dj

Modified Files:
        editdirectory.php adddirectory.php import.php scan.php 
Log Message:
Suppressed a doublon, changed all x's into %'s and added french translations.


Index: editdirectory.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/editdirectory.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** editdirectory.php   30 Apr 2002 18:27:02 -0000      1.4
--- editdirectory.php   25 May 2003 21:28:30 -0000      1.5
***************
*** 39,43 ****
        {
                $errorcount = 0;
!               if (!$dir_name) { $error[$errorcount++] = lang('Please enter a 
name for that directory!'); }
  
                $GLOBALS['phpgw']->db->query("SELECT count(*) from 
phpgw_dj_directories WHERE dir_name='$dir_name' AND dir_id !='$dir_id'");
--- 39,43 ----
        {
                $errorcount = 0;
!               if (!$dir_name) { $error[$errorcount++] = lang('Please enter a 
name for that directory !'); }
  
                $GLOBALS['phpgw']->db->query("SELECT count(*) from 
phpgw_dj_directories WHERE dir_name='$dir_name' AND dir_id !='$dir_id'");

Index: adddirectory.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/adddirectory.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** adddirectory.php    30 Apr 2002 18:27:02 -0000      1.4
--- adddirectory.php    25 May 2003 21:28:30 -0000      1.5
***************
*** 56,60 ****
  
        if ($errorcount) { 
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
 }
!       if (($submit) && (! $error) && (! $errorcount)) { 
$GLOBALS['phpgw']->template->set_var('message',lang('Directory x has been added 
!', $dir_name)); }
        if ((! $submit) && (! $error) && (! $errorcount)) { 
$GLOBALS['phpgw']->template->set_var('message',''); }
  
--- 56,60 ----
  
        if ($errorcount) { 
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
 }
!       if (($submit) && (! $error) && (! $errorcount)) { 
$GLOBALS['phpgw']->template->set_var('message',lang('Directory %1 has been 
added !', $dir_name)); }
        if ((! $submit) && (! $error) && (! $errorcount)) { 
$GLOBALS['phpgw']->template->set_var('message',''); }
  

Index: import.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/import.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** import.php  30 Apr 2002 18:27:02 -0000      1.12
--- import.php  25 May 2003 21:28:30 -0000      1.13
***************
*** 120,124 ****
                                
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
                                . '">'.lang("OK").'</a>';
!                       //echo "<br>" . lang('Successfully imported x 
records',$num);
                        if($num)
                        {
--- 120,124 ----
                                
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
                                . '">'.lang("OK").'</a>';
!                       //echo "<br>" . lang('Successfully imported %1 
records',$num);
                        if($num)
                        {

Index: scan.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/scan.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** scan.php    15 Sep 2001 12:02:51 -0000      1.6
--- scan.php    25 May 2003 21:28:30 -0000      1.7
***************
*** 66,70 ****
        {
                echo '<a href="'.$GLOBALS['phpgw']->link('/dj/index.php') . 
'">'.lang('OK').'</a>';
!               //echo "<br>" . lang('Successfully imported x records',$num);
                if($num)
                {
--- 66,70 ----
        {
                echo '<a href="'.$GLOBALS['phpgw']->link('/dj/index.php') . 
'">'.lang('OK').'</a>';
!               //echo "<br>" . lang('Successfully imported %1 records',$num);
                if($num)
                {