[freeside-commits] freeside/httemplate/view cust_bill.cgi, 1.49, 1.50 cust_main.cgi, 1.139, 1.140 cust_pay.html, 1.12, 1.13 cust_refund.html, 1.6, 1.7 svc_acct.cgi, 1.67, 1.68 svc_phone.cgi, 1.30, 1.31
Erik Levinson
levinse at wavetail.420.am
Tue May 17 17:55:38 PDT 2011
- Previous message: [freeside-commits] freeside/FS/FS Mason.pm, 1.74, 1.75 Maketext.pm, 1.1, 1.2
- Next message: [freeside-commits] freeside/httemplate/view/cust_main attachments.html, 1.6, 1.7 billing.html, 1.27, 1.28 contacts.html, 1.16, 1.17 locations.html, 1.3, 1.4 misc.html, 1.20, 1.21 notes.html, 1.17, 1.18 one_time_charge_link.html, 1.5, 1.6 order_pkg_link.html, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv4373/view
Modified Files:
cust_bill.cgi cust_main.cgi cust_pay.html cust_refund.html
svc_acct.cgi svc_phone.cgi
Log Message:
internationalization/localization, RT12515
Index: cust_bill.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_bill.cgi,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -w -d -r1.49 -r1.50
--- cust_bill.cgi 16 May 2011 15:18:56 -0000 1.49
+++ cust_bill.cgi 18 May 2011 00:55:36 -0000 1.50
@@ -1,5 +1,5 @@
-<& /elements/header.html, mt('Invoice View'), menubar(
- mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
+<& /elements/header.html, emt('Invoice View'), menubar(
+ emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
) &>
% if ( $conf->exists('deleteinvoices')
Index: svc_phone.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_phone.cgi,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -d -r1.30 -r1.31
--- svc_phone.cgi 16 May 2011 16:29:49 -0000 1.30
+++ svc_phone.cgi 18 May 2011 00:55:36 -0000 1.31
@@ -39,9 +39,9 @@
###
my $e911 =
- mt('E911 Information').
+ emt('E911 Information').
&ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
- '<TR><TD>'.mt('Location').'</TD>'.
+ '<TR><TD>'.emt('Location').'</TD>'.
'<TD BGCOLOR="#FFFFFF">'.
$svc_phone->location_label( 'join_string' => '<BR>',
'double_space' => ' ',
Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main.cgi,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -w -d -r1.139 -r1.140
--- cust_main.cgi 7 May 2011 17:30:25 -0000 1.139
+++ cust_main.cgi 18 May 2011 00:55:36 -0000 1.140
@@ -1,9 +1,9 @@
-<% include('/elements/header.html', {
+<& /elements/header.html, {
'title' => $title,
'head' => $head,
'nobr' => 1,
- })
-%>
+ }
+&>
<BR>
% my @part_tag = $cust_main->part_tag;
% if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) {
@@ -22,17 +22,16 @@
</TABLE>
% }
-<% include('/elements/menubar.html',
+<& /elements/menubar.html,
{ 'newstyle' => 1,
'selected' => $viewname{$view},
'url_base' => $cgi->url. "?custnum=$custnum;show=",
},
%views,
- )
-%>
+&>
<DIV CLASS="fstabcontainer">
-<% include('/elements/init_overlib.html') %>
+<& /elements/init_overlib.html &>
<SCRIPT TYPE="text/javascript">
function areyousure(href, message) {
@@ -51,45 +50,42 @@
% && $cust_main->ncancelled_pkgs
% ) {
- <% include( '/elements/popup_link-cust_main.html',
+ <& /elements/popup_link-cust_main.html,
{ 'action' => $p. 'misc/cancel_cust.html',
- 'label' => 'Cancel this customer',
- 'actionlabel' => 'Confirm Cancellation',
+ 'label' => emt('Cancel this customer'),
+ 'actionlabel' => emt('Confirm Cancellation'),
'color' => '#ff0000',
'cust_main' => $cust_main,
'width' => 616, #make room for reasons
'height' => 366,
}
- )
- %> |
+ &> |
% }
% if ( $curuser->access_right('Merge customer') ) {
- <% include( '/elements/popup_link-cust_main.html',
+ <& /elements/popup_link-cust_main.html,
{ 'action' => $p. 'misc/merge_cust.html',
- 'label' => 'Merge this customer',
- 'actionlabel' => 'Merge customer',
- #'color' => '#ff0000',
+ 'label' => emt('Merge this customer'),
+ 'actionlabel' => emt('Merge customer'),
'cust_main' => $cust_main,
'width' => 480,
'height' => 192,
}
- )
- %> |
+ &> |
% }
% if ( $conf->exists('deletecustomers')
% && $curuser->access_right('Delete customer')
% ) {
- <A HREF="<% $p %>misc/delete-customer.cgi?<% $custnum%>">Delete this customer</A> |
+ <A HREF="<% $p %>misc/delete-customer.cgi?<% $custnum%>"><% mt('Delete this customer') |h %></A> |
% }
% unless ( $conf->exists('disable_customer_referrals') ) {
- <A HREF="<% $p %>edit/cust_main.cgi?referral_custnum=<% $custnum %>">Refer a new customer</A> |
- <A HREF="<% $p %>search/cust_main.cgi?referral_custnum=<% $custnum %>">View this customer's referrals</A>
+ <A HREF="<% $p %>edit/cust_main.cgi?referral_custnum=<% $custnum %>"><% mt('Refer a new customer') |h %></A> |
+ <A HREF="<% $p %>search/cust_main.cgi?referral_custnum=<% $custnum %>"><% mt('View this customer\'s referrals') |h %></A>
% }
<BR><BR>
@@ -99,7 +95,7 @@
% || $curuser->access_right('View customer billing events')
% ) {
% $br=1;
- <A HREF="<% $p %>search/cust_event.html?custnum=<% $custnum %>">View billing events for this customer</A>
+ <A HREF="<% $p %>search/cust_event.html?custnum=<% $custnum %>"><% mt('View billing events for this customer') |h %></A>
% }
% if ( $conf->config('cust_main-external_links') ) {
@@ -119,25 +115,26 @@
%my $signupurl = $conf->config('signupurl');
%if ( $signupurl ) {
- This customer's signup URL: <A HREF="<% $signupurl %>?ref=<% $custnum %>"><% $signupurl %>?ref=<% $custnum %></A><BR><BR>
+ <% mt('This customer\'s signup URL:') |h %>
+ <A HREF="<% $signupurl %>?ref=<% $custnum %>"><% $signupurl %>?ref=<% $custnum %></A>
+ <BR><BR>
% }
%if ( $conf->exists('maestro-status_test') ) {
- <A HREF="<% $p %>misc/maestro-customer_status-test.html?<% $custnum %>">Test maestro status</A><BR><BR>
+ <A HREF="<% $p %>misc/maestro-customer_status-test.html?<% $custnum %>"><% mt('Test maestro status') |h %></A>
+ <BR><BR>
% }
<A NAME="cust_main"></A>
<TABLE BORDER=0>
<TR>
<TD VALIGN="top">
- <% include('cust_main/contacts.html', $cust_main ) %>
+ <& cust_main/contacts.html, $cust_main &>
</TD>
<TD VALIGN="top" STYLE="padding-left: 54px">
- <% include('cust_main/misc.html', $cust_main ) %>
+ <& cust_main/misc.html, $cust_main &>
% if ( $conf->config('payby-default') ne 'HIDE' ) {
-
- <BR>
- <% include('cust_main/billing.html', $cust_main ) %>
+ <BR><& cust_main/billing.html, $cust_main &>
% }
</TD>
@@ -149,8 +146,7 @@
% if ( $view eq 'notes' || $view eq 'jumbo' ) {
%if ( $cust_main->comments =~ /[^\s\n\r]/ ) {
-<BR>
-Comments
+<BR><% mt('Comments') |h %>
<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
<TR>
<TD BGCOLOR="#ffffff">
@@ -166,55 +162,53 @@
% unless ( $view eq 'notes' && $cust_main->comments !~ /[^\s\n\r]/ ) {
<BR>
- <A NAME="cust_main_note"><FONT SIZE="+2">Notes</FONT></A><BR>
+ <A NAME="cust_main_note"><FONT SIZE="+2"><% mt('Notes') |h %></FONT></A><BR>
% }
% if ( $curuser->access_right('Add customer note') &&
% ! $conf->exists('cust_main-disable_notes')
% ) {
- <% include( '/elements/popup_link-cust_main.html',
- 'label' => 'Add customer note',
+ <& /elements/popup_link-cust_main.html,
+ 'label' => emt('Add customer note'),
'action' => $p. 'edit/cust_main_note.cgi',
- 'actionlabel' => 'Enter customer note',
+ 'actionlabel' => emt('Enter customer note'),
'cust_main' => $cust_main,
'width' => 616,
'height' => 538, #575
- )
- %>
+ &>
% }
<BR>
-<% include('cust_main/notes.html', 'custnum' => $cust_main->custnum ) %>
+<& cust_main/notes.html, 'custnum' => $cust_main->custnum &>
% }
<BR>
% if(! $conf->config('disable_cust_attachment')
% and $curuser->access_right('Add attachment')) {
-<% include( '/elements/popup_link-cust_main.html',
- 'label' => 'Attach file',
+<& /elements/popup_link-cust_main.html,
+ 'label' => emt('Attach file'),
'action' => $p.'edit/cust_main_attach.cgi',
- 'actionlabel' => 'Upload file',
+ 'actionlabel' => emt('Upload file'),
'cust_main' => $cust_main,
'width' => 480,
'height' => 296,
- )
-%>
+&>
% }
% if( $curuser->access_right('View attachments') ) {
-<% include('cust_main/attachments.html', 'custnum' => $cust_main->custnum ) %>
+<& cust_main/attachments.html, 'custnum' => $cust_main->custnum &>
% if ($cgi->param('show_deleted')) {
<A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
($view ? ";show=$view" : '') . '#notes'
- %>"><I>(Show active attachments)</I></A>
+ %>"><I>(<% mt('Show active attachments') |h %>)</I></A>
% }
% elsif($curuser->access_right('View deleted attachments')) {
<A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
($view ? ";show=$view" : '') . ';show_deleted=1#notes'
- %>"><I>(Show deleted attachments)</I></A>
+ %>"><I>(<% mt('Show deleted attachments') |h %>)</I></A>
% }
% }
<BR>
@@ -223,13 +217,13 @@
% if ( $view eq 'jumbo' ) {
<BR><BR>
- <A NAME="tickets"><FONT SIZE="+2">Tickets</FONT></A><BR>
+ <A NAME="tickets"><FONT SIZE="+2"><% mt('Tickets') |h %></FONT></A><BR>
% }
% if ( $view eq 'tickets' || $view eq 'jumbo' ) {
% if ( $conf->config('ticket_system') ) {
- <% include('cust_main/tickets.html', $cust_main ) %>
+ <& cust_main/tickets.html, $cust_main &>
% }
<BR><BR>
@@ -237,40 +231,41 @@
% if ( $view eq 'jumbo' ) { #XXX enable me && $curuser->access_right('View customer packages') {
- <A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A><BR>
+ <A NAME="cust_pkg"><FONT SIZE="+2"><% mt('Packages') |h %></FONT></A><BR>
% }
% if ( $view eq 'packages' || $view eq 'jumbo' ) {
% #XXX enable me# if ( $curuser->access_right('View customer packages') {
-<% include('cust_main/packages.html', $cust_main ) %>
+<& cust_main/packages.html, $cust_main &>
% #}
% }
% if ( $view eq 'jumbo' ) {
<BR><BR>
- <A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
+ <A NAME="history"><FONT SIZE="+2"><% mt('Payment History') |h %></FONT></A>
+ <BR>
% }
% if ( $view eq 'payment_history' || $view eq 'jumbo' ) {
% if ( $conf->config('payby-default') ne 'HIDE' ) {
- <% include('cust_main/payment_history.html', $cust_main ) %>
+ <& cust_main/payment_history.html, $cust_main &>
% }
% }
% if ( $view eq 'change_history' ) { # || $view eq 'jumbo'
-<% include('cust_main/change_history.html', $cust_main ) %>
+<& cust_main/change_history.html, $cust_main &>
% }
% if ( $view eq 'custom' ) {
-<% include('cust_main/custom.html', $cust_main ) %>
+<& cust_main/custom.html, $cust_main &>
% }
</DIV>
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
@@ -304,19 +299,19 @@
#false laziness w/pref/pref.html and Conf.pm (cust_main-default_view)
tie my %views, 'Tie::IxHash',
- 'Basics' => 'basics',
- 'Notes' => 'notes', #notes and files?
+ emt('Basics') => 'basics',
+ emt('Notes') => 'notes', #notes and files?
;
-$views{'Tickets'} = 'tickets'
+$views{emt('Tickets')} = 'tickets'
if $conf->config('ticket_system');
-$views{'Packages'} = 'packages';
-$views{'Payment History'} = 'payment_history'
+$views{emt('Packages')} = 'packages';
+$views{emt('Payment History')} = 'payment_history'
unless $conf->config('payby-default' eq 'HIDE');
-$views{'Change History'} = 'change_history'
+$views{emt('Change History')} = 'change_history'
if $curuser->access_right('View customer history');
-$views{$conf->config('cust_main-custom_title') || 'Custom'} = 'custom'
+$views{$conf->config('cust_main-custom_title') || emt('Custom')} = 'custom'
if $conf->config('cust_main-custom_link');
-$views{'Jumbo'} = 'jumbo';
+$views{emt('Jumbo')} = 'jumbo';
my %viewname = reverse %views;
Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_acct.cgi,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -w -d -r1.67 -r1.68
--- svc_acct.cgi 17 May 2011 05:00:43 -0000 1.67
+++ svc_acct.cgi 18 May 2011 00:55:36 -0000 1.68
@@ -1,12 +1,12 @@
% if ( $custnum ) {
- <& /elements/header.html, mt("View [_1] account",$svc) &>
+ <& /elements/header.html, emt("View [_1] account",$svc) &>
<& /elements/small_custview.html, $custnum, '', 1,
"${p}view/cust_main.cgi" &>
<BR>
% } else {
-% my $delmsg = mt('Permanently delete this account?');
+% my $delmsg = emt('Permanently delete this account?');
<SCRIPT>
function areyousure(href) {
@@ -15,8 +15,8 @@
}
</SCRIPT>
- <& /elements/header.html, mt('View account'), menubar(
- mt("Cancel this (unaudited) account") =>
+ <& /elements/header.html, emt('View account'), menubar(
+ emt("Cancel this (unaudited) account") =>
"javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
) &>
Index: cust_refund.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_refund.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- cust_refund.html 16 May 2011 16:29:49 -0000 1.6
+++ cust_refund.html 18 May 2011 00:55:36 -0000 1.7
@@ -1,26 +1,26 @@
% if ( $link eq 'popup' ) {
- <& /elements/header-popup.html, mt('Refund Receipt') &>
+ <& /elements/header-popup.html, emt('Refund Receipt') &>
<CENTER><A HREF="javascript:self.parent.location = '<% $pr_link %>'"><% mt('Print') |h %></A></CENTER><BR>
% } elsif ( $link eq 'print' ) {
- <& /elements/header-popup.html, mt('Refund Receipt') &>
+ <& /elements/header-popup.html, emt('Refund Receipt') &>
% #it would be nice if the menubar could be hidden for print, but better to
% # have it available than not, otherwise the user winds up at a dead end
<% menubar(
- mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
+ emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
)
%>
<BR><BR>
% } else {
- <& /elements/header.html, mt('Refund Receipt'), menubar(
- mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
- mt('Print receipt') => $pr_link,
+ <& /elements/header.html, emt('Refund Receipt'), menubar(
+ emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
+ emt('Print receipt') => $pr_link,
)
&>
Index: cust_pay.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_pay.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- cust_pay.html 17 May 2011 05:00:43 -0000 1.12
+++ cust_pay.html 18 May 2011 00:55:36 -0000 1.13
@@ -1,6 +1,6 @@
% if ( $link eq 'popup' ) {
- <& /elements/header-popup.html, mt("$thing Receipt") &>
+ <& /elements/header-popup.html, emt("$thing Receipt") &>
<div align="center">
<A HREF="javascript:self.parent.location = '<% $pr_link %>'"><% mt('Print') |h %></A> |
@@ -9,26 +9,26 @@
% } elsif ( $link eq 'print' ) {
- <& /elements/header-popup.html, mt("$thing Receipt") &>
+ <& /elements/header-popup.html, emt("$thing Receipt") &>
% #it would be nice if the menubar could be hidden for print, but better to
% # have it available than not, otherwise the user winds up at a dead end
<% menubar(
- mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
+ emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
)
%>
<BR><BR>
% } elsif ( $link eq 'email' ) {
% if ( $email_error ) {
- <& /elements/header-popup.html, mt("Error re-emailing receipt: [_1]", $email_error) &>
+ <& /elements/header-popup.html, emt("Error re-emailing receipt: [_1]", $email_error) &>
% } else {
- <& /elements/header-popup.html, mt("Re-emailed receipt") &>
+ <& /elements/header-popup.html, emt("Re-emailed receipt") &>
% }
% } else {
- <& /elements/header.html, mt("$thing Receipt"), menubar(
- mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
- mt('Print receipt') => $pr_link,
+ <& /elements/header.html, emt("$thing Receipt"), menubar(
+ emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
+ emt('Print receipt') => $pr_link,
)
&>
- Previous message: [freeside-commits] freeside/FS/FS Mason.pm, 1.74, 1.75 Maketext.pm, 1.1, 1.2
- Next message: [freeside-commits] freeside/httemplate/view/cust_main attachments.html, 1.6, 1.7 billing.html, 1.27, 1.28 contacts.html, 1.16, 1.17 locations.html, 1.3, 1.4 misc.html, 1.20, 1.21 notes.html, 1.17, 1.18 one_time_charge_link.html, 1.5, 1.6 order_pkg_link.html, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list