[Phpgroupware-cvs] CVS: preferences preferences.php,1.13.2.8.2.13,1.13.2.8.2.14

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/preferences
In directory subversions:/tmp/cvs-serv9815

Modified Files:
      Tag: Version-0_9_16-branch
        preferences.php 
Log Message:
fix that substitutions in defaults, show for the user-prefs, get translated too


Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/preferences.php,v
retrieving revision 1.13.2.8.2.13
retrieving revision 1.13.2.8.2.14
diff -C2 -r1.13.2.8.2.13 -r1.13.2.8.2.14
*** preferences.php     19 May 2003 22:59:47 -0000      1.13.2.8.2.13
--- preferences.php     20 May 2003 00:02:41 -0000      1.13.2.8.2.14
***************
*** 114,117 ****
--- 114,122 ----
                {
                        $def_text = 
!$GLOBALS['phpgw']->preferences->user[$_appname][$name] ? 
$GLOBALS['phpgw']->preferences->data[$_appname][$name] : 
$GLOBALS['phpgw']->preferences->default[$_appname][$name];
+ 
+                       if (isset($notifys[$name]))     // translate the 
substitution names
+                       {
+                               $def_text = 
$GLOBALS['phpgw']->preferences->lang_notify($def_text,$notifys[$name]);
+                       }
                        $def_text = $def_text != '' ? ' <i><font 
size="-1">'.lang('default').':&nbsp;'.$def_text.'</font></i>' : '';
                }
***************
*** 262,266 ****
        function 
create_text_area($label,$name,$rows,$cols,$help='',$default='',$run_lang=True)
        {
!               global $t,$prefs;
  
                $_appname = check_app();
--- 267,271 ----
        function 
create_text_area($label,$name,$rows,$cols,$help='',$default='',$run_lang=True)
        {
!               global $t,$prefs,$notifys;
  
                $_appname = check_app();
***************
*** 278,281 ****
--- 283,291 ----
                {
                        $def_text = 
!$GLOBALS['phpgw']->preferences->user[$_appname][$name] ? 
$GLOBALS['phpgw']->preferences->data[$_appname][$name] : 
$GLOBALS['phpgw']->preferences->default[$_appname][$name];
+ 
+                       if (isset($notifys[$name]))     // translate the 
substitution names
+                       {
+                               $def_text = 
$GLOBALS['phpgw']->preferences->lang_notify($def_text,$notifys[$name]);
+                       }
                        $def_text = $def_text != '' ? '<br><i><font 
size="-1"><b>'.lang('default').'</b>:<br>'.nl2br($def_text).'</font></i>' : '';
                }