[Phpgroupware-cvs] CVS: timetrack hourslist.php,1.4.2.1,1.4.2.2 jobslist.php,1.10.2.1,1.10.2.2

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/timetrack
In directory subversions:/tmp/cvs-serv8198/timetrack

Modified Files:
      Tag: Version-0_9_14-branch
        hourslist.php jobslist.php 
Log Message:
Changed all x's to %'s in the api (will be commited by Ralf) and the other apps 
using them.


Index: hourslist.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/hourslist.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** hourslist.php       14 Mar 2002 19:26:33 -0000      1.4.2.1
--- hourslist.php       3 Mar 2003 22:27:13 -0000       1.4.2.2
***************
*** 82,86 ****
          echo "<br>" . lang("your search returned 1 match");
     } else {
!         echo "<br>" . lang("your search returned x 
matchs",$GLOBALS['phpgw']->db->f(0));
     }
    } else { //no query
--- 82,86 ----
          echo "<br>" . lang("your search returned 1 match");
     } else {
!         echo "<br>" . lang("your search returned %1 
matchs",$GLOBALS['phpgw']->db->f(0));
     }
    } else { //no query
***************
*** 92,98 ****
       $end = $start + 
$GLOBALS['phpgw_info']["user"]["preferences"]["common"]["maxmatchs"];
       if ($end > $GLOBALS['phpgw']->db->f(0)) $end = 
$GLOBALS['phpgw']->db->f(0);
!      echo "<br>" . lang("showing x - x of x",($start + 
1),$end,$GLOBALS['phpgw']->db->f(0));
    } else {
!      echo "<br>" . lang("showing x",$GLOBALS['phpgw']->db->f(0)); 
    }
  
--- 92,98 ----
       $end = $start + 
$GLOBALS['phpgw_info']["user"]["preferences"]["common"]["maxmatchs"];
       if ($end > $GLOBALS['phpgw']->db->f(0)) $end = 
$GLOBALS['phpgw']->db->f(0);
!      echo "<br>" . lang("showing %1 - %2 of %3",($start + 
1),$end,$GLOBALS['phpgw']->db->f(0));
    } else {
!      echo "<br>" . lang("showing %1",$GLOBALS['phpgw']->db->f(0)); 
    }
  

Index: jobslist.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/jobslist.php,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -r1.10.2.1 -r1.10.2.2
*** jobslist.php        14 Mar 2002 19:26:33 -0000      1.10.2.1
--- jobslist.php        3 Mar 2003 22:27:13 -0000       1.10.2.2
***************
*** 128,132 ****
     //     $t->set_var("lang_matches", lang("your search returned 1 match"));
     //} else {
!    //  $t->set_var("lang_matches", lang("your search returned x 
matchs",$matches));
     //}
    } else { //no query
--- 128,132 ----
     //     $t->set_var("lang_matches", lang("your search returned 1 match"));
     //} else {
!    //  $t->set_var("lang_matches", lang("your search returned %1 
matchs",$matches));
     //}
    } else { //no query
***************
*** 140,146 ****
       $end = $start + 
$GLOBALS['phpgw_info']["user"]["preferences"]["common"]["maxmatchs"];
       if ($end > $matches) $end = $matches;
!      $t->set_var("lang_showing", lang("showing x - x of x",($start + 
1),$end,$matches));
    } else {
!      $t->set_var("lang_showing", lang("showing x",$matches));
    }
  
--- 140,146 ----
       $end = $start + 
$GLOBALS['phpgw_info']["user"]["preferences"]["common"]["maxmatchs"];
       if ($end > $matches) $end = $matches;
!      $t->set_var("lang_showing", lang("showing %1 - %2 of %3",($start + 
1),$end,$matches));
    } else {
!      $t->set_var("lang_showing", lang("showing %1",$matches));
    }