[Phpgroupware-cvs] CVS: bookmarks maillink.php,1.12,1.12.2.1

[Ralf Becker <address@hidden>]

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

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


Index: maillink.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/maillink.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** maillink.php        17 Nov 2001 02:51:36 -0000      1.12
--- maillink.php        22 Mar 2003 20:04:09 -0000      1.12.2.1
***************
*** 54,58 ****
                                if (empty($to) || empty($subject) || 
empty($message))
                                {
!                                       $error_msg .= "<br>Please fill out 
<B>To E-Mail Address</B>, <B>Subject</B>, and <B>Message</B>!";
                                        break;
                                }
--- 54,58 ----
                                if (empty($to) || empty($subject) || 
empty($message))
                                {
!                                       $error_msg .= '<br>'.lang('Please fill 
out <B>To E-Mail Address</B>, <B>Subject</B>, and <B>Message</B>!');
                                        break;
                                }
***************
*** 67,71 ****
                                        if (!$validate->is_email($val))
                                        {
!                                               $error_msg .= "<br>To address 
$val invalid. Format must be <strong>address@hidden</strong> and domain must 
exist!<br><small> $validate->ERROR </small>";
                                                break;
                                        }
--- 67,72 ----
                                        if (!$validate->is_email($val))
                                        {
!                                               $error_msg .= '<br>'.lang('To 
address %1 invalid. Format must be <strong>address@hidden</strong> and domain 
must exist!',$val).
!                                                       
'<br><small>'.$validate->ERROR.'</small>';
                                                break;
                                        }
***************
*** 78,82 ****
  
                                // add additional headers to our email
!                               $addl_headers = sprintf("From: %s <%s>", 
stripslashes($from_name), $from);
        
                                $addl_headers = 
sprintf('%s\n%s',$addl_headers,$GLOBALS['phpgw']->template->parse('_footer','footer'));
--- 79,83 ----
  
                                // add additional headers to our email
!                               $addl_headers = sprintf("%s: %s 
<%s>",lang('From'),stripslashes($from_name), $from);
        
                                $addl_headers = 
sprintf('%s\n%s',$addl_headers,$GLOBALS['phpgw']->template->parse('_footer','footer'));
***************
*** 85,89 ****
                                $send->msg('email',$to,$subject,$mail_message . 
$GLOBALS['phpgw']->bookmarks->config['mail_footer'],'','','','No reply 
<noreply@' . $SERVER_NAME . '>');
        
!                               $msg .= "<br>mail-this-link message sent to 
$to.";
                                break;
                        default:
--- 86,90 ----
                                $send->msg('email',$to,$subject,$mail_message . 
$GLOBALS['phpgw']->bookmarks->config['mail_footer'],'','','','No reply 
<noreply@' . $SERVER_NAME . '>');
        
!                               $msg .= '<br>'.lang('mail-this-link message 
sent to %1.',$to);
                                break;
                        default:
***************
*** 94,98 ****
        if (empty($subject))
        {
!               $subject = 'Found a link you might like';
        }
  
--- 95,99 ----
        if (empty($subject))
        {
!               $subject = lang('Found a link you might like');
        }
  
***************
*** 121,125 ****
                        echo '<pre>'; print_r($bm_id); echo '</pre>';
        
!                       while (list(,$id) = each($bm_id) && is_array($bm_id))
                        {
                                $GLOBALS['phpgw']->db->query("select * from 
phpgw_bookmarks where bm_id='$id' and $filtermethod",__LINE__,__FILE__);
--- 122,126 ----
                        echo '<pre>'; print_r($bm_id); echo '</pre>';
        
!                       while (is_array($bm_id) && (list(,$id) = each($bm_id)))
                        {
                                $GLOBALS['phpgw']->db->query("select * from 
phpgw_bookmarks where bm_id='$id' and $filtermethod",__LINE__,__FILE__);
***************
*** 143,148 ****
                }
        
!               $message = "I thought you would be interested in the following 
link(s):\n";
!               while (list(,$link) = each($links))
                {
                        $message .= sprintf("%s - 
%s\n",$link['name'],$link['url']);
--- 144,149 ----
                }
        
!               $message = lang('I thought you would be interested in the 
following link(s):')."\n";
!               while (list(,$link) = @each($links))
                {
                        $message .= sprintf("%s - 
%s\n",$link['name'],$link['url']);
***************
*** 154,157 ****
--- 155,159 ----
        $GLOBALS['phpgw']->template->set_var('lang_from',lang('Message from'));
        $GLOBALS['phpgw']->template->set_var('lang_to',lang('To E-Mail 
Addresses'));
+       $GLOBALS['phpgw']->template->set_var('lang_multiple_addr',lang('(comma 
separate multiple addresses)'));
        $GLOBALS['phpgw']->template->set_var('lang_subject',lang('Subject'));
        $GLOBALS['phpgw']->template->set_var('lang_message',lang('Message'));