[freeside-commits] freeside/httemplate/view/cust_main contacts.html, 1.15, 1.16 notes.html, 1.15, 1.16 payment_history.html, 1.52, 1.53 tickets.html, 1.17, 1.18
Erik Levinson
levinse at wavetail.420.am
Mon May 16 09:29:51 PDT 2011
- Previous message: [freeside-commits] freeside/httemplate/view cust_pay.html, 1.10, 1.11 cust_refund.html, 1.5, 1.6 svc_acct.cgi, 1.65, 1.66 svc_phone.cgi, 1.29, 1.30
- Next message: [freeside-commits] freeside/httemplate/view/cust_main locations.html, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail.420.am:/tmp/cvs-serv30607/view/cust_main
Modified Files:
contacts.html notes.html payment_history.html tickets.html
Log Message:
internationalization/localization, RT12515
Index: tickets.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/tickets.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -d -r1.17 -r1.18
--- tickets.html 4 Mar 2011 02:26:14 -0000 1.17
+++ tickets.html 16 May 2011 16:29:49 -0000 1.18
@@ -9,8 +9,8 @@
keys %new_param),'Queue=') %>" + selector.options[selector.selectedIndex].value;
}
</SCRIPT>
-<A id="CreateTicketLink" HREF="<% $new_link %>">Create new ticket</A>
- in queue
+<A id="CreateTicketLink" HREF="<% $new_link %>"><% mt('Create new ticket') |h %></A>
+ <% mt('in queue') |h %>
%# fetch list of queues in which the user can create tickets
% my $session = FS::TicketSystem->session();
% my %queues = FS::TicketSystem->queues($session, 'CreateTicket');
@@ -31,22 +31,22 @@
</FORM>
<BR>
-(<A HREF="<% $open_link %>">View <% $openlabel %> tickets for this customer</A>)
-(<A HREF="<% $res_link %>">View resolved tickets for this customer</A>)
+(<A HREF="<% $open_link %>"><% mt("View $openlabel tickets for this customer") |h %></A>)
+(<A HREF="<% $res_link %>"><% mt('View resolved tickets for this customer') |h %></A>)
<BR><BR>
-<% include("/elements/table-grid.html") %>
+<& /elements/table-grid.html &>
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
<TR>
- <TH CLASS="grid" BGCOLOR="#cccccc">#</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Subject</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Queue</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Owner</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Priority</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('#') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Subject') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Status') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Queue') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Owner') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Priority') |h %></TH>
</TR>
% foreach my $ticket ( @tickets ) {
Index: payment_history.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -w -d -r1.52 -r1.53
--- payment_history.html 5 Nov 2010 19:05:56 -0000 1.52
+++ payment_history.html 16 May 2011 16:29:49 -0000 1.53
@@ -3,33 +3,29 @@
% my $s = 0;
% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment' ]) ) {
<% $s++ ? ' | ' : '' %>
- <% include('/elements/popup_link-cust_main.html',
- 'label' => 'Enter check payment',
+ <& /elements/popup_link-cust_main.html,
+ 'label' => mt('Enter check payment'),
'action' => "${p}edit/cust_pay.cgi?popup=1;payby=BILL",
'cust_main' => $cust_main,
- 'actionlabel' => 'Enter check payment',
+ 'actionlabel' => mt('Enter check payment'),
'width' => 392,
- #default# 'height' => 336,
- )
- %>
+ &>
% }
% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) {
<% $s++ ? ' | ' : '' %>
- <% include('/elements/popup_link-cust_main.html',
- 'label' => 'Enter cash payment',
+ <& /elements/popup_link-cust_main.html,
+ 'label' => mt('Enter cash payment'),
'action' => "${p}edit/cust_pay.cgi?popup=1;payby=CASH",
'cust_main' => $cust_main,
- 'actionlabel' => 'Enter cash payment',
+ 'actionlabel' => mt('Enter cash payment'),
'width' => 392,
- #default# 'height' => 336,
- )
- %>
+ &>
% }
% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) {
<% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;custnum=<% $custnum %>">Enter Western Union payment</A>
+ <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;custnum=<% $custnum %>"><% mt('Enter Western Union payment') |h %></A>
% }
% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
@@ -37,7 +33,7 @@
% && ! $cust_main->is_encrypted($cust_main->payinfo)
% ) {
<% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>">Process credit card payment</A>
+ <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>"><% mt('Process credit card payment') |h %></A>
% }
% if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
@@ -45,12 +41,12 @@
% && ! $cust_main->is_encrypted($cust_main->payinfo)
% ) {
<% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>">Process electronic check (ACH) payment</A>
+ <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>"><% mt('Process electronic check (ACH) payment') |h %></A>
% }
% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) {
<% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<% $custnum %>">Post manual (offline/POS) credit card payment</A>
+ <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card payment') |h %></A>
% }
<BR>
@@ -58,15 +54,13 @@
%# credit link
% if ( $curuser->access_right('Post credit') ) {
- <% include('/elements/popup_link-cust_main.html',
- 'label' => 'Enter credit',
+ <& /elements/popup_link-cust_main.html,
+ 'label' => mt('Enter credit'),
'action' => "${p}edit/cust_credit.cgi",
'cust_main' => $cust_main,
- 'actionlabel' => 'Enter credit',
+ 'actionlabel' => mt('Enter credit'),
'width' => 616, #make room for reasons #540 default
- #default# 'height' => 336,
- )
- %>
+ &>
<BR>
% }
@@ -75,28 +69,24 @@
% $s = 0;
% if ( $payby{'BILL'} && $curuser->access_right(['Post refund', 'Post check refund']) ) {
<% $s++ ? ' | ' : '' %>
- <% include('/elements/popup_link-cust_main.html',
- 'label' => 'Enter check refund',
+ <& /elements/popup_link-cust_main.html,
+ 'label' => mt('Enter check refund'),
'action' => "${p}edit/cust_refund.cgi?popup=1;payby=BILL",
'cust_main' => $cust_main,
- 'actionlabel' => 'Enter check refund',
+ 'actionlabel' => mt('Enter check refund'),
'width' => 392,
- #default# 'height' => 336,
- )
- %>
+ &>
% }
% if ( $payby{'CASH'} && $curuser->access_right(['Post refund', 'Post cash refund']) ) {
<% $s++ ? ' | ' : '' %>
- <% include('/elements/popup_link-cust_main.html',
- 'label' => 'Enter cash refund',
+ <& /elements/popup_link-cust_main.html,
+ 'label' => mt('Enter cash refund'),
'action' => "${p}edit/cust_refund.cgi?popup=1;payby=CASH",
'cust_main' => $cust_main,
- 'actionlabel' => 'Enter cash refund',
+ 'actionlabel' => mt('Enter cash refund'),
'width' => 392,
- #default# 'height' => 336,
- )
- %>
+ &>
% }
%# someday, perhaps. very few gateways let you do unlinked refunds at all.
@@ -120,7 +110,7 @@
% if ( $payby{'MCRD'} && $curuser->access_right('Post refund') ) {
<% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_refund.cgi?payby=MCRD;custnum=<% $custnum %>">Post manual (offline/POS) credit card refund</A>
+ <A HREF="<% $p %>edit/cust_refund.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card refund') |h %></A>
% }
<BR>
@@ -134,22 +124,20 @@
% if ( $view_exemptions || $add_adjustment ) {
% if ( $view_exemptions ) {
- <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>">View tax exemptions</A>
+ <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>"><% mt('View tax exemptions') |h %></A>
<% $add_adjustment ? '|' : '' %>
% }
% if ( $add_adjustment ) {
- <% include('/elements/popup_link.html', {
+ <& /elements/popup_link.html, {
'action' => $p.'edit/cust_tax_adjustment.html?custnum='. $cust_main->custnum,
- 'label' => 'Add tax adjustment',
- 'actionlabel' => 'Add tax adjustment',
- #'color' => '#333399',
- #'width' => 763,
+ 'label' => mt('Add tax adjustment'),
+ 'actionlabel' => mt('Add tax adjustment'),
'height' => 200,
- })
- %>
+ }
+ &>
|
- <A HREF="<% $p %>search/cust_tax_adjustment.html?custnum=<% $custnum %>">View tax adjustments</A>
+ <A HREF="<% $p %>search/cust_tax_adjustment.html?custnum=<% $custnum %>"><% mt('View tax adjustments') |h %></A>
% }
<BR>
@@ -161,9 +149,9 @@
% && $curuser->access_right('View customer batched payments')
% )
% {
- View batched payments:
+ <% mt('View batched payments:') |h %>
% foreach my $status (qw( Queued In-transit Complete All )) {
- <A HREF="<% $p %>search/cust_pay_batch.cgi?status=<% $status{$status} %>;custnum=<% $custnum %>"><% $status %></A>
+ <A HREF="<% $p %>search/cust_pay_batch.cgi?status=<% $status{$status} %>;custnum=<% $custnum %>"><% mt($status) |h %></A>
<% $status ne 'All' ? '|' : '' %>
% }
<BR>
@@ -175,24 +163,24 @@
% && scalar($cust_main->cust_pay_pending)
% )
% {
- <A HREF="<% $p %>search/cust_pay_pending.html?magic=_date;statusNOT=done;custnum=<% $custnum %>">View pending payments</A><BR>
+ <A HREF="<% $p %>search/cust_pay_pending.html?magic=_date;statusNOT=done;custnum=<% $custnum %>"><% mt('View pending payments') |h %></A><BR>
% }
%# and now the table
-<% include("/elements/table-grid.html") %>
+<& /elements/table-grid.html &>
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
<TR>
- <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Invoice</FONT></TH>
- <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Payment</FONT></TH>
- <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
- <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Refund</FONT></TH>
- <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Balance</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Invoice') |h %></FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Payment') |h %></FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>In-house Credit</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Refund') |h %></FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Balance') |h %></FONT></TH>
</TR>
%#display payment history
@@ -209,8 +197,8 @@
</TD>
<TD CLASS="grid" BGCOLOR="#dddddd">
- <I>Starting balance on <% time2str($date_format, $date) %></I>
- (<A HREF="javascript:void(0);" onClick="show_history();">show prior history</A>)
+ <I><% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %></I>
+ (<A HREF="javascript:void(0);" onClick="show_history();"><% mt('show prior history') |h %></A>)
</TD>
<TD CLASS="grid" BGCOLOR="#dddddd"></TD>
Index: notes.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/notes.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -d -r1.15 -r1.16
--- notes.html 16 May 2011 15:18:56 -0000 1.15
+++ notes.html 16 May 2011 16:29:49 -0000 1.16
@@ -30,7 +30,7 @@
</SCRIPT>
- <% include('/elements/init_overlib.html') %>
+ <& /elements/init_overlib.html &>
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
@@ -81,7 +81,7 @@
<DIV id="notes_<% $tmp_classnum %>"
style="display:<% $display %>"
>
- <% include("/elements/table-grid.html") %>
+ <& /elements/table-grid.html &>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
% if ( $conf->exists('cust_main_note-display_times') ) {
Index: contacts.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/contacts.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -d -r1.15 -r1.16
--- contacts.html 27 Mar 2011 22:46:38 -0000 1.15
+++ contacts.html 16 May 2011 16:29:49 -0000 1.16
@@ -1,14 +1,14 @@
% my %which = (
-% '' => 'Billing',
-% 'ship_' => 'Service',
+% '' => mt('Billing'),
+% 'ship_' => mt('Service'),
% );
% foreach my $which ( '', 'ship_' ) {
% my $pre = $cust_main->get("${which}last") ? $which : '';
-<% $which{$which} %> address
+<% $which{$which} %> <% mt('address') |h %>
<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
<TR>
- <TD ALIGN="right">Contact name</TD>
+ <TD ALIGN="right"><% mt('Contact name') |h %></TD>
<TD COLSPAN=5 BGCOLOR="#ffffff">
<% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") |h %>
</TD>
@@ -18,11 +18,11 @@
% }
</TR>
<TR>
- <TD ALIGN="right">Company</TD>
+ <TD ALIGN="right"><% mt('Company') |h %></TD>
<TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}company") |h %></TD>
</TR>
<TR>
- <TD ALIGN="right">Address</TD>
+ <TD ALIGN="right"><% mt('Address') |h %></TD>
<TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address1") |h %></TD>
</TR>
@@ -31,8 +31,8 @@
% ( $conf->exists('cust_main-require_address2')
% && ! ( $pre xor $cust_main->has_ship_address )
% )
-% ? 'Unit #'
-% : ' ';
+% ? mt('Unit #')
+% : ' ';
<TR>
<TD ALIGN="right"><% $address2_label %></TD>
@@ -42,43 +42,41 @@
% }
<TR>
- <TD ALIGN="right">City</TD>
+ <TD ALIGN="right"><% mt('City') |h %></TD>
<TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}city") |h %></TD>
% if ( $cust_main->get("${pre}county") ) {
- <TD ALIGN="right">County</TD>
+ <TD ALIGN="right"><% mt('County') |h %></TD>
<TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}county") |h %></TD>
% }
- <TD ALIGN="right">State</TD>
+ <TD ALIGN="right"><% mt('State') |h %></TD>
<TD BGCOLOR="#ffffff"><% state_label( $cust_main->get("${pre}state"), $cust_main->get("${pre}country") ) |h %></TD>
- <TD ALIGN="right">Zip</TD>
+ <TD ALIGN="right"><% mt('Zip') |h %></TD>
<TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}zip") %></TD>
</TR>
<TR>
- <TD ALIGN="right">Country</TD>
+ <TD ALIGN="right"><% mt('Country') |h %></TD>
<TD BGCOLOR="#ffffff"><% code2country( $cust_main->get("${pre}country") ) %></TD>
</TR>
<TR>
<TD ALIGN="right"><% $daytime_label %></TD>
<TD COLSPAN=3 BGCOLOR="#ffffff">
- <% include('/elements/phonenumber.html',
+ <& /elements/phonenumber.html,
$cust_main->get("${pre}daytime"),
'callable'=>1
- )
- %>
+ &>
</TD>
</TR>
<TR>
<TD ALIGN="right"><% $night_label %></TD>
<TD COLSPAN=3 BGCOLOR="#ffffff">
- <% include('/elements/phonenumber.html',
+ <& /elements/phonenumber.html,
$cust_main->get("${pre}night"),
'callable'=>1
- )
- %>
+ &>
</TD>
</TR>
<TR>
- <TD ALIGN="right">Fax</TD>
+ <TD ALIGN="right"><% mt('Fax') |h %></TD>
<TD COLSPAN=3 BGCOLOR="#ffffff">
<% $cust_main->get("${pre}fax") || ' ' %>
</TD>
@@ -96,7 +94,7 @@
<BR>
% }
% }
-<% include('contacts_new.html', $cust_main) %>
+<& contacts_new.html, $cust_main &>
<%once>
my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
- Previous message: [freeside-commits] freeside/httemplate/view cust_pay.html, 1.10, 1.11 cust_refund.html, 1.5, 1.6 svc_acct.cgi, 1.65, 1.66 svc_phone.cgi, 1.29, 1.30
- Next message: [freeside-commits] freeside/httemplate/view/cust_main locations.html, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list