internationalization/localization, RT12515

4 files changed, 17 insertions, 15 deletions

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 0bcfacbf8..8ddeb1c81 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,5 +1,5 @@
 <& /elements/header.html, mt('Invoice View'), menubar(
-  mt('View this customer')." (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
+  mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
 ) &>
 
 % if ( $conf->exists('deleteinvoices')
diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index 237838029..71c4fb4d5 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -54,7 +54,7 @@
 %                                             'edit/cust_main_note.cgi'.
 %                                             "?custnum=$custnum".
 %                                             ";notenum=$notenum",
-%                            'actionlabel' => 'Edit customer note',
+%                            'actionlabel' => mt('Edit customer note'),
 %                            'width'       => 616,
 %                            'height'      => 538, #575
 %                            'frame'       => 'top',
@@ -63,13 +63,14 @@
 %
 %   my $edit = '';
 %   if ($curuser->access_right('Edit customer note') ) {
-%     $edit = qq! <A HREF="javascript:void(0);" $clickjs>(edit)</A>!;
+%     my $editlabel = mt('edit');
+%     $edit = qq! <A HREF="javascript:void(0);" $clickjs>($editlabel)</A>!;
 %   }
 %
 % if ( $last_classnum != $note->classnum && !$skipheader ) {
 % my $tmp_classnum = $note->classnum ? $note->classnum : 0;
 % $classes{$tmp_classnum} = $note->classname ne '' ? $note->classname 
-%						     : 'Other';
+%						     : mt('Other');
 % if ( $last_classnum != -1 ) {
     </TABLE>
   </DIV>
@@ -82,15 +83,15 @@
 	>
 	<% include("/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"><% mt('Person') |h %></TH>
 %   if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) {
-	    <TH CLASS="grid" BGCOLOR="#cccccc">Class</TH>
+	    <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Class') |h %></TH>
 %   }
-	    <TH CLASS="grid" BGCOLOR="#cccccc">Note</TH>
+	    <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Note') |h %></TH>
 %   if ($curuser->access_right('Edit customer note') ) {
 	    <TH CLASS="grid" BGCOLOR="#cccccc">&nbsp;</TH>
 %   }
@@ -124,7 +125,7 @@
 
 % if ( $conf->exists('note-classes') && $conf->config('note-classes') == 2 ) {
 % 	my($classnum,$classname);
-Show notes of class: &nbsp; 
+<% mt('Show notes of class:') |h %> &nbsp; 
 % 	foreach my $classnum ( sort { $b <=> $a } (keys %classes) ) {
 	    <A	id="notes_tablink_<% $classnum %>"
 		HREF="javascript:display_notes_classnum(<% $classnum %>)"
diff --git a/httemplate/view/cust_pay.html b/httemplate/view/cust_pay.html
index b1e33e66c..cdce2ca92 100644
--- a/httemplate/view/cust_pay.html
+++ b/httemplate/view/cust_pay.html
@@ -14,20 +14,21 @@
 % #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')." (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
+       mt("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: $email_error") &>
+      <& /elements/header-popup.html, mt("Error re-emailing receipt") &>
+%       warn "Error re-emailing receipt: $email_error";
 %  } else {
       <& /elements/header-popup.html, mt("Re-emailed receipt") &>
 %  }
 % } else { 
 
   <& /elements/header.html, mt("$thing Receipt"), menubar(
-       mt('View this customer')." (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
+       mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
        mt('Print receipt') => $pr_link,
      )
   &>
diff --git a/httemplate/view/cust_refund.html b/httemplate/view/cust_refund.html
index 0bef89d05..9cda1a6a8 100644
--- a/httemplate/view/cust_refund.html
+++ b/httemplate/view/cust_refund.html
@@ -11,7 +11,7 @@
 % #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')." (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
+       mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
      )
   %>
   <BR><BR>
@@ -19,7 +19,7 @@
 % } else { 
 
   <& /elements/header.html, mt('Refund Receipt'), menubar(
-       mt('View this customer')." (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
+       mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
        mt('Print receipt') => $pr_link,
      )
   &>