e-smith-base/sme8/e-smith-base-4.18.1-localeemail.patch

diff -urN orig/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/review localeemail/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/review
--- orig/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/review 2008-03-27 03:49:00.000000000 +1100
+++ localeemail/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/review  2008-09-23 11:05:34.000000000 +1000
@@ -104,6 +104,18 @@
         <trans>Email Addresses</trans>
     </entry>
     <entry>
+        <base>EMAIL_USERACCOUNT</base>
+        <trans>useraccount</trans>
+    </entry>
+    <entry>
+        <base>EMAIL_FIRSTNAME</base>
+        <trans>firstname</trans>
+    </entry>
+    <entry>
+        <base>EMAIL_LASTNAME</base>
+        <trans>lastname</trans>
+    </entry>
+    <entry>
         <base>NO_VIRTUAL_DOMAINS</base>
         <trans>No virtual domains defined</trans>
     </entry>
diff -urN orig/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/review.pm localeemail/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/review.pm
--- orig/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/review.pm 2005-11-21 15:28:10.000000000 +1100
+++ localeemail/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/review.pm  2008-09-23 11:39:58.000000000 +1000
@@ -283,9 +283,13 @@
     my $fm = shift;
 
     my $domain = get_value($fm,'DomainName'); 
-        my $out = "<I>useraccount</I>\@" . $domain . "<BR>"
-        . "<I>firstname</I>.<I>lastname</I>\@" . $domain . "<BR>"
-        . "<I>firstname</I>_<I>lastname</I>\@" . $domain . "<BR>"; 
+    my $useraccount = $fm->localise("EMAIL_USERACCOUNT");
+    my $firstname = $fm->localise("EMAIL_FIRSTNAME");
+    my $lastname = $fm->localise("EMAIL_LASTNAME");
+
+        my $out = "<I>" . $useraccount . "</I>\@" . $domain . "<BR>"
+        . "<I>" . $firstname . "</I>.<I>" . $lastname . "</I>\@" . $domain . "<BR>"
+        . "<I>" . $firstname . "</I>_<I>" . $lastname . "</I>\@" . $domain . "<BR>"; 
 
         return $out;
 }
@@ -400,7 +404,7 @@
        'https://'. (get_value('','SystemName') || 'localhost').'/server-manager/'  );
     print_row($self,'MITEL_NETWORKS_SME_SERVER_USER_PASSWORD_PANEL',
        'https://'. (get_value($self,'SystemName') || 'localhost').'/user-password/' );
-    print_row($self,'EMAIL_ADDRESSES', gen_email_addresses() );
+    print_row($self,'EMAIL_ADDRESSES', gen_email_addresses($self) );
     print "</table>";
 }
 
1	slords	1.1.2.1	diff -urN orig/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/review localeemail/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/review
2			--- orig/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/review 2008-03-27 03:49:00.000000000 +1100
3			+++ localeemail/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/review 2008-09-23 11:05:34.000000000 +1000
4			@@ -104,6 +104,18 @@
5			<trans>Email Addresses</trans>
6			</entry>
7			<entry>
8			+ <base>EMAIL_USERACCOUNT</base>
9			+ <trans>useraccount</trans>
10			+ </entry>
11			+ <entry>
12			+ <base>EMAIL_FIRSTNAME</base>
13			+ <trans>firstname</trans>
14			+ </entry>
15			+ <entry>
16			+ <base>EMAIL_LASTNAME</base>
17			+ <trans>lastname</trans>
18			+ </entry>
19			+ <entry>
20			<base>NO_VIRTUAL_DOMAINS</base>
21			<trans>No virtual domains defined</trans>
22			</entry>
23			diff -urN orig/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/review.pm localeemail/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/review.pm
24			--- orig/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/review.pm 2005-11-21 15:28:10.000000000 +1100
25			+++ localeemail/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/review.pm 2008-09-23 11:39:58.000000000 +1000
26			@@ -283,9 +283,13 @@
27			my $fm = shift;
28
29			my $domain = get_value($fm,'DomainName');
30			- my $out = "<I>useraccount</I>\@" . $domain . "<BR>"
31			- . "<I>firstname</I>.<I>lastname</I>\@" . $domain . "<BR>"
32			- . "<I>firstname</I>_<I>lastname</I>\@" . $domain . "<BR>";
33			+ my $useraccount = $fm->localise("EMAIL_USERACCOUNT");
34			+ my $firstname = $fm->localise("EMAIL_FIRSTNAME");
35			+ my $lastname = $fm->localise("EMAIL_LASTNAME");
36			+
37			+ my $out = "<I>" . $useraccount . "</I>\@" . $domain . "<BR>"
38			+ . "<I>" . $firstname . "</I>.<I>" . $lastname . "</I>\@" . $domain . "<BR>"
39			+ . "<I>" . $firstname . "</I>_<I>" . $lastname . "</I>\@" . $domain . "<BR>";
40
41			return $out;
42			}
43			@@ -400,7 +404,7 @@
44			'https://'. (get_value('','SystemName') \|\| 'localhost').'/server-manager/' );
45			print_row($self,'MITEL_NETWORKS_SME_SERVER_USER_PASSWORD_PANEL',
46			'https://'. (get_value($self,'SystemName') \|\| 'localhost').'/user-password/' );
47			- print_row($self,'EMAIL_ADDRESSES', gen_email_addresses() );
48			+ print_row($self,'EMAIL_ADDRESSES', gen_email_addresses($self) );
49			print "</table>";
50			}
51