[Phpgroupware-cvs] CVS: addressbook/inc class.uifields.inc.php,1.10,1.11 hook_home.inc.php,1.21,1.22 hook_notifywindow.inc.php,1.6,1.7

[Guillaume Courtois <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv26597/addressbook/inc

Modified Files:
        class.uifields.inc.php hook_home.inc.php 
        hook_notifywindow.inc.php 
Log Message:
Changed all x's into %'s, suppressed useless phrases, added missing ones and 
french translations.


Index: class.uifields.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uifields.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uifields.inc.php      18 Apr 2003 08:06:35 -0000      1.10
--- class.uifields.inc.php      27 Apr 2003 21:12:59 -0000      1.11
***************
*** 174,178 ****
                        if(($submit) && (! $error) && (! $errorcount))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('message',lang('Field x has been added !', 
$field_name));
                        }
                        if((!$submit) && (! $error) && (! $errorcount))
--- 174,178 ----
                        if(($submit) && (! $error) && (! $errorcount))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('message',lang('Field %1 has been added 
!', $field_name));
                        }
                        if((!$submit) && (! $error) && (! $errorcount))
***************
*** 236,240 ****
                                if(!$field_name)
                                {
!                                       $error[$errorcount++] = lang('Please 
enter a name for that field!');
                                }
  
--- 236,240 ----
                                if(!$field_name)
                                {
!                                       $error[$errorcount++] = lang('Please 
enter a name for that field !');
                                }
  
***************
*** 253,257 ****
                        if(($submit) && (! $error) && (!$errorcount))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('message',lang('Field x has been updated 
!', $field_name));
                        }
                        if((!$submit) && (!$error) && (!$errorcount))
--- 253,257 ----
                        if(($submit) && (! $error) && (!$errorcount))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('message',lang('Field %1 has been updated 
!', $field_name));
                        }
                        if((!$submit) && (!$error) && (!$errorcount))

Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/hook_home.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** hook_home.inc.php   15 Feb 2003 20:52:18 -0000      1.21
--- hook_home.inc.php   27 Apr 2003 21:12:59 -0000      1.22
***************
*** 46,50 ****
                                $GLOBALS['phpgw']->portalbox->data[] = array
                                (
!                                       'text'                                  
=> lang("Today is x's birthday!", $val['n_given'] . ' ' . $val['n_family']),
                                        'link'                                  
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 .  $val['id']),
                                        'lang_link_statustext'  => lang('show 
contact')
--- 46,50 ----
                                $GLOBALS['phpgw']->portalbox->data[] = array
                                (
!                                       'text'                                  
=> lang("Today is %1's birthday!", $val['n_given'] . ' ' . $val['n_family']),
                                        'link'                                  
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 .  $val['id']),
                                        'lang_link_statustext'  => lang('show 
contact')
***************
*** 63,67 ****
                                $GLOBALS['phpgw']->portalbox->data[] = array
                                (
!                                       'text'                                  
=> lang("Tomorrow is x's birthday.", $val['n_given'] . ' ' . $val['n_family']),
                                        'link'                                  
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id']),
                                        'lang_link_statustext'  => lang('show 
contact')
--- 63,67 ----
                                $GLOBALS['phpgw']->portalbox->data[] = array
                                (
!                                       'text'                                  
=> lang("Tomorrow is %1's birthday.", $val['n_given'] . ' ' . $val['n_family']),
                                        'link'                                  
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='.$val['id']),
                                        'lang_link_statustext'  => lang('show 
contact')

Index: hook_notifywindow.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/hook_notifywindow.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** hook_notifywindow.inc.php   28 Sep 2002 20:01:43 -0000      1.6
--- hook_notifywindow.inc.php   27 Apr 2003 21:12:59 -0000      1.7
***************
*** 46,50 ****
                                . 
$GLOBALS['phpgw']->link('/.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 .  $val['id']) . '">'
                                . $val['n_given'] . ' ' . $val['n_family'] . 
'</a>';
!                       echo '<tr><td align="left">' . lang("Today is x's 
birthday!", $tmp) . "</td></tr>\n";
                }
  
--- 46,50 ----
                                . 
$GLOBALS['phpgw']->link('/.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 .  $val['id']) . '">'
                                . $val['n_given'] . ' ' . $val['n_family'] . 
'</a>';
!                       echo '<tr><td align="left">' . lang("Today is %1's 
birthday!", $tmp) . "</td></tr>\n";
                }
  
***************
*** 59,63 ****
                                . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 .  $val['id']) . '">'
                                . $val['n_given'] . ' ' . $val['n_family'] . 
'</a>';
!                       echo '<tr><td align="left">' . lang("Tomorrow is x's 
birthday.", $tmp) . "</td></tr>\n";
                }
                echo "\n<!-- Birthday info -->\n";
--- 59,63 ----
                                . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 .  $val['id']) . '">'
                                . $val['n_given'] . ' ' . $val['n_family'] . 
'</a>';
!                       echo '<tr><td align="left">' . lang("Tomorrow is %1's 
birthday.", $tmp) . "</td></tr>\n";
                }
                echo "\n<!-- Birthday info -->\n";