@@ -, +, @@
---
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
.../en/modules/admin/marc_subfields_structure.tt | 14 +++++++-------
.../prog/en/modules/admin/marctagstructure.tt | 2 +-
.../prog/en/modules/basket/sendbasket.tt | 2 +-
.../prog/en/modules/catalogue/detail.tt | 5 +++--
.../prog/en/modules/catalogue/moredetail.tt | 4 ++--
.../value_builder/marc21_linking_section.tt | 2 +-
.../cataloguing/value_builder/unimarc_field_4XX.tt | 2 +-
.../prog/en/modules/circ/branchtransfers.tt | 6 +++---
.../bootstrap/en/includes/holds-table.inc | 5 +++--
.../opac-tmpl/bootstrap/en/modules/opac-recall.tt | 4 ++--
.../bootstrap/en/modules/opac-reset-password.tt | 2 +-
12 files changed, 26 insertions(+), 24 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -351,7 +351,7 @@
[% IF subscription %]
-
Frequency: [% subscription.frequency.description | html %] |
+
Frequency: [% subscription.frequency.description | html %] |
[% IF subscription.numberlength %]
Number of issues: [% subscription.numberlength | html %][% END %]
[% IF subscription.weeklength %]
Number of weeks: [% subscription.weeklength | html %][% END %]
[% IF subscription.monthlength %]
Number of months: [% subscription.monthlength | html %][% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -398,18 +398,18 @@
[% IF loo.tab == -1 %]
subfield ignored
[% ELSE %]
-
Tab:[% loo.tab | html %],
- [% IF ( loo.kohafield ) %] |
Koha field: [% loo.kohafield | html %], [% END %]
+
Tab:[% loo.tab | html %],
+ [% IF ( loo.kohafield ) %] |
Koha field: [% loo.kohafield | html %], [% END %]
[% IF ( loo.repeatable ) %]
Repeatable, [% ELSE %]
Not repeatable,[% END %]
[% IF ( loo.mandatory ) %]
Mandatory, [% ELSE %]
Not mandatory,[% END %]
[% IF ( loo.important ) %]
Important, [% ELSE %]
Not important,[% END %]
- [% IF ( loo.seealso ) %] |
See also: [% loo.seealso | html %],[% END %]
+ [% IF ( loo.seealso ) %] |
See also: [% loo.seealso | html %],[% END %]
[% IF ( loo.hidden ) %]
hidden,[% END %]
[% IF ( loo.isurl ) %]
is a URL,[% END %]
- [% IF ( loo.authorised_value ) %] |
Auth value:[% loo.authorised_value | html %],[% END %]
- [% IF ( loo.authtypecode ) %] |
Authority:[% loo.authtypecode | html %],[% END %]
- [% IF ( loo.value_builder ) %] |
Plugin:[% loo.value_builder | html %],[% END %]
- [% IF ( loo.link ) %] |
Link:[% loo.link | html %],[% END %]
+ [% IF ( loo.authorised_value ) %] |
Auth value:[% loo.authorised_value | html %],[% END %]
+ [% IF ( loo.authtypecode ) %] |
Authority:[% loo.authtypecode | html %],[% END %]
+ [% IF ( loo.value_builder ) %] |
Plugin:[% loo.value_builder | html %],[% END %]
+ [% IF ( loo.link ) %] |
Link:[% loo.link | html %],[% END %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -277,7 +277,7 @@ MARC frameworks › Administration › Koha
[% FOREACH subfield IN loo.subfields %]
Tab:[% subfield.tab | html %] | $[% subfield.tagsubfield | html %]
- [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso | html %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
+ [% subfield.liblibrarian | html %] [% IF ( subfield.kohafield ) %][% subfield.kohafield | html %][% END %][% IF ( subfield.repeatable ) %], repeatable[% END %][% IF ( subfield.mandatory ) %], Mandatory[% END %][% IF ( subfield.seealso ) %], See [% subfield.seealso | html %][% END %][% IF ( subfield.authorised_value ) %], [% subfield.authorised_value | html %][% END %][% IF ( subfield.authtypecode ) %], [% subfield.authtypecode | html %][% END %][% IF ( subfield.value_builder ) %], [% subfield.value_builder | html %][% END %]
[% END %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
@@ -38,7 +38,7 @@ Your cart
[% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
- Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
+ Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
[% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
[% IF ( BIBLIO_RESULT.author ) %]; [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -518,12 +518,13 @@ Note that permanent location is a code, and location may be an authval.
[% IF item.recall.waiting_date %]
Waiting at [% Branches.GetName( item.recall.pickup_library_id ) | html %] since [% item.recall.waiting_date | $KohaDates %]
[% ELSE %]
- Item recalled by [% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %]) on [% item.recall.created_date | $KohaDates %]
+ [% patron_link = BLOCK %][% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])[% END %]
+ Item recalled by [% patron_link| $raw %] on [% item.recall.created_date | $KohaDates %]
[% END %]
[% END %]
[% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || hold || item.recalled ) %]
- Available
+ Available
[% END %]
[% IF ( item.restricted ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -119,8 +119,8 @@
- Current library: [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %]
- Checkout status:
- [% IF ( ITEM_DAT.issue ) %]Checked out to
- [% INCLUDE 'patron-title.inc' patron => ITEM_DAT.patron hide_patron_infos_if_needed=1 %]
+ [% IF ( ITEM_DAT.issue ) %]Checked out to
+ [% INCLUDE 'patron-title.inc' patron => ITEM_DAT.patron hide_patron_infos_if_needed=1 %]
[% IF ( ITEM_DAT.lastreneweddate ) %]
Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %],
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt
@@ -54,7 +54,7 @@
Next>>
[% END %]
- [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
+ [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
[% ELSE %]No results found
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
@@ -52,7 +52,7 @@
Next>>
[% END %]
- [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
+ [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %]
[% ELSE %]No results found
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -42,13 +42,13 @@
[% IF ( reserved ) %]
- Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] ([% borrowernumber | html %]).
+ Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] ([% borrowernumber | html %]).
[% END %]
[% IF ( waiting ) %]
- Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]).
+ Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]).
[% END %]
[% IF ( transferred ) %]
- Item has been trapped to fill a hold and is in transit for [% name | html %] ([% borrowernumber | html %]).
+ Item has been trapped to fill a hold and is in transit for [% name | html %] ([% borrowernumber | html %]).
[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
@@ -113,12 +113,13 @@
[% ELSE %]
[% IF ( HOLD.is_in_transit ) %]
[% SET transfer = HOLD.item.get_transfer %]
- Item in transit from [% Branches.GetName( transfer.frombranch ) | html %] since
+ [% branch_name = BLOCK %][% Branches.GetName( transfer.frombranch ) | html %][% END %]
+ Item in transit from [% branch_name| $raw %] since
[% transfer.datesent | $KohaDates %]
[% ELSIF ( HOLD.is_in_processing ) %]
Item in processing
[% ELSIF ( HOLD.suspend ) %]
- Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | $KohaDates %] [% END %]
+ Suspended[% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | $KohaDates %][% END %]
[% ELSE %]
[% IF HOLD.itemtype %]
Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt
@@ -142,9 +142,9 @@
[% IF ( item.recall ) %]
[% IF ( item.recall.waitingdate ) %]
- Waiting for patron at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.waitingdate | $KohaDates %].
+ Waiting for patron at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.waitingdate | $KohaDates %].
[% ELSE %]
- Recalled by patron expected at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.recalldate | $KohaDates %].
+ Recalled by patron expected at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.recalldate | $KohaDates %].
[% END %]
[% ELSIF ( hold.waitingdate ) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt
@@ -50,7 +50,7 @@
[% CASE 'invalid_credentials' %]
You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.
[% CASE 'no_expire' %]
- Please log-in to account to update your password.
+ Please log-in to account to update your password.
Log in to your account.
[% CASE 'account_locked' %]
This account has been locked!
--
|