[freeside-commits] freeside/httemplate/edit/cust_main/first_pkg select-part_pkg.html, 1.5, 1.6 svc_acct.html, 1.2, 1.3

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/first_pkg
In directory wavetail.420.am:/tmp/cvs-serv4782/edit/cust_main/first_pkg

Modified Files:
	select-part_pkg.html svc_acct.html 
Log Message:
internationalization/localization, RT12515

Index: svc_acct.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/first_pkg/svc_acct.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- svc_acct.html	22 Aug 2009 00:22:08 -0000	1.2
+++ svc_acct.html	23 May 2011 16:25:27 -0000	1.3
@@ -1,7 +1,7 @@
 <% ntable("#cccccc") %>
 
   <TR>
-    <TD ALIGN="right">Username</TD>
+    <TD ALIGN="right"><% mt('Username') |h %></TD>
     <TD>
       <INPUT TYPE      = "text"
              NAME      = "username"
@@ -13,16 +13,16 @@
   </TR>
 
   <TR>
-    <TD ALIGN="right">Domain</TD>
+    <TD ALIGN="right"><% mt('Domain') |h %></TD>
     <TD>
       <SELECT NAME="domsvc">
-        <OPTION>(none)</OPTION>
+        <OPTION>(<% mt('none') |h %>)</OPTION>
       </SELECT>
     </TD>
   </TR>
 
   <TR>
-    <TD ALIGN="right">Password</TD>
+    <TD ALIGN="right"><% mt('Password') |h %></TD>
     <TD>
       <INPUT TYPE      = "text"
              NAME      = "_password"
@@ -37,7 +37,7 @@
 
 % if ( $opt{'password_verify'} ) {
     <TR>
-      <TD ALIGN="right">Re-enter Password</TD>
+      <TD ALIGN="right"><% mt('Re-enter Password') |h %></TD>
       <TD>
         <INPUT TYPE      = "text"
                NAME      = "_password2"
@@ -50,7 +50,7 @@
 
 % if ( $conf->exists('security_phrase') ) {
     <TR>
-      <TD ALIGN="right">Security Phrase</TD>
+      <TD ALIGN="right"><% mt('Security Phrase') |h %></TD>
       <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="<% $opt{'sec_phrase'} %>">
       </TD>
     </TR>
@@ -62,7 +62,7 @@
     <INPUT TYPE="hidden" NAME="popnum" VALUE="">
 % } else {
     <TR>
-      <TD ALIGN="right">Access number</TD>
+      <TD ALIGN="right"><% mt('Access number') |h %></TD>
 %#           XXX should gain "area code" selection and labels on the dropdowns
       <TD><% FS::svc_acct_pop::popselector($opt{'popnum'}) %></TD>
     </TR>
@@ -72,14 +72,10 @@
 
 <%init>
 
-#use FS::svc_acct_pop;
-
 my( %opt ) = @_;
 
 my $conf = new FS::Conf;
 
-#false laziness: (mostly) copied from edit/svc_acct.cgi
-#$ulen = $svc_acct->dbdef_table->column('username')->length;
 my $ulen = dbdef->table('svc_acct')->column('username')->length;
 my $ulen2 = $ulen+2;
 my $passwordmax = $conf->config('passwordmax') || 8;

Index: select-part_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/first_pkg/select-part_pkg.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- select-part_pkg.html	22 Mar 2011 06:00:54 -0000	1.5
+++ select-part_pkg.html	23 May 2011 16:25:27 -0000	1.6
@@ -1,14 +1,12 @@
-<% include('/elements/xmlhttp.html',
+<& /elements/xmlhttp.html,
               'url'  => $url_prefix.'misc/svc_acct-domains.cgi',
               'subs' => [ $opt{'prefix'}. 'get_domains' ],
-           )
-%>
+&>
 
-<% include('/elements/xmlhttp.html',
+<& /elements/xmlhttp.html,
               'url'  => $url_prefix.'misc/part_svc-columns.cgi',
               'subs' => [ $opt{'prefix'}. 'get_part_svc' ],
-           )
-%>
+&>
 
 <INPUT TYPE="hidden" NAME="svcdb" VALUE="">
 
@@ -101,19 +99,16 @@
 
 </SCRIPT>
 
-<% include( '/elements/selectlayers.html',
+<& /elements/selectlayers.html,
               'field'        => $opt{'prefix'}. 'pkgpart_svcpart',
               'curr_value'   => $opt{pkgpart_svcpart},
               'options'      => \@options,
               'labels'       => \%labels,
               'html_between' => '</TD></TR></TABLE>',
-              #'onchange'     => $opt{'prefix'}. 'pkgpart_svcpart_changed(this,0);',
               'onchange'     => $opt{'prefix'}. 'pkgpart_svcpart_changed_too(what,0)',
-
               'layer_callback' => $layer_callback,
               'layermap'       => \%layermap,
-          )
-%>
+&>
 
 <SCRIPT TYPE="text/javascript">
   pkgpart_svcpart_changed_too( document.CustomerForm.pkgpart_svcpart,
@@ -156,13 +151,9 @@
 
 my $layer_callback = sub {
   my $layer = shift;
-  #$layer_fields, $layer_values, $layer_prefix
-
-#  my( $pkgpart, $svcpart ) = split('_', $layer);
-#  my $svcdb = $svcdb{$pkgpart};
   my $svcdb = $layer;
 
-  return '' unless $svcdb; #'<BR><BR><BR><BR><BR>'
+  return '' unless $svcdb; 
 
   #full path cause we're being slung around as a coderef (mason closures?)
   include("/edit/cust_main/first_pkg/$svcdb.html", %opt, );