[Phpgroupware-cvs] CVS: felamimail/inc display_messages.php,1.1.1.1.2.1,1.1.1.1.2.2 prefs.php,1.1.1.1.2.1,1.1.1.1.2.2

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/felamimail/inc
In directory subversions:/tmp/cvs-serv2087/felamimail/inc

Modified Files:
      Tag: Version-0_9_14-branch
        display_messages.php prefs.php 
Log Message:
Corrected the way lang calls were used : %1 instead of %s and lang ('phrase', 
param) instead of lang ('phrase'), param.


Index: display_messages.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/display_messages.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** display_messages.php        25 Feb 2002 23:58:37 -0000      1.1.1.1.2.1
--- display_messages.php        28 Feb 2003 23:00:34 -0000      1.1.1.1.2.2
***************
*** 31,35 ****
        echo "      <TD BGCOLOR=\"$color[0]\">";
        echo '         <B><CENTER>';
!       printf (lang("Welcome to %s's WebMail system"), $org_name);
        echo '         </CENTER></B>';
        echo '   <TR><TD BGCOLOR="#FFFFFF">';
--- 31,35 ----
        echo "      <TD BGCOLOR=\"$color[0]\">";
        echo '         <B><CENTER>';
!       printf (lang('Welcome to %1's WebMail system', $org_name));
        echo '         </CENTER></B>';
        echo '   <TR><TD BGCOLOR="#FFFFFF">';
***************
*** 42,46 ****
           echo "               <B>$org_name</B>";
        echo '         <BR><CENTER>';
!       printf (lang("Running SquirrelMail version %s (c) 1999-2000."), 
$version);
        echo '            </CENTER><BR>';
        echo '            </CENTER></TD></TR><TR>';
--- 42,46 ----
           echo "               <B>$org_name</B>";
        echo '         <BR><CENTER>';
!       printf (lang('Running SquirrelMail version %1 (c) 1999-2000.', 
$version));
        echo '            </CENTER><BR>';
        echo '            </CENTER></TD></TR><TR>';
***************
*** 68,72 ****
        echo '      <BR>';
        echo "         <A HREF=\"". 
$phpgw->link("/felamimail/index.php","sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox")."\">";
!       printf (lang("Click here to return to %s"), $mailbox);
        echo '</A>.';
        echo '   </TD></TR>';
--- 68,72 ----
        echo '      <BR>';
        echo "         <A HREF=\"". 
$phpgw->link("/felamimail/index.php","sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox")."\">";
!       printf (lang('Click here to return to %1', $mailbox));
        echo '</A>.';
        echo '   </TD></TR>';

Index: prefs.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/prefs.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** prefs.php   25 Feb 2002 23:58:37 -0000      1.1.1.1.2.1
--- prefs.php   28 Feb 2003 23:00:34 -0000      1.1.1.1.2.2
***************
*** 18,22 ****
        $filename = "$data_dir$username.pref";
        if (!file_exists($filename)) {
!        printf (lang("Preference file %s not found. Exiting abnormally"), 
$filename);
           $phpgw->common->phpgw_exit(True);
        }
--- 18,22 ----
        $filename = "$data_dir$username.pref";
        if (!file_exists($filename)) {
!        printf (lang('Preference file %1 not found. Exiting abnormally', 
$filename));
           $phpgw->common->phpgw_exit(True);
        }
***************
*** 41,45 ****
        $found = false;
        if (!file_exists($filename)) {
!        printf (lang("Preference file, %s, does not exist. Log out, and log 
back in to create a default preference file."), $filename);
         echo "<br>\n";
           exit;
--- 41,45 ----
        $found = false;
        if (!file_exists($filename)) {
!        printf (lang('Preference file, %1, does not exist. Log out, and log 
back in to create a default preference file.', $filename));
         echo "<br>\n";
           exit;
***************
*** 82,86 ****
        $found = false;
        if (!file_exists($filename)) {
!        printf (lang("Preference file, %s, does not exist. Log out, and log 
back in to create a default preference file."), $filename);
         echo "\n<br>\n";
           exit;
--- 82,86 ----
        $found = false;
        if (!file_exists($filename)) {
!        printf (lang('Preference file, %1, does not exist. Log out, and log 
back in to create a default preference file.', $filename));
         echo "\n<br>\n";
           exit;