@@ -, +, @@
---
.../en/includes/additional-fields-entry.inc | 2 +-
.../batch_authority_record_deletion.inc | 6 ++---
.../batch_authority_record_modification.inc | 4 ++--
.../batch_item_record_deletion.inc | 4 ++--
.../prog/en/includes/biblio-title.inc | 2 +-
.../prog/en/includes/blocked-fines.inc | 2 +-
.../prog/en/includes/borrower_debarments.inc | 12 +++++-----
.../prog/en/includes/clubs-table.inc | 8 +++----
.../prog/en/includes/holds_table.inc | 6 ++---
.../prog/en/includes/merge-record.inc | 2 +-
.../en/includes/messaging-preference-form.inc | 24 ++++++++++---------
.../en/includes/patron-article-requests.inc | 18 ++++++++------
.../prog/en/includes/patron_messages.inc | 18 +++++++-------
13 files changed, 58 insertions(+), 50 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
@@ -17,7 +17,7 @@
[% END %]
[% END %]
- (Authorised values for [% field.authorised_value_category | html %])
+ (Authorised values for [% field.authorised_value_category | html %])
[% ELSE %]
[% IF field.marcfield %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc
@@ -28,11 +28,11 @@
[% END %]
[% IF m.code == 'authority_not_exists' %]
- The authority id [% m.authid | html %] does not exist in the database.
+ The authority id [% m.authid | html %] does not exist in the database.
[% ELSIF m.code == 'authority_not_deleted' %]
- Authority record [% m.authid | html %] was not deleted. An error occurred.
+ Authority record [% m.authid | html %] was not deleted. An error occurred.
[% ELSIF m.code == 'authority_deleted' %]
- Authority [% m.authid | html %] has been deleted successfully.
+ Authority [% m.authid | html %] has been deleted successfully.
[% END %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc
@@ -8,8 +8,8 @@
[% ELSE %]
- [% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred.
- [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
+ [% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred.
+ [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
New batch record modification
[% report.deleted_biblionumbers.size | html %] record(s) deleted.
[% END %]
[% ELSE %]
- No items deleted.
+
No items deleted.
[% END %]
@@ -21,7 +21,7 @@
[% IF job.status == 'cancelled' %]
- The job has been cancelled before it finished.
+ The job has been cancelled before it finished.New batch item modification
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc
@@ -5,7 +5,7 @@
[% IF ( biblio.title ) %]
[% biblio.title | html %]
[% ELSE %]
- No title
+ No title
[% END %]
[% IF ( biblio.medium ) %]
[% biblio.medium | html %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
@@ -3,7 +3,7 @@
[% IF fines and fines > 0 %]
Charges:
- Patron has outstanding charges of [% fines | $Price %].
+ Patron has outstanding charges of [% fines | $Price %].
[% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
@@ -31,12 +31,12 @@
[% END %]
- [% IF d.comment.search('OVERDUES_PROCESS') %]
- Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]
- [% ELSE %]
- [% d.comment | $raw %]
- [% END %]
-
+ [% IF d.comment.search('OVERDUES_PROCESS') %]
+ Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]
+ [% ELSE %]
+ [% d.comment | $raw %]
+ [% END %]
+
[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %]
@@ -96,6 +100,6 @@
[% ELSE %]
- Patron has no current article requests.
+ Patron has no current article requests.
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -10,16 +10,17 @@
[% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
Review pending modifications
[% ELSE %]
- Patron has pending modifications
+ Patron has pending modifications
[% END %]
[% END %]
[% IF ( warndeparture ) %]
- Expiration: Patron's card will expire soon.
- Patron's card expires on [% expiry | $KohaDates %] Renew or Edit details
-
+ Expiration:
+ Patron's card will expire soon.
+ Patron's card expires on [% expiry | $KohaDates %]
+ Renew or Edit details
[% END %]
@@ -31,9 +32,10 @@
[% IF ( expired ) %]
- Expiration: Patron's card has expired.
+ Expiration:
+ Patron's card has expired.
[% IF ( expiry ) %]
- Patron's card expired on [% expiry | $KohaDates %]
+ Patron's card expired on [% expiry | $KohaDates %]
[% END %]
Renew or Edit details
@@ -150,7 +152,7 @@
([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
[% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
[% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
- Hold placed on [% w.reservedate | $KohaDates %].
+ Hold placed on [% w.reservedate | $KohaDates %].
[% SET expires_on = w.expirationdate %]
@@ -172,7 +174,7 @@
([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
[% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
[% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
- Hold placed on [% w.reservedate | $KohaDates %].
+ Hold placed on [% w.reservedate | $KohaDates %].
[% SET expires_on = w.expirationdate %]
--