[freeside-commits] freeside/httemplate/edit/cust_main billing.html, 1.36, 1.37 contact.html, 1.18, 1.19 first_pkg.html, 1.3, 1.4 top_misc.html, 1.8, 1.9

Erik Levinson levinse at wavetail.420.am
Mon May 23 09:25:29 PDT 2011


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

Modified Files:
	billing.html contact.html first_pkg.html top_misc.html 
Log Message:
internationalization/localization, RT12515

Index: first_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/first_pkg.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- first_pkg.html	22 Mar 2011 06:00:54 -0000	1.3
+++ first_pkg.html	23 May 2011 16:25:27 -0000	1.4
@@ -7,18 +7,16 @@
 % if ( @part_pkg ) {
 
     <BR><BR>
-    <FONT SIZE="+1"><B>First package</B></FONT>
+    <FONT SIZE="+1"><B><% mt('First package') |h %></B></FONT>
     <% ntable("#cccccc") %>
 
       <TR>
         <TD COLSPAN=2>
-          <% include('first_pkg/select-part_pkg.html',
+          <& first_pkg/select-part_pkg.html,
                        'part_pkg'  => \@part_pkg,
                        'first_svc' => \@first_svc,
                        %opt,
-                       # map { $_ => $opt{$_} } qw( pkgpart_svcpart saved_domsvc )
-                    )
-          %>
+          &>
 
 % } 
 <%init>

Index: billing.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/billing.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -d -r1.36 -r1.37
--- billing.html	9 May 2011 22:32:54 -0000	1.36
+++ billing.html	23 May 2011 16:25:27 -0000	1.37
@@ -1,5 +1,4 @@
 %if ( $payby_default eq 'HIDE' ) {
-%
 %  $cust_main->payby('BILL') unless $cust_main->payby;
 %  my $payby = $cust_main->payby;
 
@@ -35,11 +34,11 @@
 %
 %  my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
-  <BR><FONT SIZE="+1"><B>Billing information</B></FONT>
+  <BR><FONT SIZE="+1"><B><% mt('Billing information') |h %></B></FONT>
   <% &ntable("#cccccc") %>
 
     <TR>
-      <TD ALIGN="right" WIDTH="200"><%$r%>Billing type</TD>
+      <TD ALIGN="right" WIDTH="200"><%$r%><% mt('Billing type') |h %></TD>
 
   <SCRIPT>
 
@@ -106,7 +105,7 @@
 
   </SCRIPT>
 
-  <% include('/elements/init_overlib.html') %>
+  <& /elements/init_overlib.html &>
 
 %  my $payby = $cust_main->payby;
 %  my $paytype = $cust_main->paytype;
@@ -147,10 +146,10 @@
 %
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Card number </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Card number').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="CARD_payinfo" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $payinfo : '' ). qq!" MAXLENGTH=19 onChange="card_changed(this)" onKeyUp="card_changed(this)"></TD></TR>!.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Expiration </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Expiration').qq! </TD>!.
 %          '<TD WIDTH="408">'.
 %
 %          include('/elements/select-month_year.html',
@@ -161,14 +160,13 @@
 %
 %          '</TD></TR>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">CVV2&nbsp;!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">!.emt('CVV2').qq!&nbsp;!.
 %
-%          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
+%          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">!.emt('help').qq!</A>)!.
 %          qq!</TD>!.
 %          '<TD WIDTH="408"><INPUT TYPE="text" NAME="CARD_paycvv" VALUE="'. ( $payby =~ /^(CARD|DCRD)$/ && !$cust_main->is_encrypted($cust_main->paycvv) ? $cust_main->paycvv : '' ). '" SIZE=4 MAXLENGTH=4>'.
 %
-%
-%        qq!<TR><TD ALIGN="right" WIDTH="200"><SPAN ID="paystart_label" $text_disabled>Start date </SPAN></TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200"><SPAN ID="paystart_label" $text_disabled>!.emt('Start date').qq! </SPAN></TD>!.
 %          '<TD WIDTH="408">'.
 %
 %          include('/elements/select-month_year.html',
@@ -186,13 +184,13 @@
 %                    )
 %                 ).
 %
