[freeside-commits] branch master updated. 4dc075fc38008d1c6cbe9b88b2bdb32bdc92adbf
Ivan
ivan at 420.am
Sun Sep 25 12:20:47 PDT 2016
The branch, master has been updated
via 4dc075fc38008d1c6cbe9b88b2bdb32bdc92adbf (commit)
via 42a5e5491d250c6462bc9e5bad53786414020fa9 (commit)
from 2c54d21c2d415f8d6db520de694e5ac7be3a8c8f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4dc075fc38008d1c6cbe9b88b2bdb32bdc92adbf
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Sep 25 12:20:40 2016 -0700
fix translation escaping
diff --git a/httemplate/elements/change_password.html b/httemplate/elements/change_password.html
index 2b40ec1..a84e823 100644
--- a/httemplate/elements/change_password.html
+++ b/httemplate/elements/change_password.html
@@ -8,7 +8,7 @@
display: none;
}
</STYLE>
-<A ID="<%$pre%>link" HREF="javascript:void(0)" onclick="<%$pre%>toggle(true)">(<% mt('change') %>)</A>
+<A ID="<%$pre%>link" HREF="javascript:void(0)" onclick="<%$pre%>toggle(true)">(<% emt('change') %>)</A>
<DIV ID="<%$pre%>form" CLASS="passwordbox">
<FORM METHOD="POST" ACTION="<%$fsurl%>misc/process/change-password.html">
<INPUT TYPE="hidden" NAME="svcnum" VALUE="<% $svc_acct->svcnum |h%>">
diff --git a/httemplate/elements/tr-cust_main-phones.html b/httemplate/elements/tr-cust_main-phones.html
index accf8ac..a193401 100644
--- a/httemplate/elements/tr-cust_main-phones.html
+++ b/httemplate/elements/tr-cust_main-phones.html
@@ -1,22 +1,22 @@
<TR>
- <TD ALIGN="right" VALIGN="top"><% mt('Phones') %></TD>
+ <TD ALIGN="right" VALIGN="top"><% emt('Phones') %></TD>
<TD COLSPAN=6>
<TABLE CELLSPACING=0 CELLPADDING=0>
<TR>
<TD>
<INPUT TYPE="text" NAME="<%$pre%>daytime" VALUE="<% $cust_main->get($pre.'daytime') %>" SIZE=18 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
- <BR><FONT SIZE=-1><% $daytime_label %></FONT>
+ <BR><FONT SIZE=-1><% $daytime_label |h %></FONT>
</TD>
<TD> </TD>
<TD>
<INPUT TYPE="text" NAME="<%$pre%>night" VALUE="<% $cust_main->get($pre.'night') %>" SIZE=18 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
- <BR><FONT SIZE=-1><% $night_label %></FONT>
+ <BR><FONT SIZE=-1><% $night_label |h %></FONT>
</TD>
<TD> </TD>
<TD>
<INPUT TYPE="text" NAME="<%$pre%>mobile" VALUE="<% $cust_main->get($pre.'mobile') %>" SIZE=18 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
- <BR><FONT SIZE=-1><% $mobile_label %></FONT>
+ <BR><FONT SIZE=-1><% $mobile_label |h %></FONT>
</TD>
</TR>
</TABLE>
diff --git a/httemplate/misc/batch-cust_pay.html b/httemplate/misc/batch-cust_pay.html
index 197ade1..d4d4afa 100644
--- a/httemplate/misc/batch-cust_pay.html
+++ b/httemplate/misc/batch-cust_pay.html
@@ -288,7 +288,7 @@ function create_application_row(rownum, appnum) {
td_invnum.setAttribute('colspan', 4);
td_invnum.style.textAlign = 'right';
td_invnum.appendChild(
- document.createTextNode('<% mt('Apply to Invoice ') %>')
+ document.createTextNode(<% mt('Apply to Invoice ') |js_string %>)
);
var select_invnum = document.createElement('SELECT');
select_invnum.setAttribute('rownum', rownum);
diff --git a/httemplate/misc/change_pkg_contact.html b/httemplate/misc/change_pkg_contact.html
index c88140e..26eacb9 100755
--- a/httemplate/misc/change_pkg_contact.html
+++ b/httemplate/misc/change_pkg_contact.html
@@ -16,7 +16,7 @@
% if ( $cust_pkg->contactnum ) {
<TR>
- <TH ALIGN="right"><% mt('Current Contact') %></TH>
+ <TH ALIGN="right"><% emt('Current Contact') %></TH>
<TD COLSPAN=7 BGCOLOR="#dddddd">
<% $cust_pkg->contact_obj->line |h %>
</TD>
diff --git a/httemplate/misc/detach_pkg.html b/httemplate/misc/detach_pkg.html
index b2dfa38..dc23291 100755
--- a/httemplate/misc/detach_pkg.html
+++ b/httemplate/misc/detach_pkg.html
@@ -28,7 +28,7 @@
<INPUT TYPE="hidden" NAME="last" VALUE="<% $cust_contact->get('last') |h %>">
<TR>
- <TH ALIGN="right"><% mt('Name') %></TH>
+ <TH ALIGN="right"><% emt('Name') %></TH>
<TD COLSPAN=7 BGCOLOR="#dddddd">
<% $cust_pkg->contact_obj->line |h %>
</TD>
@@ -36,7 +36,7 @@
% #}
<TR>
- <TH ALIGN="right" VALIGN="top"><% mt('Address') %></TH>
+ <TH ALIGN="right" VALIGN="top"><% emt('Address') %></TH>
<TD COLSPAN=7 BGCOLOR="#dddddd">
<% $loc->location_label( 'join_string' => '<BR>',
diff --git a/httemplate/search/report_prepaid_income.html b/httemplate/search/report_prepaid_income.html
index dfb2ea2..127c1b8 100644
--- a/httemplate/search/report_prepaid_income.html
+++ b/httemplate/search/report_prepaid_income.html
@@ -32,9 +32,9 @@
<% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %>
<& /elements/tr-select-cust_main-status.html,
- label => mt('Customer Status') &>
+ label => emt('Customer Status') &>
<& /elements/tr-select-cust_class.html,
- label => mt('Customer Class'), field => 'cust_classnum', multiple => 1 &>
+ label => emt('Customer Class'), field => 'cust_classnum', multiple => 1 &>
<& /elements/tr-select.html,
label => 'Invoice Status',
field => 'mode',
@@ -43,7 +43,7 @@
<TD ALIGN="right">
<INPUT TYPE="checkbox" NAME="include_monthly" VALUE=1>
</TD>
- <TD ALIGN="left"><% mt('Include packages with period ≤ 1 month') %>
+ <TD ALIGN="left"><% emt('Include packages with period < 1 month') %>
</TD>
</TR>
<TR>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index d952575..6d52776 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -83,7 +83,7 @@ function areyousure(href, message) {
% $onclick = '<A HREF="#" onclick="'.$onclick.'">';
% if ( $cust_bill->promised_date ) {
% my $date_format = $conf->config('date_format') || '%b %o, %Y';
- <% mt('Payment promised by [_1]',
+ <% emt('Payment promised by [_1]',
time2str($date_format, $cust_bill->promised_date) ) %>
( <% $onclick %><% mt('change') |h %></A> )
<BR><BR>
@@ -144,7 +144,7 @@ function areyousure(href, message) {
% $cust_bill->cust_main->agent->invoice_modes;
% if ( @modes || $include_statement_template ) {
<% $br ? '|' : '' %>
-<% mt('View as:') %>
+<% emt('View as:') %>
<FORM STYLE="display:inline" ACTION="<% $cgi->url %>" METHOD="GET">
<INPUT NAME="invnum" VALUE="<% $invnum %>" TYPE="hidden">
<& /elements/select-table.html,
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 3feff2f..d75f114 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -10,7 +10,7 @@
% if ( $this eq 'ship' and
% $cust_main->bill_locationnum == $cust_main->ship_locationnum )
% {
- (<% mt('same as billing') %>)
+ (<% emt('same as billing') %>)
% }
</FONT>
% if (
diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 7e625d2..d9bf91e 100644
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -165,7 +165,7 @@
% if ( $conf->exists('ticket_system-selfservice_edit_subject') ) {
<TR>
- <TH ALIGN="right"><% mt('Edit ticket subjects') %></TH>
+ <TH ALIGN="right"><% emt('Edit ticket subjects') %></TH>
<TD><% $cust_main->edit_subject ? 'yes' : 'no' %></TD>
</TR>
diff --git a/httemplate/view/cust_main/notes/email.html b/httemplate/view/cust_main/notes/email.html
index da2c352..41c5b8a 100644
--- a/httemplate/view/cust_main/notes/email.html
+++ b/httemplate/view/cust_main/notes/email.html
@@ -8,22 +8,22 @@
.row1 {background-color: #ffffff}
</STYLE>
<DIV id="cust_msg">
-<FONT SIZE="+1"> <% mt('Email sent to this customer') %> </FONT><BR>
+<FONT SIZE="+1"> <% emt('Email sent to this customer') %> </FONT><BR>
% if ($maxrecords < $total) {
-<% mt('Showing [_1] most recent of [quant,_2,total message]', $maxrecords, $total) %>
+<% emt('Showing [_1] most recent of [quant,_2,total message]', $maxrecords, $total) %>
<A HREF="<%$p%>search/cust_msg.html?custnum=<%$custnum%>">
- <i>(<% mt('view all') %>)</i>
+ <i>(<% emt('view all') %>)</i>
</A>
% } else {
-<% mt('[quant,_1,total message]', $total) %>
+<% emt('[quant,_1,total message]', $total) %>
% }
<BR>
<& /elements/table-grid.html &>
<TR>
- <TH CLASS="grid"><% mt('Date') %></TH>
- <TH CLASS="grid"><% mt('Type') %></TH>
- <TH CLASS="grid"><% mt('Destination') %></TH>
- <TH CLASS="grid"><% mt('Subject') %></TH>
+ <TH CLASS="grid"><% emt('Date') %></TH>
+ <TH CLASS="grid"><% emt('Type') %></TH>
+ <TH CLASS="grid"><% emt('Destination') %></TH>
+ <TH CLASS="grid"><% emt('Subject') %></TH>
<TH CLASS="grid"></TH>
</TR>
% my $i = 0;
diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index 0a5305e..1b397d8 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -265,7 +265,7 @@
% if ( @cust_pkg_usage ) {
<TABLE CLASS="usage inv">
- <TR><TH COLSPAN=4><% mt('Included usage') %></TH></TR>
+ <TR><TH COLSPAN=4><% emt('Included usage') %></TH></TR>
% foreach my $usage (@cust_pkg_usage) {
% my $part = $usage->part_pkg_usage;
% my $ratio = 255 * ($usage->minutes / $part->minutes);
commit 42a5e5491d250c6462bc9e5bad53786414020fa9
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Sep 25 11:17:05 2016 -0700
unchecked seems like a more sensible default to start the page with
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index dd1f97d..27aecec 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -204,7 +204,7 @@
'nogeocode'=> 'has an implicit tax location',
'geocode' => 'has a hardcoded tax location',
},
- 'value' => { map { $_ => 1 } @location_options },
+ 'value' => { map { $_ => 0 } @location_options },
&>
<& /elements/tr-title.html, value => mt('Display options') &>
-----------------------------------------------------------------------
Summary of changes:
httemplate/elements/change_password.html | 2 +-
httemplate/elements/tr-cust_main-phones.html | 8 ++++----
httemplate/misc/batch-cust_pay.html | 2 +-
httemplate/misc/change_pkg_contact.html | 2 +-
httemplate/misc/detach_pkg.html | 4 ++--
httemplate/search/report_cust_pkg.html | 2 +-
httemplate/search/report_prepaid_income.html | 6 +++---
httemplate/view/cust_bill.cgi | 4 ++--
httemplate/view/cust_main/contacts.html | 2 +-
httemplate/view/cust_main/misc.html | 2 +-
httemplate/view/cust_main/notes/email.html | 16 ++++++++--------
httemplate/view/cust_main/packages/package.html | 2 +-
12 files changed, 26 insertions(+), 26 deletions(-)
More information about the freeside-commits
mailing list