From 528c8398ddb5991281c4981f8e190e19824977a0 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Wed, 10 Aug 2016 16:59:48 +0300
Subject: [PATCH] More consistent hold display - Unified the translation of
request group and pickup location to use the same prefix in hold dialog and
list of holds.
---
themes/bootstrap3/templates/myresearch/holds.phtml | 4 ++--
themes/jquerymobile/templates/myresearch/holds.phtml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/themes/bootstrap3/templates/myresearch/holds.phtml b/themes/bootstrap3/templates/myresearch/holds.phtml
index b11499db467..7f0e5e95b84 100644
--- a/themes/bootstrap3/templates/myresearch/holds.phtml
+++ b/themes/bootstrap3/templates/myresearch/holds.phtml
@@ -98,7 +98,7 @@
<? endif; ?>
<? if (!empty($ilsDetails['requestGroup'])): ?>
- <strong><?=$this->transEsc('hold_requested_group') ?>:</strong> <?=$this->transEsc('location_' . $ilsDetails['requestGroup'], array(), $ilsDetails['requestGroup'])?>
+ <strong><?=$this->transEsc('hold_requested_group') ?>:</strong> <?=$this->transEsc('request_group_' . $ilsDetails['requestGroup'], null, $ilsDetails['requestGroup'])?>
<br />
<? endif; ?>
@@ -121,7 +121,7 @@
<? endif; ?>
<? if (!empty($pickupDisplay)): ?>
<strong><?=$this->transEsc('pick_up_location') ?>:</strong>
- <?=$pickupTranslate ? $this->transEsc($pickupDisplay) : $this->escapeHtml($pickupDisplay)?>
+ <?=$pickupTranslate ? $this->transEsc('location_' . $pickupDisplay, null, $pickupDisplay) : $this->escapeHtml($pickupDisplay)?>
<br />
<? endif; ?>
diff --git a/themes/jquerymobile/templates/myresearch/holds.phtml b/themes/jquerymobile/templates/myresearch/holds.phtml
index 461b40065bf..3118692dda4 100644
--- a/themes/jquerymobile/templates/myresearch/holds.phtml
+++ b/themes/jquerymobile/templates/myresearch/holds.phtml
@@ -61,7 +61,7 @@
<? if (!empty($ilsDetails['requestGroup'])): ?>
<p>
<strong><?=$this->transEsc('hold_requested_group') ?>:</strong>
- <?=$this->transEsc('location_' . $ilsDetails['requestGroup'], array(), $ilsDetails['requestGroup'])?>
+ <?=$this->transEsc('request_group_' . $ilsDetails['requestGroup'], null, $ilsDetails['requestGroup'])?>
</p>
<? endif; ?>
@@ -85,7 +85,7 @@
<? if (!empty($pickupDisplay)): ?>
<p>
<strong><?=$this->transEsc('pick_up_location') ?>:</strong>
- <?=$pickupTranslate ? $this->transEsc($pickupDisplay) : $this->escapeHtml($pickupDisplay)?>
+ <?=$pickupTranslate ? $this->transEsc('location_' . $pickupDisplay, null, $pickupDisplay) : $this->escapeHtml($pickupDisplay)?>
</p>
<? endif; ?>
--
GitLab