-%        qq!<SPAN ID="payissue_label" $text_disabled> or Issue number </SPAN>!.
+%        qq!<SPAN ID="payissue_label" $text_disabled>!.emt('or Issue number').qq! </SPAN>!.
 %          '<INPUT TYPE="text" NAME="CARD_payissue" VALUE="'. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payissue : '' ). qq!" SIZE=3 MAXLENGTH=2 $disabled></TD></TR>!.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Exact name on card </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Exact name on card').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="CARD_payname" VALUE="!. ( $payby =~ /^(CARD|DCRD)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
 %
-%        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CARD_payauto" $CARD_payauto_checked> Charge future payments to this card automatically</TD></TR>!.
+%        qq!<TR><TD COLSPAN=2 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CARD_payauto" $CARD_payauto_checked> !.emt('Charge future payments to this card automatically').qq!</TD></TR>!.
 %
 %      ( $conf->exists('cust_main-select-billday') ?
 %        qq!<TR><TD COLSPAN=2 WIDTH="608" id="card_billday" style="display: $billday_card_display">
@@ -207,27 +205,27 @@
 %
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Account number </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Account number').qq! </TD>!.
 %          qq!<TD><INPUT TYPE="text" SIZE=12 NAME="CHEK_payinfo1" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $account : '' ). '"></TD>'.
-%          qq!<TD ALIGN="right">Type</TD><TD><SELECT NAME="CHEK_paytype">!.
+%          qq!<TD ALIGN="right">!.emt('Type').qq!</TD><TD><SELECT NAME="CHEK_paytype">!.
 %            join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes).
 %          qq!</SELECT></TD></TR>!.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}ABA/Routing number </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('ABA/Routing number').qq! </TD>!.
 %          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="CHEK_payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !.
-%          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)!.
+%          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">!.emt('help').qq!</A>)!.
 %          qq!</TD></TR>!.
 %
 %        qq!<INPUT TYPE="hidden" NAME="CHEK_exp_month" VALUE="12">!.
 %        qq!<INPUT TYPE="hidden" NAME="CHEK_exp_year" VALUE="2037">!.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Bank name </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Bank name').qq! </TD>!.
 %          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" NAME="CHEK_payname" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
 %      ( $conf->exists('show_bankstate') ?
 %          qq!<TR><TD ALIGN="right" WIDTH="200">$paystate_label</TD>!.
 %          qq!<TD COLSPAN="3" WIDTH="408">!.
 %          include('/elements/select-state.html',
-%                    'empty'   => '(choose)',
+%                    'empty'   => emt('(choose)'),
 %                    'state'   => $cust_main->paystate,
 %                    'country' => $cust_main->country,
 %                    'prefix'  => 'CHEK_pay',
@@ -237,7 +235,7 @@
 %       ).
 %
 %
-%        qq!<TR><TD COLSPAN=4 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CHEK_payauto" $CHEK_payauto_checked> Charge future payments to this electronic check automatically</TD></TR>!.
+%        qq!<TR><TD COLSPAN=4 WIDTH="608"><INPUT TYPE="checkbox" onchange="payauto_changed(this);" NAME="CHEK_payauto" $CHEK_payauto_checked> !.emt('Charge future payments to this electronic check automatically').qq!</TD></TR>!.
 %
 %      ( $conf->exists('cust_main-select-billday') ?
 %        qq!<TR><TD COLSPAN=2 WIDTH="608" id="chek_billday" style="display: $billday_chek_display">
@@ -256,7 +254,7 @@
 %
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Phone number </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Phone number').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="LECB_payinfo" VALUE="!. ( $payby eq 'LECB' ? $cust_main->payinfo : '' ). qq!" MAXLENGTH=15 SIZE=16></TD></TR>!.
 %
 %        qq!<INPUT TYPE="hidden" NAME="LECB_exp_month" VALUE="12">!.
@@ -276,13 +274,13 @@
 %
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">P.O. </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">!.emt('P.O.').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="BILL_payinfo" VALUE="!. ( $payby eq 'BILL' ? $cust_main->payinfo : '' ). qq!"></TD></TR>!.
 %
 %        qq!<INPUT TYPE="hidden" NAME="BILL_exp_month" VALUE="12">!.
 %        qq!<INPUT TYPE="hidden" NAME="BILL_exp_year" VALUE="2037">!.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">Attention </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">!.emt('Attention').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="BILL_payname" VALUE="!. encode_entities( $payby eq 'BILL' ? $cust_main->payname : '' ). qq!"></TD></TR>!.
 %
 %        '<TR><TD>&nbsp;</TD></TR>'.
@@ -297,10 +295,10 @@
 %
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Approved by </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Approved by').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="COMP_payinfo" VALUE=""></TD></TR>!.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Expiration </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Expiration').qq! </TD>!.
 %          '<TD WIDTH="408">'.
 %
 %          include('/elements/select-month_year.html',
@@ -323,7 +321,7 @@
 %
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Amount').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="CASH_paid" VALUE="!. ( $payby eq 'CASH' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
 %
 %        '<TR><TD>&nbsp;</TD></TR>'.
@@ -339,7 +337,7 @@
 %
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Amount').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="WEST_paid" VALUE="!. ( $payby eq 'WEST' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
 %
 %        '<TR><TD>&nbsp;</TD></TR>'.
@@ -355,7 +353,7 @@
 %
 %      '<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 HEIGHT=192>'.
 %
-%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Amount </TD>!.
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Amount').qq! </TD>!.
 %          qq!<TD WIDTH="408"><INPUT TYPE="text" NAME="MCRD_paid" VALUE="!. ( $payby eq 'MCRD' ? $cust_main->paid : '' ). qq!"></TD></TR>!.
 %
 %        '<TR><TD>&nbsp;</TD></TR>'.
@@ -388,15 +386,14 @@
 %  );
 
   <TD WIDTH="408">
-    <% include( '/elements/selectlayers.html',
+    <& /elements/selectlayers.html,
                   'field'      => 'payby',
                   'curr_value' => $payby2option{$payby || $payby_default || $payby[0] },
                   'options'    => \@options,
                   'labels'     => \%allopt,
                   'html_between' => '</TD></TR></TABLE>',
                   'layer_callback' => sub { my $layer = shift; $payby{$layer}; },
-              )
-    %>
+    &>
 
   <% &ntable("#cccccc") %>
 
@@ -425,7 +422,7 @@
           ? 'CHECKED'
           : ''
 
-        %>> Postal mail invoice
+        %>> <% mt('Postal mail invoice') |h %> 
 
       </TD>
     </TR>
@@ -437,7 +434,7 @@
           ? 'CHECKED'
           : ''
 
-        %>> Fax invoice
+        %>> <% mt('Fax invoice') |h %> 
 
       </TD>
     </TR>
@@ -452,17 +449,16 @@
     </TR>
 
     <TR>
-      <TD ALIGN="right" WIDTH="200">Invoice terms </TD>
+      <TD ALIGN="right" WIDTH="200"><% mt('Invoice terms') |h %> </TD>
       <TD WIDTH="408">
-        <% include('/elements/select-terms.html',
+        <& /elements/select-terms.html,
                      'curr_value' => $cust_main->invoice_terms,
-                  )
-        %>
+        &>
       </TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" WIDTH="200">Credit limit </TD>
+      <TD ALIGN="right" WIDTH="200"><% mt('Credit limit') |h %> </TD>
       <TD WIDTH="408">
         <SCRIPT TYPE="text/javascript">
 function toggle(obj) {
@@ -470,13 +466,13 @@
 }
         </SCRIPT>
         <INPUT TYPE="text" NAME="credit_limit" VALUE=<% sprintf('"%.2f"', $cust_main->credit_limit) %><% length($cust_main->credit_limit) ? '' : ' DISABLED' %>>
-        <INPUT TYPE="checkbox" NAME="no_credit_limit" VALUE=1 onclick="toggle(this)"<% length($cust_main->credit_limit) ? '' : ' CHECKED'%>> Unlimited
+        <INPUT TYPE="checkbox" NAME="no_credit_limit" VALUE=1 onclick="toggle(this)"<% length($cust_main->credit_limit) ? '' : ' CHECKED'%>> <% mt('Unlimited') |h %> 
       </TD>
     </TR>
 
 % if ( $conf->exists('voip-cust_cdr_spools') ) { 
       <TR>
-       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="spool_cdr" VALUE="Y" <% $cust_main->spool_cdr eq "Y" ? 'CHECKED' : '' %>> Spool CDRs</TD>
+       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="spool_cdr" VALUE="Y" <% $cust_main->spool_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt('Spool CDRs') |h %></TD>
       </TR>
 % } else { 
       <INPUT TYPE="hidden" NAME="spool_cdr" VALUE="<% $cust_main->spool_cdr %>">
@@ -484,7 +480,7 @@
 
 % if ( $conf->exists('voip-cust_cdr_squelch') ) { 
       <TR>
-       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="squelch_cdr" VALUE="Y" <% $cust_main->squelch_cdr eq "Y" ? 'CHECKED' : '' %>> Omit CDRs from printed invoices</TD>
+       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="squelch_cdr" VALUE="Y" <% $cust_main->squelch_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt('Omit CDRs from printed invoices') |h %></TD>
       </TR>
 % } else { 
       <INPUT TYPE="hidden" NAME="squelch_cdr" VALUE="<% $cust_main->squelch_cdr %>">
@@ -492,7 +488,7 @@
 
 % if ( $conf->exists('voip-cust_email_csv_cdr') ) { 
       <TR>
-       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="email_csv_cdr" VALUE="Y" <% $cust_main->email_csv_cdr eq "Y" ? 'CHECKED' : '' %>> Attach CDRs as CSV to emailed invoices</TD>
+       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="email_csv_cdr" VALUE="Y" <% $cust_main->email_csv_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt('Attach CDRs as CSV to emailed invoices') |h %></TD>
       </TR>
 % } else { 
       <INPUT TYPE="hidden" NAME="email_csv_cdr" VALUE="<% $cust_main->email_csv_cdr %>">
@@ -505,7 +501,7 @@
                    NAME="accountcode_cdr" 
                    VALUE="Y" 
                    <% $cust_main->accountcode_cdr eq "Y" ? 'CHECKED' : '' %>
-            > Breakdown CDRs by accountcode</TD>
+            > <% mt('Breakdown CDRs by accountcode') |h %></TD>
        </TR>
 % } else { 
        <INPUT TYPE="hidden" NAME="accountcode_cdr" VALUE="<% $cust_main->accountcode_cdr %>">
@@ -513,7 +509,7 @@
 
 % if ( $show_term || $cust_main->cdr_termination_percentage ) {
       <TR>
-       <TD ALIGN="right">CDR termination settlement</TD>
+       <TD ALIGN="right"><% mt('CDR termination settlement') |h %></TD>
        <TD><INPUT TYPE  = "text"
                   NAME  = "cdr_termination_percentage"
                   SIZE  = 6
@@ -527,7 +523,7 @@
 
   </TABLE>
 
-  <% $r %> required fields
+  <% $r %> <% mt('required fields') |h %> 
 % } 
 
 <%once>

Index: top_misc.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/top_misc.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -d -r1.8 -r1.9
--- top_misc.html	10 Oct 2010 00:26:24 -0000	1.8
+++ top_misc.html	23 May 2011 16:25:27 -0000	1.9
@@ -1,11 +1,10 @@
 <% &ntable("#cccccc") %>
 
 %# tags
-<% include('/elements/tr-select-cust_tag.html',
+<& /elements/tr-select-cust_tag.html,
              'custnum' => $custnum,
              'cgi'     => $cgi,
-          )
-%>
+&>
 
 %# agent
 % if ( $cgi->param('lock_agentnum') =~ /^(\d+)$/ && $curuser->agentnum($1) ) {
@@ -16,20 +15,19 @@
     <INPUT TYPE="hidden" NAME="lock_agentnum" VALUE="<% $agentnum %>">
     <INPUT TYPE="hidden" NAME="agentnum"      VALUE="<% $agentnum %>">
     <TR>
-      <TD ALIGN="right">Agent</TD>
+      <TD ALIGN="right"><% mt('Agent') |h %></TD>
       <TD CLASS="fsdisabled"><% $cust_main->agent->agent |h %></TD>
     </TR>
  
 % } else {
 
-  <% include('/elements/tr-select-agent.html', 
+  <& /elements/tr-select-agent.html, 
                 'curr_value'    => $cust_main->agentnum,
-                'label'         => "<B>${r}Agent</B>",
-                'empty_label'   => 'Select agent',
+                'label'         => "<B>${r}".emt('Agent')."</B>",
+                'empty_label'   => emt('Select agent'),
                 'disable_empty' => ( $cust_main->agentnum ? 1 : 0 ),
-                'viewall_right' => 'None', #override default 'View customers of all agents'
-             )
-  %>
+                'viewall_right' => emt('None'), 
+  &>
 
 % }
 
@@ -37,7 +35,7 @@
 % if ( $conf->exists('cust_main-edit_agent_custid') ) {
 
     <TR>
-      <TD ALIGN="right">Customer identifier</TD>
+      <TD ALIGN="right"><% mt('Customer identifier') |h %></TD>
       <TD><INPUT TYPE="text" NAME="agent_custid" VALUE="<% $cust_main->agent_custid %>"></TD>
     </TR>
 
@@ -48,13 +46,10 @@
 % }
 
 %# class
-<% include('/elements/tr-select-cust_class.html',
+<& /elements/tr-select-cust_class.html,
              'curr_value'  => $cust_main->classnum,
-             'label'       => "Class",
-             #'empty_label' => '(none)',
-             #'disable_empty' => 
-          )
-%>
+             'label'       => emt("Class"),
+&>
 
 %# referral (advertising source)
 %my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
@@ -64,10 +59,9 @@
 
 % } else { 
 
-   <% include('/elements/tr-select-part_referral.html',
+   <& /elements/tr-select-part_referral.html,
                 'curr_value' => $refnum
-             )
-   %>
+   &>
 % } 
 
 
@@ -80,7 +74,7 @@
 %) {
 
   <TR>
-    <TD ALIGN="right">Referring customer</TD>
+    <TD ALIGN="right"><% mt('Referring customer') |h %></TD>
     <TD>
       <A HREF="<% popurl(1) %>/cust_main.cgi?<% $cust_main->referral_custnum %>"><% $cust_main->referral_custnum %>: <% $referring_cust_main->name %></A>
     </TD>
@@ -92,12 +86,10 @@
   <TR>
     <TD ALIGN="right">Referring customer</TD>
     <TD>
-      <!-- <INPUT TYPE="text" NAME="referral_custnum" VALUE=""> -->
-      <% include('/elements/search-cust_main.html',
+      <& /elements/search-cust_main.html,
                     'field_name' => 'referral_custnum',
                     'curr_value' => $cust_main->referral_custnum,
-                 )
-      %>
+      &>
     </TD>
   </TR>
 
@@ -107,13 +99,13 @@
 
 %# signup date
 % if ( $conf->exists('cust_main-edit_signupdate') ) {
-    <% include('/elements/tr-input-date-field.html', {
+    <& /elements/tr-input-date-field.html, {
                   'name'        => 'signupdate',
                   'value'       => $cust_main->signupdate,
-                  'label'       => 'Signup date',
+                  'label'       => emt('Signup date'),
                   'format'      => ( $conf->config('date_format') || "%m/%d/%Y" ),
-              })
-    %>
+              }
+    &>
 % }
 
 </TABLE>

Index: contact.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/contact.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -d -r1.18 -r1.19
--- contact.html	20 Mar 2011 19:38:27 -0000	1.18
+++ contact.html	23 May 2011 16:25:27 -0000	1.19
@@ -1,14 +1,14 @@
 <% &ntable("#cccccc") %>
 
 <TR>
-  <TH ALIGN="right"><%$r%>Contact&nbsp;name<BR>(last,&nbsp;first)</TH>
+  <TH ALIGN="right"><%$r%><% mt('Contact name (last, first)') |h %></TH>
   <TD COLSPAN=7>
     <INPUT TYPE="text" NAME="<%$pre%>last" VALUE="<% $cust_main->get($pre.'last') |h %>" onChange="<% $onchange %>" <%$disabled%> <%$style%>> , 
     <INPUT TYPE="text" NAME="<%$pre%>first" VALUE="<% $cust_main->get($pre.'first') |h %>" onChange="<% $onchange %>" <%$disabled%> <%$style%>>
   </TD>
 % if ( $conf->exists('show_ss') && !$pre ) { 
 
-  <TD ALIGN="right">SS#</TD>
+  <TD ALIGN="right"><% mt('SS#') |h %></TD>
   <TD><INPUT TYPE="text" NAME="ss" VALUE="<% $opt{ss} %>" SIZE=11></TD>
 % } elsif ( !$pre ) { 
 
@@ -19,13 +19,13 @@
 </TR>
 
 <TR>
-  <TD ALIGN="right">Company</TD>
+  <TD ALIGN="right"><% mt('Company') |h %></TD>
   <TD COLSPAN=7>
     <INPUT TYPE="text" NAME="<%$pre%>company" VALUE="<% $cust_main->get($pre.'company') |h %>" SIZE=70 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
   </TD>
 </TR>
 
-<% include('/elements/location.html',
+<& /elements/location.html,
              'prefix'       => $pre,
              'object'       => $cust_main,
              'onchange'     => $onchange,
@@ -34,8 +34,7 @@
              'same_checked' => $opt{'same_checked'},
              'geocode'      => $opt{'geocode'},
              'censustract'  => $opt{'censustract'},
-          )
-%>
+&>
 
 <TR>
   <TD ALIGN="right"><% $daytime_label %></TD>
@@ -52,7 +51,7 @@
 </TR>
 
 <TR>
-  <TD ALIGN="right">Fax</TD>
+  <TD ALIGN="right"><% mt('Fax') |h %></TD>
   <TD COLSPAN=5>
     <INPUT TYPE="text" NAME="<%$pre%>fax" VALUE="<% $cust_main->get($pre.'fax') %>" SIZE=12 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
   </TD>
@@ -64,15 +63,14 @@
   <TD ALIGN="right"><% $stateid_label %></TD>
   <TD><INPUT TYPE="text" NAME="stateid" VALUE="<% $opt{stateid} %>" SIZE=12 onChange="<% $onchange %>" <%$disabled%> <%$style%>></TD>
   <TD ALIGN="right"><% $stateid_state_label %></TD>
-  <TD><% include('/elements/select-state.html',
+  <TD><& /elements/select-state.html,
                    'state'    => $cust_main->stateid_state,
                    'country'  => $cust_main->country,
                    'prefix'   => 'stateid_',
                    'onchange' => $onchange,
                    'disabled' => $disabled,
                    'style'    => \@style,
-                )
-      %>
+      &>
   </TD>
 </TR>
 % } elsif ( !$pre ) { 
@@ -82,11 +80,10 @@
 % } 
 
 </TABLE>
-<%$r%>required fields<BR>
+<%$r%><% mt('required fields') |h %><BR>
 
 <%init>
 
-#my( $cust_main, $pre, $onchange, $disabled, %opt ) = @_;
 my %opt = @_;
 my $cust_main = $opt{'cust_main'};
 my $pre       = $opt{'pre'};
@@ -94,7 +91,6 @@
 my $disabled  = $opt{'disabled'};
 my @style     = ( $opt{'style'} ? @{ $opt{'style'} } : () );
 
-#push @style, 'background-color: #dddddd' if $disabled;
 my $style = scalar(@style) ? 'STYLE="'. join(';', @style). '"' : '';
 
 my $conf = new FS::Conf;
@@ -123,15 +119,6 @@
   $opt{censustract} ||= $cust_main->censustract;
 }
 
-#my($county_html, $state_html, $country_html) =
-#  FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
-#                                        $cust_main->get($pre.'state'),
-#                                        $cust_main->get($pre.'country'),
-#                                        $pre,
-#                                        $onchange,
-#                                        $disabled,
-#                                      );
-
 my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
                   ? 'Day Phone'
                   : FS::Msgcat::_gettext('daytime');



More information about the freeside-commits mailing list