Merge branch 'patch-7' of https://github.com/gjones2/Freeside (#13854 as this bug...

[freeside.git] / httemplate / view / elements / svc_edit_link.html

diff --git a/httemplate/view/elements/svc_edit_link.html b/httemplate/view/elements/svc_edit_link.html
index a85d380..d65db0a 100644 (file)
--- a/httemplate/view/elements/svc_edit_link.html
+++ b/httemplate/view/elements/svc_edit_link.html
@@ -1,22 +1,21 @@
 % if ( $cancel_date ) {
-<I>Canceled <% time2str('%b %o %Y', $cancel_date) %></I>
+<I><% mt("Canceled [_1]", time2str('%b %o %Y', $cancel_date) ) |h %></I>
 % } else {
 <SCRIPT>
 function areyousure_delete() {
-  if (confirm("Permanently delete this service?") == true)
+  if (confirm(<% mt('Permanently delete this service?') |js_string %>) == true)
     window.location.href = '<% $cancel_url %>';
 }
 </SCRIPT>
-<A HREF="<% $edit_url %>">Edit this <% $label %></A> | 
-<A HREF="javascript:areyousure_delete()">
-Unprovision this Service</A>
+<A HREF="<% $edit_url %>"><% mt("Edit this [_1]", $label) |h %></A> | 
+<A HREF="javascript:areyousure_delete()"><% mt('Unprovision this Service') |h %></A>
 % }
 <%init>
 my %opt = @_;
 my $svc_x = $opt{'svc'} or die "'svc' required";
 my $svcdb = $opt{'table'} || $svc_x->table;
-my $edit_url = $opt{'edit_url'} || 
-               $p . 'edit/' . $svcdb . '.cgi?' . $svc_x->svcnum;
+my $edit_url = ($opt{'edit_url'} || 
+               $p . 'edit/' . $svcdb . '.cgi?' ). $svc_x->svcnum;
 my $cancel_url = $p . 'misc/unprovision.cgi?' . $svc_x->svcnum;
 my $cust_svc = $svc_x->cust_svc; # always exists
 my $cancel_date = $cust_svc->pkg_cancel_date;