[freeside-commits] freeside/httemplate/view/cust_main attachments.html, 1.5, 1.6 notes.html, 1.16, 1.17 one_time_charge_link.html, 1.4, 1.5 payment_history.html, 1.56, 1.57
Erik Levinson
levinse at wavetail.420.am
Mon May 16 22:00:45 PDT 2011
Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail.420.am:/tmp/cvs-serv16996/view/cust_main
Modified Files:
attachments.html notes.html one_time_charge_link.html
payment_history.html
Log Message:
internationalization/localization, RT12515
Index: payment_history.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -w -d -r1.56 -r1.57
--- payment_history.html 17 May 2011 00:37:21 -0000 1.56
+++ payment_history.html 17 May 2011 05:00:43 -0000 1.57
@@ -471,13 +471,28 @@
my %payby = (
BILL => $payinfo ? mt('Check #') : mt('Check'),
CHEK => mt('Electronic check '),
- CARD => 'CARD ',
- COMP => 'COMP ',
+ CARD => mt('Credit card #'),
+ COMP => mt('Complimentary by '),
);
$payby = (exists $payby{$payby}) ? $payby{$payby} : $payby;
$payby;
};
+sub translate_payinfo {
+ my $object = shift;
+ my $payby = $object->payby;
+ my $payinfo = $object->payinfo;
+
+ if ( $payby eq 'CARD' ) {
+ $payinfo = $object->paymask;
+ } elsif ( $payby eq 'CHEK' ) {
+ my( $account, $aba ) = split('@', $object->paymask );
+ $payinfo = mt("ABA [_1], Acct #[_2]",$aba,$account);
+ }
+
+ ($payby,$payinfo);
+}
+
sub areyousure_link {
my ($url,$msg,$title,$label) = (shift,shift,shift,shift);
' (<A HREF="javascript:areyousure(\''.$url.'\',\''.$msg.'\')" TITLE="'.$title.'">'.$label.'</A>)';
Index: one_time_charge_link.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/one_time_charge_link.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- one_time_charge_link.html 18 Mar 2010 07:59:52 -0000 1.4
+++ one_time_charge_link.html 17 May 2011 05:00:43 -0000 1.5
@@ -76,8 +76,8 @@
<% include('/elements/popup_link.html', {
'action' => $p.'edit/quick-charge.html?custnum='. $cust_main->custnum,
- 'label' => 'One-time charge',
- 'actionlabel' => 'One-time charge',
+ 'label' => mt('One-time charge'),
+ 'actionlabel' => mt('One-time charge'),
'color' => '#333399',
'width' => 763,
'height' => 460, #more for more room for lines of add'l description?
Index: attachments.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/attachments.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- attachments.html 31 Mar 2010 07:35:47 -0000 1.5
+++ attachments.html 17 May 2011 05:00:43 -0000 1.6
@@ -1,19 +1,19 @@
% if ( scalar(@attachments) ) {
- <% include('/elements/init_overlib.html') %>
+ <& /elements/init_overlib.html &>
- <% include("/elements/table-grid.html") %>
+ <& /elements/table-grid.html &>
<TR>
- <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
% if ( $conf->exists('cust_main_note-display_times') ) {
- <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Time') |h %></TH>
% }
- <TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Filename</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Type</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Size</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Person') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Filename') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Type') |h %></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Size') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"></TH>
</TR>
@@ -48,34 +48,35 @@
% my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
% "custnum=$custnum;attachnum=$attachnum;".
% "undelete=1",
-% 'Undelete attachment');
-% $edit .= qq! <A HREF="javascript:void(0);" $clickjs>(undelete)</A>!;
+% mt('Undelete attachment'));
+% $edit .= linkstr($clickjs, mt('undelete'));
% }
% if ($curuser->access_right('Purge attachment')) {
% my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
% "custnum=$custnum;attachnum=$attachnum;".
% "purge=1",
-% 'Purge attachment',
-% 'Permanently remove this file?');
-% $edit .= qq! <A HREF="javascript:void(0);" $clickjs>(purge)</A>!;
+% mt('Purge attachment'),
+% mt('Permanently remove this file?') );
+% $edit .= linkstr($clickjs,mt('purge'));
% }
% }
% else { # you can download or edit it
% if ($curuser->access_right('Edit attachment') ) {
% my $clickjs = popup('edit/cust_main_attach.cgi?'.
% "custnum=$custnum;attachnum=$attachnum",
-% 'Edit attachment properties');
-% $edit .= qq! <A HREF="javascript:void(0);" $clickjs>(edit)</A>!;
+% mt('Edit attachment properties'));
+% $edit .= linkstr($clickjs,mt('edit'));
% }
% if($curuser->access_right('Delete attachment') ) {
% my $clickjs = popup('edit/process/cust_main_attach.cgi?'.
% "custnum=$custnum;attachnum=$attachnum;delete=1",
% 'Delete attachment',
% 'Delete this file?');
-% $edit .= qq! <A HREF="javascript:void(0);" $clickjs>(delete)</A>!;
+% $edit .= linkstr($clickjs,mt('delete'));
% }
% if ($curuser->access_right('Download attachment') ) {
-% $edit .= qq! <A HREF="!.popurl(1).'attachment.html?'.$attachnum.qq!">(download)</A>!;
+% $edit .= qq! <A HREF="!.popurl(1).'attachment.html?'.$attachnum.qq!">(!
+% . mt('download') .')</A>';
% }
% }
@@ -131,6 +132,11 @@
$strip;
}
+sub linkstr {
+ my ($clickjs, $label) = (shift,shift);
+ ' <A HREF="javascript:void(0);" '. $clickjs . '>(' . mt($label) . ')</A>';
+}
+
sub size_units {
my $bytes = shift;
return $bytes if $bytes < 1024;
Index: notes.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/notes.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -d -r1.16 -r1.17
--- notes.html 16 May 2011 16:29:49 -0000 1.16
+++ notes.html 17 May 2011 05:00:43 -0000 1.17
@@ -63,8 +63,7 @@
%
% my $edit = '';
% if ($curuser->access_right('Edit customer note') ) {
-% my $editlabel = mt('edit');
-% $edit = qq! <A HREF="javascript:void(0);" $clickjs>($editlabel)</A>!;
+% $edit = qq! <A HREF="javascript:void(0);" $clickjs>(!.mt('edit').')</A>';
% }
%
% if ( $last_classnum != $note->classnum && !$skipheader ) {
More information about the freeside-commits
mailing list