[Phpgroupware-cvs] CVS: ftp index.php,1.17,1.18

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/ftp
In directory subversions:/tmp/cvs-serv1269/ftp

Modified Files:
        index.php 
Log Message:
What a mess ! Changed phrases to have %1 in lang calls and correspond to lang 
files.
Changed all lang files to be correct (I hope).


Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/ftp/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** index.php   11 May 2002 23:58:49 -0000      1.17
--- index.php   30 May 2003 21:59:12 -0000      1.18
***************
*** 117,125 ****
                                        if($retval)
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var("misc_data",lang('deleted',"$olddir/$file"),
 true);
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('failed to delete', 
"$olddir/$file"), true);
                                        }
                                }
--- 117,125 ----
                                        if($retval)
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var("misc_data",lang('Successfully deleted 
%1',"$olddir/$file"), true);
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('Failed to delete %1', 
"$olddir/$file"), true);
                                        }
                                }
***************
*** 136,145 ****
                                        if(ftp_rename($ftp,$olddir . '/' . 
$filename, $olddir . '/' . $newfilename))
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('renamed',
                                                        "$filename", 
"$newfilename"), true);
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('failed to rename',
                                                        "$filename", 
"$newfilename"), true);
                                        }
--- 136,145 ----
                                        if(ftp_rename($ftp,$olddir . '/' . 
$filename, $olddir . '/' . $newfilename))
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('renamed %1 to %2',
                                                        "$filename", 
"$newfilename"), true);
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('failed to rename %1 to 
%2',
                                                        "$filename", 
"$newfilename"), true);
                                        }
***************
*** 165,173 ****
                                if(ftp_put($ftp,$newfile, $uploadfile, 
FTP_BINARY))
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('misc_data',lang('uploaded',$newfile), 
true);
                                }
                                else
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('misc_data',lang('failed to 
upload',$newfile), true);
                                }
                                unlink($uploadfile);
--- 165,173 ----
                                if(ftp_put($ftp,$newfile, $uploadfile, 
FTP_BINARY))
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('misc_data',lang('successfully uploaded 
%1',$newfile), true);
                                }
                                else
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('misc_data',lang('failed to upload 
%1',$newfile), true);
                                }
                                unlink($uploadfile);
***************
*** 179,188 ****
                                        if(ftp_mkdir($ftp,$olddir . '/' . 
$newdirname))
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('created directory',
                                                        "$olddir/$newdirname"), 
true);
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('failed to mkdir',
                                                        "$olddir/$newdirname"), 
true);
                                        }
--- 179,188 ----
                                        if(ftp_mkdir($ftp,$olddir . '/' . 
$newdirname))
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('successfully created 
directory %1',
                                                        "$olddir/$newdirname"), 
true);
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('misc_data',lang('failed to create 
directory %1',
                                                        "$olddir/$newdirname"), 
true);
                                        }
***************
*** 341,345 ****
                                        $pass.="*";
                                }
!                               
$GLOBALS['phpgw']->template->set_var('error_message', lang('bad connection',
                                        $connInfo['ftpserver'], 
$connInfo['username'], $pass), true);
                                
$GLOBALS['phpgw']->template->parse('out','bad_connect',false);
--- 341,345 ----
                                        $pass.="*";
                                }
!                               
$GLOBALS['phpgw']->template->set_var('error_message', lang('Failed to connect 
to %1 with user %2 and password %3',
                                        $connInfo['ftpserver'], 
$connInfo['username'], $pass), true);
                                
$GLOBALS['phpgw']->template->parse('out','bad_connect',false);