From 114cc2d06ca3c9ffb6e968b1c649ad02e18977d3 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 30 Oct 2015 12:18:06 -0400
Subject: [PATCH] Bug 14610 [QA Followup] - Make prompt tranlatable, only show
 comma if firstname is set

---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt | 6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
index ed87948..d6afbfe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
@@ -23,7 +23,7 @@
         }
 
         function Cancel( id, a ) {
-            notes = prompt("Reason for cancelation:");
+            notes = prompt(_("Reason for cancelation:"));
             if ( notes == null ) {
                 return;
             }
@@ -192,7 +192,7 @@
                                             <td class="ar-patron">
                                                 <p>
                                                     <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber %]">
-                                                        [% ar.borrower.surname %], [% ar.borrower.firstname %] ([% ar.borrower.cardnumber %])
+                                                        [% ar.borrower.surname %][% IF ar.borrower.firstname %], [% ar.borrower.firstname %][% END %] ([% ar.borrower.cardnumber %])
                                                     </a>
                                                 </p>
 
@@ -317,7 +317,7 @@
                                             <td class="ar-patron">
                                                 <p>
                                                     <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber %]">
-                                                        [% ar.borrower.surname %], [% ar.borrower.firstname %] ([% ar.borrower.cardnumber %])
+                                                        [% ar.borrower.surname %][% IF ar.borrower.firstname %], [% ar.borrower.firstname %][% END %] ([% ar.borrower.cardnumber %])
                                                     </a>
                                                 </p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 076cb1b..63c3cb0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -38,7 +38,7 @@ $(document).ready(function() {
         previous_branchcode = this.value;
     }).on('change', function(){
         var branchcode = this.value;
-        var c = confirm("Are you sure you want to change the pickup library from " + previous_branchcode + " to " + branchcode + " for this request?");
+        var c = confirm(_("Are you sure you want to change the pickup library from %s to %s for this request?").format( previous_branchcode, branchcode ));
 
         if ( c ) {
             var id = this.id.split("branchcode-")[1];
-- 
2.1.4