From c46822308e459428276606fb7d1652d0aed7790f Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Thu, 24 Oct 2019 14:07:37 +0100 Subject: [PATCH] Bug 23838: (follow-up) Fix JS strings As requested by Owen in comment #7 Owen, I have modified the "x out y renewals have been logged" formation as you suggested. The "Renewed on x by y" string is harder because it contains markup and I suspected the strings file should contain such things. I have however very slightly reworded it which will hopefully mean it's structure is suitable for other languages too. Signed-off-by: Owen Leonard Signed-off-by: Bouzid Fergani Signed-off-by: Ben Veasey --- .../intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc | 6 ++---- koha-tmpl/intranet-tmpl/prog/js/patron-renewal-modal.js | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc index c13e6bb8b7..f0727183db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc @@ -1,7 +1,5 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/js/patron-renewal-modal.js b/koha-tmpl/intranet-tmpl/prog/js/patron-renewal-modal.js index 21733feca7..4323190817 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/patron-renewal-modal.js +++ b/koha-tmpl/intranet-tmpl/prog/js/patron-renewal-modal.js @@ -11,7 +11,7 @@ $(document).ready(function(){ $('#patronRenewals #retrieving').show(); $.get('/api/v1/patrons/'+patronid+'/renewals?item_id='+itemid+'&embed=patron,renewed_by', function(data) { if (data.length < renewals) { - $('#patronRenewals #incomplete').append(note + ': ' + data.length + ' ' + out_of + ' ' + renewals + ' ' + renewals_logged).show(); + $('#patronRenewals #incomplete').append(renewed_prop.format(data.length, renewals)).show(); } var items = data.map(function(item) { return createLi(item); -- 2.11.0