Skip to content
Snippets Groups Projects
Commit 528c8398 authored by Ere Maijala's avatar Ere Maijala Committed by Demian Katz
Browse files

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.
parent 34608f7d
Branches
Tags
No related merge requests found
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<? endif; ?> <? endif; ?>
<? if (!empty($ilsDetails['requestGroup'])): ?> <? 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 /> <br />
<? endif; ?> <? endif; ?>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<? endif; ?> <? endif; ?>
<? if (!empty($pickupDisplay)): ?> <? if (!empty($pickupDisplay)): ?>
<strong><?=$this->transEsc('pick_up_location') ?>:</strong> <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 /> <br />
<? endif; ?> <? endif; ?>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<? if (!empty($ilsDetails['requestGroup'])): ?> <? if (!empty($ilsDetails['requestGroup'])): ?>
<p> <p>
<strong><?=$this->transEsc('hold_requested_group') ?>:</strong> <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> </p>
<? endif; ?> <? endif; ?>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<? if (!empty($pickupDisplay)): ?> <? if (!empty($pickupDisplay)): ?>
<p> <p>
<strong><?=$this->transEsc('pick_up_location') ?>:</strong> <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> </p>
<? endif; ?> <? endif; ?>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment