diff options
| -rwxr-xr-x | httemplate/browse/msgcat.cgi | 16 | ||||
| -rw-r--r-- | httemplate/index.html | 10 | ||||
| -rw-r--r-- | httemplate/loginout/logout.html | 4 | ||||
| -rw-r--r-- | httemplate/misc/cancel_cust.html | 44 | ||||
| -rwxr-xr-x | httemplate/misc/cancel_pkg.html | 25 | ||||
| -rwxr-xr-x | httemplate/misc/change_pkg.cgi | 24 | ||||
| -rwxr-xr-x | httemplate/misc/cust_main-cancel.cgi | 2 | ||||
| -rw-r--r-- | httemplate/misc/order_pkg.html | 49 | ||||
| -rw-r--r-- | httemplate/misc/payment.cgi | 82 | ||||
| -rwxr-xr-x | httemplate/misc/process/cancel_pkg.html | 6 |
10 files changed, 115 insertions, 147 deletions
diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi index 2c916dc9f..f71fadb9f 100755 --- a/httemplate/browse/msgcat.cgi +++ b/httemplate/browse/msgcat.cgi @@ -1,8 +1,8 @@ -<% include('/elements/header.html', "View Message catalog", menubar( - 'Edit message catalog' => $p. "edit/msgcat.cgi", -)) %> +<& /elements/header.html, emt("View Message catalog"), menubar( + emt('Edit message catalog') => $p. "edit/msgcat.cgi", +) &> <% $widget->html %> -<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> die "access denied" @@ -13,14 +13,12 @@ my $widget = new HTML::Widgets::SelectLayers( 'options' => { 'en_US'=>'en_US' }, 'layer_callback' => sub { my $layer = shift; - my $html = "<BR>Messages for locale $layer<BR>". table(). - "<TR><TH COLSPAN=2>Code</TH>". - "<TH>Message</TH>"; + my $html = "<BR>".emt("Messages for locale [_1]",$layer)."<BR>". table(). + "<TR><TH COLSPAN=2>".emt('Code')."</TH>". + "<TH>".emt('Message')."</TH>"; $html .= "<TH>en_US Message</TH>" unless $layer eq 'en_US'; $html .= '</TR>'; - #foreach my $msgcat ( sort { $a->msgcode cmp $b->msgcode } - # qsearch('msgcat', { 'locale' => $layer } ) ) { foreach my $msgcat ( qsearch('msgcat', { 'locale' => $layer } ) ) { $html .= '<TR><TD>'. $msgcat->msgnum. '</TD>'. '<TD>'. $msgcat->msgcode. '</TD>'. diff --git a/httemplate/index.html b/httemplate/index.html index c44880dba..450795972 100644 --- a/httemplate/index.html +++ b/httemplate/index.html @@ -1,8 +1,8 @@ -<& /elements/header.html, mt('Billing Main') &> +<& /elements/header.html, emt('Billing Main') &> -<% include('/elements/dashboard-install_welcome.html') %> +<& /elements/dashboard-install_welcome.html &> -<% include('/elements/dashboard-toplist.html') %> +<& /elements/dashboard-toplist.html &> % my $sth = dbh->prepare( % #"SELECT DISTINCT custnum FROM h_cust_main JOIN cust_main USING ( custnum ) @@ -21,14 +21,14 @@ % % if ( @custnums ) { - <% include('/elements/table-grid.html') %> + <& /elements/table-grid.html &> % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = $bgcolor2; <TR> - <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=1>Customers I recently added or modified</TH> + <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=1><% mt('Customers I recently added or modified') |h %></TH> </TR> % foreach my $custnum ( @custnums ) { diff --git a/httemplate/loginout/logout.html b/httemplate/loginout/logout.html index 130cf662a..a29454a2c 100644 --- a/httemplate/loginout/logout.html +++ b/httemplate/loginout/logout.html @@ -2,13 +2,13 @@ <HTML> <HEAD> <TITLE> - <% "Logout page" %> + <% mt('Logout page') |h %> </TITLE> </HEAD> <BODY> <BR><BR> <CENTER> - You have logged out. + <% mt('You have logged out') |h %> </CENTER> <BR><BR> <CENTER> diff --git a/httemplate/misc/cancel_cust.html b/httemplate/misc/cancel_cust.html index b7ecccd7e..0e2b11541 100644 --- a/httemplate/misc/cancel_cust.html +++ b/httemplate/misc/cancel_cust.html @@ -1,13 +1,11 @@ -<% include('/elements/header-popup.html', 'Cancel customer' ) %> - -<% include('/elements/error.html') %> +<& /elements/header-popup.html, emt('Cancel customer') &> +<& /elements/error.html &> <FORM NAME="cust_cancel_popup" ACTION="<% popurl(1) %>cust_main-cancel.cgi" METHOD=POST> <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>"> - - <P ALIGN="center"><B>Permanently delete all services and cancel this customer?</B> + <P ALIGN="center"><B><% mt('Permanently delete all services and cancel this customer?') |h %></B> <TABLE BORDER="0" CELLSPACING="2" STYLE="margin-left:auto; margin-right:auto"> @@ -15,17 +13,17 @@ STYLE="margin-left:auto; margin-right:auto"> <TD ALIGN="right"> <INPUT TYPE="radio" NAME="now_or_later" VALUE="0" onclick="toggle(false)" CHECKED /> </TD> - <TD ALIGN="left">Cancel now</TD> + <TD ALIGN="left"><% mt('Cancel now') |h %></TD> </TR> <TR> <TD ALIGN="right"> <INPUT TYPE="radio" NAME="now_or_later" VALUE="1" onclick="toggle(true)" /> </TD> - <TD ALIGN="left">Cancel on date: - <% include('/elements/input-date-field.html', { + <TD ALIGN="left"><% mt('Cancel on date: ') |h %> + <& /elements/input-date-field.html, { 'name' => 'expire', 'value' => time, - } ) %> + } &> </TD> </TR> </TABLE> @@ -38,23 +36,30 @@ function toggle(val) { } toggle(false); </SCRIPT> -<% $ban %> +% if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) { +% my $ban = "Ban this customer's "; +% $ban .= 'credit card' if $cust_main->payby =~ /^(CARD|DCRD)$/; +% $ban .= 'ACH account' if $cust_main->payby =~ /^(CHEK|DCHK)$/; + <P ALIGN="center"> + <INPUT TYPE="checkbox" NAME="ban" ID="ban" VALUE="1"><% mt($ban) |h %> +% } <TABLE BGCOLOR="#cccccc", BORDER="0" CELLSPACING="2" STYLE="margin-left:auto; margin-right:auto"> -<% include('/elements/tr-select-reason.html', +<& /elements/tr-select-reason.html, 'field' => 'reasonnum', 'reason_class' => 'C', 'cgi' => $cgi, 'control_button' => "document.getElementById('confirm_cancel_cust_button')", - ) -%> +&> </TABLE> <BR> <P ALIGN="CENTER"> -<INPUT TYPE="submit" NAME="submit" ID="confirm_cancel_cust_button" VALUE="Cancel customer" DISABLED> <INPUT TYPE="BUTTON" VALUE="Don't cancel" onClick="parent.cClick();"> +<INPUT TYPE="submit" NAME="submit" ID="confirm_cancel_cust_button" VALUE="<% mt('Cancel customer') |h %>" DISABLED> + +<INPUT TYPE="BUTTON" VALUE="<% mt("Don't cancel") |h %>" onClick="parent.cClick();"> </FORM> </BODY> @@ -76,16 +81,5 @@ my $cust_main = qsearchs( { } ); die "No customer # $custnum" unless $cust_main; -my $ban = ''; -if ( $cust_main->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) { - $ban = '<P ALIGN="center">'. - '<INPUT TYPE="checkbox" NAME="ban" ID="ban" VALUE="1"> Ban this customer\'s '; - if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) { - $ban .= 'credit card'; - } elsif ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) { - $ban .= 'ACH account'; - } -} - </%init> diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html index 10c0e0d04..b6fe78522 100755 --- a/httemplate/misc/cancel_pkg.html +++ b/httemplate/misc/cancel_pkg.html @@ -1,31 +1,27 @@ -%# if ( $link eq 'popup' ) { - <% include('/elements/header-popup.html', $title ) %> -%# } else { -%# <% include("/elements/header.html", $title, '') %> -%# } +<& /elements/header-popup.html, emt($title) &> <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2"> <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT> <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT> <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT> -<% include('/elements/error.html') %> +<& /elements/error.html &> <FORM NAME="sc_popup" ACTION="<% popurl(1) %>process/cancel_pkg.html" METHOD=POST> <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $pkgnum %>"> <INPUT TYPE="hidden" NAME="method" VALUE="<% $method %>"> - <BR><BR> -<% ucfirst($method) %> <% $part_pkg->pkg_comment %> +<% emt(ucfirst($method)." [_1]", $part_pkg->pkg_comment) %> <% ntable("#cccccc", 2) %> % if ($method eq 'expire' || $method eq 'adjourn') { <TR> - <TD><% $submit =~ /^(\w*)\s/ %> package on </TD> +% $submit =~ /^(\w*)\s/; + <TD><% mt("$1 package on") |h %> </TD> <TD><INPUT TYPE="text" NAME="date" ID="expire_date" VALUE="<% $date |h %>"> - <IMG SRC="<% $p %>images/calendar.png" ID="expire_button" STYLE="cursor:pointer" TITLE="Select date"> - <BR><I>m/d/y</I> + <IMG SRC="<% $p %>images/calendar.png" ID="expire_button" STYLE="cursor:pointer" TITLE="<% mt('Select date') |h %>"> + <BR><I><% mt('m/d/y') |h %></I> </TD> </TR> <SCRIPT TYPE="text/javascript"> @@ -39,18 +35,17 @@ %} % -<% include('/elements/tr-select-reason.html', +<& /elements/tr-select-reason.html, 'field' => 'reasonnum', 'reason_class' => $class, 'curr_value' => $reasonnum, 'control_button' => "document.getElementById('confirm_cancel_pkg_button')", - ) -%> +&> </TABLE> <BR> -<INPUT TYPE="submit" NAME="submit" ID="confirm_cancel_pkg_button" VALUE="<% $submit %>" DISABLED> +<INPUT TYPE="submit" NAME="submit" ID="confirm_cancel_pkg_button" VALUE="<% mt($submit) |h %>" DISABLED> </FORM> </BODY> diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi index 8f0067d2d..cf3ed50cd 100755 --- a/httemplate/misc/change_pkg.cgi +++ b/httemplate/misc/change_pkg.cgi @@ -1,8 +1,8 @@ -<% include('/elements/header-popup.html', "Change Package") %> +<& /elements/header-popup.html, emt("Change Package") &> <SCRIPT TYPE="text/javascript" SRC="../elements/order_pkg.js"></SCRIPT> -<% include('/elements/error.html') %> +<& /elements/error.html &> <FORM NAME="OrderPkgForm" ACTION="<% $p %>edit/process/change-cust_pkg.html" METHOD=POST> <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $pkgnum %>"> @@ -10,36 +10,32 @@ <% ntable('#cccccc') %> <TR> - <TH ALIGN="right">Current package</TH> + <TH ALIGN="right"><% mt('Current package') |h %></TH> <TD COLSPAN=7> <% $curuser->option('show_pkgnum') ? $cust_pkg->pkgnum.': ' : '' %><B><% $part_pkg->pkg |h %></B> - <% $part_pkg->comment |h %> </TD> </TR> - <% include('/elements/tr-select-cust-part_pkg.html', - 'pre_label' => 'New', + <& /elements/tr-select-cust-part_pkg.html, + 'pre_label' => emt('New'), 'curr_value' => scalar($cgi->param('pkgpart')), 'classnum' => $part_pkg->classnum, 'cust_main' => $cust_main, - #'extra_sql' => ' AND pkgpart != '. $cust_pkg->pkgpart, - ) - %> + &> - <% include('/elements/tr-select-cust_location.html', + <& /elements/tr-select-cust_location.html, 'cgi' => $cgi, 'cust_main' => $cust_main, - ) - %> + &> </TABLE> -<% include( '/elements/standardize_locations.html', +<& /elements/standardize_locations.html, 'form' => "OrderPkgForm", 'onlyship' => 1, 'no_company' => 1, 'callback' => 'document.OrderPkgForm.submit();', - ) -%> +&> <BR> <INPUT NAME = "submitButton" diff --git a/httemplate/misc/cust_main-cancel.cgi b/httemplate/misc/cust_main-cancel.cgi index 44be20c8a..5801a5277 100755 --- a/httemplate/misc/cust_main-cancel.cgi +++ b/httemplate/misc/cust_main-cancel.cgi @@ -1,4 +1,4 @@ -<% include('/elements/header.html', "Customer cancelled") %> +<& /elements/header.html, emt("Customer cancelled") &> <SCRIPT TYPE="text/javascript"> window.top.location.reload(); </SCRIPT> diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index 4f511cc36..7d289c945 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -1,4 +1,4 @@ -<% include('/elements/header-popup.html', 'Order new package' ) %> +<& /elements/header-popup.html, emt('Order new package') &> <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2"> <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT> @@ -7,7 +7,7 @@ <SCRIPT TYPE="text/javascript" SRC="../elements/order_pkg.js"></SCRIPT> -<% include('/elements/error.html') %> +<& /elements/error.html &> <FORM NAME="OrderPkgForm" ACTION="<% $p %>edit/process/quick-cust_pkg.cgi" METHOD="POST"> @@ -21,64 +21,61 @@ % if ( $part_pkg ) { <INPUT TYPE="hidden" NAME="pkgpart" VALUE="<% $part_pkg->pkgpart %>"> <TR> - <TH ALIGN="right">Package</TH> + <TH ALIGN="right"><% mt('Package') |h %></TH> <TD COLSPAN=6><% $part_pkg->pkg_comment |h %></TD> </TR> % } else { - <% include('/elements/tr-select-cust-part_pkg.html', + <& /elements/tr-select-cust-part_pkg.html, 'curr_value' => $pkgpart, 'classnum' => -1, 'cust_main' => $cust_main, 'onchange' => 'enable_order_pkg', - ) - %> + &> % } <TR> - <TH ALIGN="right">Start date </TD> + <TH ALIGN="right"><% mt('Start date') |h %> </TD> <TD COLSPAN=6> - <% include('/elements/input-date-field.html',{ + <& /elements/input-date-field.html,{ 'name' => 'start_date', 'format' => $date_format, 'value' => $start_date, 'noinit' => 1, - }) %> - <FONT SIZE=-1>(leave blank to start immediately)</FONT> + } &> + <FONT SIZE=-1>(<% mt('leave blank to start immediately') |h %>)</FONT> </TD> </TR> % if ( $cust_main->payby =~ /^(CARD|CHEK)$/ ) { % my $what = lc(FS::payby->shortname($cust_main->payby)); <TR> - <TH ALIGN="right">Disable automatic <% $what %> charge </TH> + <TH ALIGN="right"><% mt("Disable automatic $what charge") |h %> </TH> <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="no_auto" VALUE="Y"></TD> </TR> % } % if ( $curuser->access_right('Discount customer package') ) { - <% include('/elements/tr-select-discount.html', + <& /elements/tr-select-discount.html, 'element_etc' => 'DISABLED', 'colspan' => 7, 'cgi' => $cgi, - ) - %> + &> % } % if ( $curuser->access_right('Waive setup fee') ) { <TR> - <TH ALIGN="right">Waive setup fee </TH> + <TH ALIGN="right"><% mt('Waive setup fee') |h %> </TH> <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="waive_setup" VALUE="Y"></TD> </TR> % } % if ( $conf->exists('pkg_referral') ) { - <% include('/elements/tr-select-part_referral.html', + <& /elements/tr-select-part_referral.html, 'curr_value' => scalar( $cgi->param('refnum') ), #get rid of empty_label first# || $cust_main->refnum, 'disable_empty' => 1, 'multiple' => $conf->exists('pkg_referral-multiple'), 'colspan' => 7, - ) - %> + &> % } % if ( $cgi->param('lock_locationnum') ) { @@ -91,23 +88,22 @@ % } else { - <% include('/elements/tr-select-cust_location.html', + <& /elements/tr-select-cust_location.html, 'cgi' => $cgi, 'cust_main' => $cust_main, - ) - %> + &> % } <TR> - <TH ALIGN="right">Contract end date </TD> + <TH ALIGN="right"><% mt('Contract end date') |h %> </TD> <TD COLSPAN=6> - <% include('/elements/input-date-field.html',{ + <& /elements/input-date-field.html,{ 'name' => 'contract_end', 'format' => $date_format, 'value' => '', 'noinit' => 1, - }) %> + } &> </TD> </TR> @@ -115,13 +111,12 @@ % unless ( $cgi->param('lock_locationnum') ) { - <% include( '/elements/standardize_locations.html', + <& /elements/standardize_locations.html, 'form' => "OrderPkgForm", 'onlyship' => 1, 'no_company' => 1, 'callback' => 'document.OrderPkgForm.submit();', - ) - %> + &> % } diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index aec68af45..36e8255f1 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -1,18 +1,16 @@ -<% include( '/elements/header.html', "Process $type{$payby} payment" ) %> -<% include( '/elements/small_custview.html', $cust_main, '', '', popurl(2) . "view/cust_main.cgi" ) %> +<& /elements/header.html, emt("Process [_1] payment",$type{$payby}) &> +<& /elements/small_custview.html, $cust_main, '', '', popurl(2) . "view/cust_main.cgi" &> <FORM NAME="OneTrueForm" ACTION="process/payment.cgi" METHOD="POST" onSubmit="document.OneTrueForm.process.disabled=true"> <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>"> <INPUT TYPE="hidden" NAME="payby" VALUE="<% $payby %>"> <INPUT TYPE="hidden" NAME="payunique" VALUE="<% $payunique %>"> <INPUT TYPE="hidden" NAME="balance" VALUE="<% $balance %>"> -<% include('/elements/init_overlib.html') %> - -% #include( '/elements/table.html', '#cccccc' ) +<& /elements/init_overlib.html &> <% ntable('#cccccc') %> <TR> - <TH ALIGN="right">Payment amount</TH> + <TH ALIGN="right"><% mt('Payment amount') |h %></TH> <TD COLSPAN=7> <TABLE><TR><TD BGCOLOR="#ffffff"> <% $money_char %><INPUT NAME = "amount" @@ -67,11 +65,10 @@ % } -<% include('/elements/tr-select-discount_term.html', +<& /elements/tr-select-discount_term.html, 'custnum' => $custnum, 'cgi' => $cgi - ) -%> +&> % if ( $payby eq 'CARD' ) { % @@ -85,13 +82,13 @@ % } <TR> - <TH ALIGN="right">Card number</TH> + <TH ALIGN="right"><% mt('Card number') |h %></TH> <TD COLSPAN=7> <TABLE> <TR> <TD> <INPUT TYPE="text" NAME="payinfo" SIZE=20 MAXLENGTH=19 VALUE="<%$payinfo%>"> </TD> - <TH>Exp.</TH> + <TH><% mt('Exp.') |h %></TH> <TD> <SELECT NAME="month"> % for ( ( map "0$_", 1 .. 9 ), 10 .. 12 ) { @@ -116,22 +113,21 @@ </TD> </TR> <TR> - <TH ALIGN="right">CVV2</TH> + <TH ALIGN="right"><% mt('CVV2') |h %></TH> <TD><INPUT TYPE="text" NAME="paycvv" VALUE="<% $paycvv %>" SIZE=4 MAXLENGTH=4> - (<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>) + (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;"><% mt('help') |h %></A>) </TD> </TR> <TR> - <TH ALIGN="right">Exact name on card</TH> + <TH ALIGN="right"><% mt('Exact name on card') |h %></TH> <TD><INPUT TYPE="text" SIZE=32 MAXLENGTH=80 NAME="payname" VALUE="<%$payname%>"></TD> </TR> - <% include( '/elements/location.html', + <& /elements/location.html, 'object' => $cust_main, #XXX errors??? 'no_asterisks' => 1, - 'address1_label' => 'Card billing address', - ) - %> + 'address1_label' => emt('Card billing address'), + &> % } elsif ( $payby eq 'CHEK' ) { % @@ -153,34 +149,33 @@ <INPUT TYPE="hidden" NAME="month" VALUE="12"> <INPUT TYPE="hidden" NAME="year" VALUE="2037"> <TR> - <TD ALIGN="right">Account number</TD> + <TD ALIGN="right"><% mt('Account number') |h %></TD> <TD><INPUT TYPE="text" SIZE=10 NAME="payinfo1" VALUE="<%$payinfo1%>"></TD> - <TD ALIGN="right">Type</TD> + <TD ALIGN="right"><% mt('Type') |h %></TD> <TD><SELECT NAME="paytype"><% join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes) %></SELECT></TD> </TR> <TR> - <TD ALIGN="right">ABA/Routing number</TD> + <TD ALIGN="right"><% mt('ABA/Routing number') |h %></TD> <TD> <INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="<%$payinfo2%>"> - (<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>) + (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;"><% mt('help') |h %></A>) </TD> </TR> <TR> - <TD ALIGN="right">Bank name</TD> + <TD ALIGN="right"><% mt('Bank name') |h %></TD> <TD><INPUT TYPE="text" NAME="payname" VALUE="<%$payname%>"></TD> </TR> % if ( $conf->exists('show_bankstate') ) { <TR> - <TD ALIGN="right">Bank state</TD> - <TD><% include('/elements/select-state.html', + <TD ALIGN="right"><% mt('Bank state') |h %></TD> + <TD><& /elements/select-state.html, 'disable_empty' => 0, - 'empty_label' => '(choose)', + 'empty_label' => emt('(choose)'), 'state' => $paystate, 'country' => $cust_main->country, 'prefix' => 'pay', - ) - %> + &> </TD> </TR> % } else { @@ -190,8 +185,8 @@ % if ( $conf->exists('show_ss') ) { <TR> <TD ALIGN="right"> - Account holder<BR> - Social security or tax ID # + <% mt('Account holder') |h %><BR> + <% mt('Social security or tax ID #') |h %> </TD> <TD><INPUT TYPE="text" NAME="ss" VALUE="<% $ss %>"></TD> </TR> @@ -202,19 +197,18 @@ % if ( $conf->exists('show_stateid') ) { <TR> <TD ALIGN="right"> - Account holder<BR> - Driver’s license or state ID # + <% mt('Account holder') |h %><BR> + <% mt("Driver's license or state ID #") |h %> </TD> <TD><INPUT TYPE="text" NAME="stateid" VALUE="<% $stateid %>"></TD> - <TD ALIGN="right">State</TD> - <TD><% include('/elements/select-state.html', + <TD ALIGN="right"><% mt('State') |h %></TD> + <TD><& /elements/select-state.html, 'disable_empty' => 0, - 'empty_label' => '(choose)', + 'empty_label' => emt('(choose)'), 'state' => $stateid_state, 'country' => $cust_main->country, 'prefix' => 'stateid_', - ) - %> + &> </TD> </TR> % } else { @@ -228,7 +222,7 @@ <TR> <TD COLSPAN=2> <INPUT TYPE="checkbox" CHECKED NAME="save" VALUE="1"> - Remember this information + <% mt('Remember this informatio') |h %> </TD> </TR> @@ -245,7 +239,7 @@ <TR> <TD COLSPAN=2> <INPUT TYPE="checkbox" NAME="batch" VALUE="1"> - Add to current batch + <% mt('Add to current batch') |h %> </TD> </TR> @@ -255,24 +249,24 @@ <TR> <TD COLSPAN=2> <INPUT TYPE="checkbox"<% ( ( $payby eq 'CARD' && $cust_main->payby ne 'DCRD' ) || ( $payby eq 'CHEK' && $cust_main->payby eq 'CHEK' ) ) ? ' CHECKED' : '' %> NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }"> - Charge future payments to this <% $type{$payby} %> automatically + <% mt("Charge future payments to this [_1] automatically",$type{$payby}) |h %> </TD> </TR> </TABLE> <BR> -<INPUT TYPE="submit" NAME="process" VALUE="Process payment"> +<INPUT TYPE="submit" NAME="process" VALUE="<% mt('Process payment') |h %>"> </FORM> -<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Process payment'); -my %type = ( 'CARD' => 'credit card', - 'CHEK' => 'electronic check (ACH)', +my %type = ( 'CARD' => emt('credit card'), + 'CHEK' => emt('electronic check (ACH)'), ); $cgi->param('payby') =~ /^(CARD|CHEK)$/ diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html index e17872c06..a4371e6f3 100755 --- a/httemplate/misc/process/cancel_pkg.html +++ b/httemplate/misc/process/cancel_pkg.html @@ -1,4 +1,4 @@ -<% header("Package $past{$method}") %> +<% header(emt("Package $past{$method}")) %> <SCRIPT TYPE="text/javascript"> window.top.location.reload(); </SCRIPT> @@ -51,10 +51,6 @@ if ($method eq 'expire' || $method eq 'adjourn'){ my $cust_pkg = qsearchs( 'cust_pkg', {'pkgnum'=>$pkgnum} ); -#my $otaker = $FS::CurrentUser::CurrentUser->name; -#$otaker = $FS::CurrentUser::CurrentUser->username -# if ($otaker eq "User, Legacy"); - if ($reasonnum == -1) { $reasonnum = { 'typenum' => scalar( $cgi->param('newreasonnumT') ), |