[Phpgroupware-cvs] CVS: dj adddirectory.php,1.3,1.3.2.1 directories.php,1.5,1.5.2.1 import.php,1.11,1.11.2.1 scan.php,1.6,1.6.2.1

[Guillaume Courtois <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        adddirectory.php directories.php import.php scan.php 
Log Message:
Modified all x's into %'s in lang calls and lang files.


Index: adddirectory.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/adddirectory.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** adddirectory.php    15 Sep 2001 12:02:51 -0000      1.3
--- adddirectory.php    27 Feb 2003 21:48:38 -0000      1.3.2.1
***************
*** 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: directories.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/directories.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** directories.php     15 Sep 2001 12:02:51 -0000      1.5
--- directories.php     27 Feb 2003 21:48:38 -0000      1.5.2.1
***************
*** 84,92 ****
        if ($total_records > $limit)
        {
!               
$GLOBALS['phpgw']->template->set_var('lang_showing',lang("showing x - x of 
x",($start + 1),($start + $limit),$total_records));
        }
        else
        {
!               
$GLOBALS['phpgw']->template->set_var('lang_showing',lang("showing 
x",$total_records));
        }
  
--- 84,92 ----
        if ($total_records > $limit)
        {
!               
$GLOBALS['phpgw']->template->set_var('lang_showing',lang("showing %1 - %2 of 
%3",($start + 1),($start + $limit),$total_records));
        }
        else
        {
!               
$GLOBALS['phpgw']->template->set_var('lang_showing',lang("showing 
%1",$total_records));
        }
  

Index: import.php
===================================================================
RCS file: /cvsroot/phpgroupware/dj/import.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** import.php  15 Sep 2001 12:02:51 -0000      1.11
--- import.php  27 Feb 2003 21:48:38 -0000      1.11.2.1
***************
*** 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.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** scan.php    15 Sep 2001 12:02:51 -0000      1.6
--- scan.php    27 Feb 2003 21:48:38 -0000      1.6.2.1
***************
*** 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)
                {