[Phpgroupware-cvs] CVS: bookmarks/inc class.sqlquery.inc.php,1.3,1.3.2.1 header.inc.php,1.11,1.11.2.1

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/bookmarks/inc
In directory subversions:/tmp/cvs-serv19757/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.sqlquery.inc.php header.inc.php 
Log Message:
made more phrases translatable, incl. english and german lang-file
not yet finished

Index: class.sqlquery.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.sqlquery.inc.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** class.sqlquery.inc.php      14 Jul 2001 01:41:49 -0000      1.3
--- class.sqlquery.inc.php      22 Mar 2003 13:10:35 -0000      1.3.2.1
***************
*** 40,43 ****
--- 40,44 ----
    
    ## HTML Widget dictionary
+ /* use phpgw lang() now
    var $dict = array(
      "de" => array(
***************
*** 63,67 ****
      )
    );
! 
    ## SQL comparision dictionary
    var $compare = array(
--- 64,68 ----
      )
    );
! */
    ## SQL comparision dictionary
    var $compare = array(
***************
*** 142,146 ****
      ## static values.
      if (isset($this->compare["like"])) {
!       $this->compare["like"] = $this->dict[$this->lang]["like"];
      }
      
--- 143,147 ----
      ## static values.
      if (isset($this->compare["like"])) {
!       $this->compare["like"] = lang('like');
      }
      
***************
*** 166,176 ****
        if ($i == 1) {
          $res .= sprintf("  <td%s>%s</td>\n", 
!           ($class)?" class=$class":"", 
!           $this->dict[$this->lang]["searchfor"]);
        } else {
          $res .= sprintf("  <td%s>%s</td>\n", 
            ($class)?" class=$class":"", 
            $this->selection($this->makename($base, "conj", $i),
!                            array("and" => $this->dict[$this->lang]["and"], 
"or" => $this->dict[$this->lang]["or"]),
                             $GLOBALS[$base]["conj_".$i], 
                             "on",
--- 167,176 ----
        if ($i == 1) {
          $res .= sprintf("  <td%s>%s</td>\n", 
!           ($class)?" class=$class":"",lang('Search for:'));
        } else {
          $res .= sprintf("  <td%s>%s</td>\n", 
            ($class)?" class=$class":"", 
            $this->selection($this->makename($base, "conj", $i),
!                            array("and" => lang('and'), "or" => lang('or')),
                             $GLOBALS[$base]["conj_".$i], 
                             "on",
***************
*** 217,224 ****
          ($class)?" class=$class":"",
          $this->makename($base, "more", 0),
!         $this->dict[$this->lang]["more"]);
        $res .= sprintf("<input type=\"submit\" 
name=\"%s\"value=\"%s\"></td>\n",
          $this->makename($base, "less", 0),
!         $this->dict[$this->lang]["less"]);
      } else {
        $res .= sprintf("  <td%s>&nbsp;</td>\n", ($class)?" class=$class":"");
--- 217,224 ----
          ($class)?" class=$class":"",
          $this->makename($base, "more", 0),
!         lang('More'));
        $res .= sprintf("<input type=\"submit\" 
name=\"%s\"value=\"%s\"></td>\n",
          $this->makename($base, "less", 0),
!         lang('Fewer'));
      } else {
        $res .= sprintf("  <td%s>&nbsp;</td>\n", ($class)?" class=$class":"");
***************
*** 228,235 ****
      $res .= sprintf("  <td%s><input type=\"reset\" value=\"%s\">&nbsp;",
        ($class)?" class=$class":"",
!       $this->dict[$this->lang]["reset"]);
      $res .= sprintf("<input type=\"submit\" name=\"%s\"value=\"%s\"></td>\n",
        $this->makename($base, "submit", 0),
!       $this->dict[$this->lang]["submit"]);
      
      $res .= sprintf(" </tr>\n");
--- 228,235 ----
      $res .= sprintf("  <td%s><input type=\"reset\" value=\"%s\">&nbsp;",
        ($class)?" class=$class":"",
!       lang('Clear'));
      $res .= sprintf("<input type=\"submit\" name=\"%s\"value=\"%s\"></td>\n",
        $this->makename($base, "submit", 0),
!       lang('Search'));
      
      $res .= sprintf(" </tr>\n");
***************
*** 293,301 ****
        ## If necessary, add conjunction
        if ($q != "")
!         $q .= sprintf(" %s ", 
$this->dict[$this->lang][$GLOBALS[$base]["conj_".$i]]);
        
        ## Handle "like"
        if ($GLOBALS[$base]["comp_".$i] == "like")
!         $c = $this->dict[$this->lang][$GLOBALS[$base]["comp_".$i]];
        else
          $c = $this->compare[$GLOBALS[$base]["comp_".$i]];
--- 293,301 ----
        ## If necessary, add conjunction
        if ($q != "")
!         $q .= sprintf(" %s ", lang($GLOBALS[$base]["conj_".$i]));
        
        ## Handle "like"
        if ($GLOBALS[$base]["comp_".$i] == "like")
!         $c = lang($GLOBALS[$base]["comp_".$i]);
        else
          $c = $this->compare[$GLOBALS[$base]["comp_".$i]];

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/header.inc.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** header.inc.php      17 Nov 2001 01:42:47 -0000      1.11
--- header.inc.php      22 Mar 2003 13:10:35 -0000      1.11.2.1
***************
*** 26,30 ****
                }
  
!               $tabs[1]['label'] = 'Tree view';
                $tabs[1]['link']  = 
$GLOBALS['phpgw']->link('/bookmarks/tree.php');
                if (ereg('tree.php',$PHP_SELF))
--- 26,30 ----
                }
  
!               $tabs[1]['label'] = lang('Tree view');
                $tabs[1]['link']  = 
$GLOBALS['phpgw']->link('/bookmarks/tree.php');
                if (ereg('tree.php',$PHP_SELF))
***************
*** 33,37 ****
                }
  
!               $tabs[2]['label'] = 'List';
                $tabs[2]['link']  = 
$GLOBALS['phpgw']->link('/bookmarks/list.php');
                if (ereg('list.php',$PHP_SELF))
--- 33,37 ----
                }
  
!               $tabs[2]['label'] = lang('List');
                $tabs[2]['link']  = 
$GLOBALS['phpgw']->link('/bookmarks/list.php');
                if (ereg('list.php',$PHP_SELF))
***************
*** 42,46 ****
                if (! $GLOBALS['phpgw']->acl->check('anonymous',1,'bookmarks'))
                {
!                       $tabs[3]['label'] = 'New';
                        $tabs[3]['link']  = 
$GLOBALS['phpgw']->link('/bookmarks/create.php');
                        if (ereg('create.php',$PHP_SELF))
--- 42,46 ----
                if (! $GLOBALS['phpgw']->acl->check('anonymous',1,'bookmarks'))
                {
!                       $tabs[3]['label'] = lang('New');
                        $tabs[3]['link']  = 
$GLOBALS['phpgw']->link('/bookmarks/create.php');
                        if (ereg('create.php',$PHP_SELF))
***************
*** 50,54 ****
                }
  
!               $tabs[4]['label'] = 'Search';
                $tabs[4]['link']  = 
$GLOBALS['phpgw']->link('/bookmarks/search.php');
                if (ereg('search.php',$PHP_SELF))
--- 50,54 ----
                }
  
!               $tabs[4]['label'] = lang('Search');
                $tabs[4]['link']  = 
$GLOBALS['phpgw']->link('/bookmarks/search.php');
                if (ereg('search.php',$PHP_SELF))