From ee936104449be2f9332b3f52a1a44850a92d5666 Mon Sep 17 00:00:00 2001 From: Kyle M Hall 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 --- .../prog/en/modules/circ/article-requests.tt | 6 +++--- .../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 @@

- [% ar.borrower.surname %], [% ar.borrower.firstname %] ([% ar.borrower.cardnumber %]) + [% ar.borrower.surname %][% IF ar.borrower.firstname %], [% ar.borrower.firstname %][% END %] ([% ar.borrower.cardnumber %])

@@ -317,7 +317,7 @@

- [% ar.borrower.surname %], [% ar.borrower.firstname %] ([% ar.borrower.cardnumber %]) + [% ar.borrower.surname %][% IF ar.borrower.firstname %], [% ar.borrower.firstname %][% END %] ([% ar.borrower.cardnumber %])

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 32e1050..a65e9f6 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]; -- 1.7.2.5