From 7300084ef6b8bade3c5e2fe0cbcae3da84f0063a Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Wed, 19 Sep 2018 10:33:25 +0200 Subject: [PATCH] Bug 15516: Fix translation issues - Use " inside _() - Merge two strings (PART_OF_A, HOLD_GROUP) Signed-off-by: Josef Moravec Signed-off-by: Michal Denar --- koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 3 +-- koha-tmpl/intranet-tmpl/prog/js/holds.js | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc index 48d9d33468..77ec0e603c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc @@ -21,7 +21,7 @@ }) $('#hold-group-modal').on('hidden', function(){ - $('#hold-group-modal .modal-body').html('
' + _('Loading') + '
'); + $('#hold-group-modal .modal-body').html('
' + _("Loading") + '
'); }); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index b6eca6b81b..85855a870e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -46,6 +46,5 @@ var CURRENT = _(" (current) "); var MSG_NO_ITEMTYPE = _("No itemtype"); var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type"); - var PART_OF_A = _("(part of a %s)"); - var HOLD_GROUP = _("hold group"); + var PART_OF_A_HOLD_GROUP = _("part of a hold group"); diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js index 6f0653633e..453c9655bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -46,8 +46,8 @@ $(document).ready(function() { if (oObj.hold_group_id) { title += '
'; - var link = '' + HOLD_GROUP +'' - title += '' + PART_OF_A.format(link) + ''; + var link = '' + PART_OF_A_HOLD_GROUP +'' + title += '(' + link + ')'; } return title; -- 2.20.1