From 37206143b6abafba9f07f55de2472983acb05f74 Mon Sep 17 00:00:00 2001 From: Victor Grousset/tuxayo Date: Wed, 11 May 2022 17:08:32 +0200 Subject: [PATCH] Bug 30733: [22.05] Simplify translatable strings And a few minor fixes when they where causing issues for translatability. And rephrased a string about password reset to have it identical to other strings with the same meaning. Simplified via wrapping strings with to split to huge concatenated strings with a lot of %s everywhere. == Test plan == This patch needs mainly proof reading. Still it's possible to do some basic testing to demonstrate that adding a in an IF doesn't break anything. Pick in one of the 110 modified templates a string that you know how to display. Otherwise: 1. acquisitions => vendor => basket => add to basket => search "from existing record" => add order 2. Cancel the order 3. You see without issue "Bibliographic record will not be deleted" 4. administration => Patron categories 5. Try to delete a used and unused category 6. You see as expected Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX Signed-off-by: Fridolin Somers Signed-off-by: Paul Derscheid Signed-off-by: Fridolin Somers Signed-off-by: Tomas Cohen Arazi Signed-off-by: Lucas Gass --- .../background_jobs/update_elastic_index.inc | 2 +- .../prog/en/includes/recalls.inc | 20 ++++---- .../prog/en/includes/transaction_types.inc | 4 +- .../prog/en/modules/acqui/addorderiso2709.tt | 20 ++++---- .../prog/en/modules/acqui/basket.tt | 8 +-- .../prog/en/modules/acqui/basketgroup.tt | 2 +- .../prog/en/modules/acqui/cancelorder.tt | 4 +- .../prog/en/modules/acqui/invoices.tt | 20 ++++---- .../prog/en/modules/acqui/neworderempty.tt | 8 +-- .../prog/en/modules/acqui/transferorder.tt | 2 +- .../en/modules/admin/additional-fields.tt | 4 +- .../prog/en/modules/admin/aqbudgets.tt | 4 +- .../modules/admin/auth_subfields_structure.tt | 8 +-- .../en/modules/admin/authorised_values.tt | 12 ++--- .../prog/en/modules/admin/authtypes.tt | 6 +-- .../prog/en/modules/admin/categories.tt | 12 ++--- .../prog/en/modules/admin/cities.tt | 6 +-- .../prog/en/modules/admin/columns_settings.tt | 8 +-- .../prog/en/modules/admin/credit_types.tt | 2 +- .../prog/en/modules/admin/debit_types.tt | 12 ++--- .../prog/en/modules/admin/itemtypes.tt | 6 +-- .../modules/admin/marc_subfields_structure.tt | 26 +++++----- .../prog/en/modules/admin/marctagstructure.tt | 12 ++--- .../en/modules/admin/patron-attr-types.tt | 8 +-- .../searchengine/elasticsearch/mappings.tt | 20 ++++---- .../prog/en/modules/admin/smart-rules.tt | 14 +++--- .../prog/en/modules/admin/smtp_servers.tt | 2 +- .../intranet-tmpl/prog/en/modules/auth.tt | 2 +- .../prog/en/modules/authorities/merge.tt | 10 ++-- .../prog/en/modules/basket/sendbasket.tt | 2 +- .../prog/en/modules/catalogue/advsearch.tt | 8 +-- .../prog/en/modules/catalogue/detail.tt | 47 ++++++++--------- .../prog/en/modules/catalogue/moredetail.tt | 18 +++---- .../prog/en/modules/catalogue/results.tt | 6 +-- .../en/modules/catalogue/stockrotation.tt | 8 +-- .../prog/en/modules/cataloguing/addbooks.tt | 10 ++-- .../value_builder/marc21_linking_section.tt | 4 +- .../value_builder/unimarc_field_210c.tt | 2 +- .../value_builder/unimarc_field_4XX.tt | 4 +- .../prog/en/modules/circ/article-requests.tt | 6 +-- .../prog/en/modules/circ/branchtransfers.tt | 6 +-- .../prog/en/modules/circ/circulation.tt | 6 +-- .../prog/en/modules/circ/request-article.tt | 10 ++-- .../prog/en/modules/circ/returns.tt | 16 +++--- .../prog/en/modules/circ/view_holdsqueue.tt | 12 ++--- .../prog/en/modules/clubs/clubs.tt | 8 +-- .../course_reserves/add_items-step2.tt | 4 +- .../modules/course_reserves/course-details.tt | 4 +- .../prog/en/modules/course_reserves/course.tt | 4 +- .../en/modules/labels/label-bib-search.tt | 2 +- .../prog/en/modules/labels/label-print.tt | 6 +-- .../en/modules/members/accountline-details.tt | 4 +- .../prog/en/modules/members/holdshistory.tt | 12 ++--- .../prog/en/modules/members/memberentrygen.tt | 16 +++--- .../prog/en/modules/members/moremember.tt | 14 +++--- .../prog/en/modules/members/notices.tt | 16 +++--- .../prog/en/modules/members/paycollect.tt | 20 ++++---- .../prog/en/modules/members/routing-lists.tt | 6 +-- .../prog/en/modules/patroncards/edit-batch.tt | 11 ++-- .../en/modules/patroncards/edit-layout.tt | 8 ++- .../prog/en/modules/patroncards/print.tt | 8 +-- .../modules/reports/guided_reports_start.tt | 14 +++--- .../prog/en/modules/reports/itemslost.tt | 4 +- .../prog/en/modules/reports/serials_stats.tt | 4 +- .../prog/en/modules/reserve/request.tt | 18 +++---- .../prog/en/modules/reviews/reviewswaiting.tt | 4 +- .../modules/rotating_collections/addItems.tt | 10 ++-- .../rotating_collections/editCollections.tt | 6 +-- .../prog/en/modules/serials/routing.tt | 4 +- .../en/modules/serials/serials-collection.tt | 24 ++++----- .../en/modules/serials/subscription-detail.tt | 24 ++++----- .../prog/en/modules/suggestion/suggestion.tt | 14 +++--- .../prog/en/modules/tags/review.tt | 44 ++++++++-------- .../en/modules/tools/additional-contents.tt | 10 ++-- .../automatic_item_modification_by_age.tt | 4 +- .../en/modules/tools/batch_delete_records.tt | 12 ++--- .../tools/batch_record_modification.tt | 10 ++-- .../prog/en/modules/tools/csv-profiles.tt | 18 +++---- .../prog/en/modules/tools/import_borrowers.tt | 34 ++++++------- .../prog/en/modules/tools/inventory.tt | 8 +-- .../en/modules/tools/manage-marc-import.tt | 16 +++--- .../tools/marc_modification_templates.tt | 36 ++++++------- .../prog/en/modules/tools/upload.tt | 4 +- .../prog/en/modules/tools/viewlog.tt | 2 +- .../en/modules/virtualshelves/sendshelf.tt | 2 +- .../bootstrap/en/includes/holds-table.inc | 11 ++-- .../bootstrap/en/includes/masthead.inc | 4 +- .../bootstrap/en/includes/shelfbrowser.inc | 6 +-- .../bootstrap/en/modules/maintenance.tt | 2 +- .../en/modules/opac-account-pay-error.tt | 2 +- .../en/modules/opac-addbybiblionumber.tt | 8 +-- .../bootstrap/en/modules/opac-advsearch.tt | 8 +-- .../en/modules/opac-alert-subscribe.tt | 4 +- .../bootstrap/en/modules/opac-detail.tt | 4 +- .../en/modules/opac-full-serial-issues.tt | 24 ++++----- .../bootstrap/en/modules/opac-holdshistory.tt | 10 ++-- .../bootstrap/en/modules/opac-library.tt | 2 +- .../bootstrap/en/modules/opac-main.tt | 8 +-- .../bootstrap/en/modules/opac-messaging.tt | 22 ++++---- .../bootstrap/en/modules/opac-passwd.tt | 10 ++-- .../en/modules/opac-password-recovery.tt | 14 +++--- .../bootstrap/en/modules/opac-recall.tt | 16 +++--- .../bootstrap/en/modules/opac-recalls.tt | 22 ++++---- .../bootstrap/en/modules/opac-reserve.tt | 26 +++++----- .../en/modules/opac-reset-password.tt | 18 +++---- .../bootstrap/en/modules/opac-sendbasket.tt | 4 +- .../en/modules/opac-serial-issues.tt | 50 +++++++++---------- .../bootstrap/en/modules/opac-shelves.tt | 10 ++-- .../bootstrap/en/modules/opac-showreviews.tt | 4 +- .../bootstrap/en/modules/opac-suggestions.tt | 18 +++---- .../bootstrap/en/modules/opac-tags.tt | 26 +++++----- .../bootstrap/en/modules/opac-user.tt | 32 ++++++------ .../bootstrap/en/modules/sco/sco-main.tt | 4 +- .../en/modules/text/explodedterms.tt | 6 +-- 114 files changed, 641 insertions(+), 632 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc index 9386cedcb9..d6f24e89a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc @@ -10,7 +10,7 @@ [% ELSE %]
[% report.total_success | html %] / [% report.total_records | html %] records have successfully been reindexed. Some errors occurred. - [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %] + [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %]
[% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc index 0c007f0285..fa3a7cedea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc @@ -55,7 +55,7 @@ [% IF ( recall.expiration_date ) %] [% recall.expiration_date | $KohaDates %] [% ELSIF ( !recall.completed ) %] - Never expires + Never expires [% ELSE %] - [% END %] @@ -67,28 +67,28 @@ [% IF ( recall.in_transit ) %] - In transit to [% recall.library.branchname | html %] + In transit to [% recall.library.branchname | html %] [% ELSIF ( recall.waiting ) %] - Ready for pickup + Ready for pickup [% ELSIF ( recall.expired ) %] - Expired on [% recall.expiration_date | $KohaDates %] + Expired on [% recall.expiration_date | $KohaDates %] [% ELSIF ( recall.cancelled ) %] - Cancelled on [% recall.completed_date | $KohaDates %] + Cancelled on [% recall.completed_date | $KohaDates %] [% ELSIF ( recall.overdue ) %] - Overdue to be returned + Overdue to be returned [% ELSIF ( recall.fulfilled ) %] - Fulfilled + Fulfilled [% ELSE %] - Requested + Requested [% END %] [% UNLESS viewing_old %] [% IF recall.requested and recall.checkout %] - Due to be returned by [% recall.checkout.date_due | $KohaDates %] + Due to be returned by [% recall.checkout.date_due | $KohaDates %] [% ELSIF recall.waiting and RECALL.expiration_date %] - Pick up by [% RECALL.expiration_date | $KohaDates %] + Pick up by [% RECALL.expiration_date | $KohaDates %] [% ELSE %] - [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc index e71b3fc8ee..9200c8ea6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc @@ -7,7 +7,7 @@ [% IF payment_types.size > 0 %]
  • [% IF Koha.Preference('UseCashRegisters') || Koha.Preference('RequirePaymentType') %] - + Required [%- ELSE -%] - + [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt index 2b3e3fc7ba..ddd960ed26 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -36,10 +36,10 @@
  • [% IF debit_type.code %] - Modify + Modify debit type [% ELSE %] - New - [% END %] debit type + New debit type + [% END %]
    • @@ -189,12 +189,12 @@ [% END %] [% IF debit_type.library_limits.count > 1 %] - [% debit_type.library_limits.count | html %] library limitations + [% debit_type.library_limits.count | html %] library limitations [% ELSE %] - [% debit_type.library_limits.count | html %] library limitation + [% debit_type.library_limits.count | html %] library limitation [% END %] [% ELSE %] - No limitation + No limitation [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 79763e85e3..1066a8cd2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -575,12 +575,12 @@ Item types › Administration › Koha [% END %] [% IF library_limits.count > 1 %] - [% library_limits.count | html %] library limitations + [% library_limits.count | html %] library limitations [% ELSE %] - [% library_limits.count | html %] library limitation + [% library_limits.count | html %] library limitation [% END %] [% ELSE %] - No limitation + No limitation [% END %] [% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index 7970d63051..0ee1b7d199 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -113,7 +113,7 @@ [% IF ( add_form ) %]

    [% IF ( use_heading_flags_p ) %] - [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield | html %] Subfield constraints[% END %] + [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield | html %] Subfield constraints[% END %] [% ELSE %] [% action | html %] [% END %] @@ -398,18 +398,18 @@ [% IF loo.tab == -1 %] subfield ignored [% ELSE %] - 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.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 %] + 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.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 %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index e73c986d33..94dd186424 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -50,9 +50,9 @@ MARC frameworks › Administration › Koha
  • [% IF heading_add_tag_p %] - Add tag + Add tag [% ELSE %] - Modify tag + Modify tag [% END %] [% searchfield | html %]
    • @@ -122,9 +122,9 @@ MARC frameworks › Administration › Koha
    [% IF heading_add_tag_p %] - Add tag + Add tag [% ELSE %] - Modify tag [% searchfield | html %] + Modify tag [% searchfield | html %] [% END %] @@ -276,8 +276,8 @@ MARC frameworks › Administration › Koha [% IF ( select_display ) %] [% 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 %] + 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 %]

    [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 4535f1a351..6733c3a663 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -317,9 +317,9 @@ Patron attribute types › Administration › Koha [% END %] [% IF libraries.count > 1 %] - [% libraries.count | html %] library limitations + [% libraries.count | html %] library limitations [% ELSE %] - [% libraries.count | html %] library limitation + [% libraries.count | html %] library limitation [% END %] [% ELSE %] @@ -334,9 +334,9 @@ Patron attribute types › Administration › Koha [% END %] [% IF ( item.mandatory ) -%] - Yes + Yes [% ELSE -%] - No + No [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt index edfe3ec66f..05f3da43d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt @@ -442,16 +442,16 @@ a.add, a.delete { [% SWITCH f.name %] - [% CASE 'author' %]Authors - [% CASE 'itype' %]Item types - [% CASE 'location' %]Locations - [% CASE 'su-geo' %]Places - [% CASE 'title-series' %]Series - [% CASE 'subject' %]Topics - [% CASE 'ccode' %]Collections - [% CASE 'holdingbranch' %]Holding libraries - [% CASE 'homebranch' %]Home libraries - [% CASE 'ln' %]Language + [% CASE 'author' %]Authors + [% CASE 'itype' %]Item types + [% CASE 'location' %]Locations + [% CASE 'su-geo' %]Places + [% CASE 'title-series' %]Series + [% CASE 'subject' %]Topics + [% CASE 'ccode' %]Collections + [% CASE 'holdingbranch' %]Holding libraries + [% CASE 'homebranch' %]Home libraries + [% CASE 'ln' %]Language [% CASE %][% f | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 62e2f5639a..5c6c0e6a88 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -253,11 +253,11 @@ [% IF ( lengthunit == 'days' ) %] - Days + Days [% ELSIF ( lengthunit == 'hours') %] - Hours + Hours [% ELSE %] - Undefined + Undefined [% END %] @@ -1006,13 +1006,13 @@ [% IF ( not refundLostItemFeeRule ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt index 7a39d63ed1..ae78a07dad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt @@ -240,7 +240,7 @@
  • Host: [%- default_config.host | html -%]
  • Port: [%- default_config.port | html -%]
  • Timeout (secs): [%- default_config.timeout | html -%]
    • -
  • SSL: [%- IF default_config.ssl_mode == 'disabled' -%]Disabled[%- ELSIF default_config.ssl_mode == 'ssl' -%]SSL[%- ELSE -%]STARTTLS[%- END -%]
    • +
  • SSL: [%- IF default_config.ssl_mode == 'disabled' -%]Disabled[%- ELSIF default_config.ssl_mode == 'ssl' -%]SSL[%- ELSE -%]STARTTLS[%- END -%]
  • Debug mode: [%- IF default_config.debug -%]Yes[%- ELSE -%]No[%- END -%]
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index 1306f6a1e5..47e135312c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -57,7 +57,7 @@ [% ELSIF Categories.can_any_reset_password && Koha.Preference('OpacBaseURL') %] You must reset your password. [% ELSE %] -

    You must contact the library to have your password reset

    +

    You must contact the library to reset your password

    [% END %] [% ELSIF invalid_username_or_password %]
    Error: Invalid username or password
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index 60d60e5026..80e0e71562 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -44,15 +44,15 @@ div#result { margin-top: 1em; } [% FOREACH error IN errors %]
    [% IF error.code == 'WRONG_COUNT' %] - Number of records provided for merging: [% error.value | html %]. Currently only 2 records can be merged at a time. + Number of records provided for merging: [% error.value | html %]. Currently only 2 records can be merged at a time. [% ELSIF error.code == 'DESTRUCTIVE_MERGE' %] - You cannot merge a record with itself. Please select two different authorities. + You cannot merge a record with itself. Please select two different authorities. [% ELSIF error.code == 'WRONG_FRAMEWORK' %] - The default framework cannot be used, or the framework does not exist. Please select another framework for merging. + The default framework cannot be used, or the framework does not exist. Please select another framework for merging. [% ELSIF error.code == 'EMPTY_MARC' %] - Sorry, but we did not find any MARC tags in the reference record. + Sorry, but we did not find any MARC tags in the reference record. [% ELSIF error.code == 'MISSING_RECORD' %] - Sorry, but we did not find a record for number: [% error.value | html %]. + Sorry, but we did not find a record for number: [% error.value | html %]. [% ELSE %] [% error | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt index 6af47706d0..a39f377914 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt +++ b/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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 65215c6dd3..29808258d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -182,10 +182,10 @@ [% FOREACH advsearchloo IN advancedsearchesloop %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 905fd07bd3..917a7ef246 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -516,14 +516,15 @@ Note that permanent location is a code, and location may be an authval. [% IF item.recalled %] [% IF item.recall.waiting_date %] - Waiting at [% Branches.GetName( item.recall.pickup_library_id ) | html %] since [% item.recall.waiting_date | $KohaDates %] + 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 ) %] @@ -744,18 +745,18 @@ Note that permanent location is a code, and location may be an authval. [% latestserial.planneddate | $KohaDates %] [% latestserial.publisheddate | $KohaDates %] - [% IF ( latestserial.status1 ) %]Expected[% END %] - [% IF ( latestserial.status2 ) %]Arrived[% END %] - [% IF ( latestserial.status3 ) %]Late[% END %] - [% IF ( latestserial.status4 ) %]Missing[% END %] - [% IF ( latestserial.status41 ) %]Missing (never received)[% END %] - [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %] - [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %] - [% IF ( latestserial.status44 ) %]Missing (lost)[% END %] - [% IF ( latestserial.status5 ) %]Not issued[% END %] - [% IF ( latestserial.status6 ) %]Delete[% END %] - [% IF ( latestserial.status7 ) %]Claimed[% END %] - [% IF ( latestserial.status8 ) %]Stopped[% END %] + [% IF ( latestserial.status1 ) %]Expected[% END %] + [% IF ( latestserial.status2 ) %]Arrived[% END %] + [% IF ( latestserial.status3 ) %]Late[% END %] + [% IF ( latestserial.status4 ) %]Missing[% END %] + [% IF ( latestserial.status41 ) %]Missing (never received)[% END %] + [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %] + [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %] + [% IF ( latestserial.status44 ) %]Missing (lost)[% END %] + [% IF ( latestserial.status5 ) %]Not issued[% END %] + [% IF ( latestserial.status6 ) %]Delete[% END %] + [% IF ( latestserial.status7 ) %]Claimed[% END %] + [% IF ( latestserial.status8 ) %]Stopped[% END %] [% latestserial.notes | html %] @@ -907,15 +908,15 @@ Note that permanent location is a code, and location may be an authval. [% suggestion.fund.budget_name | html %] - [% IF suggestion.STATUS == 'ASKED' %]Pending - [% ELSIF suggestion.STATUS == 'ACCEPTED' %]Accepted - [% ELSIF suggestion.STATUS == 'ORDERED' %]Ordered - [% ELSIF suggestion.STATUS == 'REJECTED' %]Rejected - [% ELSIF suggestion.STATUS == 'CHECKED' %]Checked - [% ELSIF suggestion.STATUS == 'AVAILABLE' %]Available + [% IF suggestion.STATUS == 'ASKED' %]Pending + [% ELSIF suggestion.STATUS == 'ACCEPTED' %]Accepted + [% ELSIF suggestion.STATUS == 'ORDERED' %]Ordered + [% ELSIF suggestion.STATUS == 'REJECTED' %]Rejected + [% ELSIF suggestion.STATUS == 'CHECKED' %]Checked + [% ELSIF suggestion.STATUS == 'AVAILABLE' %]Available [% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.STATUS ) %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.STATUS ) | html %] - [% ELSE %]Status unknown + [% ELSE %]Status unknown [% END %] [% IF suggestion.reason %]
    ([% suggestion.reason | html %]) @@ -933,7 +934,7 @@ Note that permanent location is a code, and location may be an authval. [% FOREACH XISBN IN XISBNS %][% IF ( AmazonCoverImages ) %][% END %] [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) %][% END %] -
    [% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %][% XISBN.description | html %][% END %][% XISBN.title | html %] by [% XISBN.author | html %] ©[% XISBN.copyrightdate | html %] +[% XISBN.title | html %] by [% XISBN.author | html %] ©[% XISBN.copyrightdate | html %] [% IF ( XISBN.publishercode ) %] [% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 6db25bb690..3e0794311a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -108,26 +108,26 @@ [% IF ( ITEM_DAT.replacementprice ) %]
  • Replacement price: [% ITEM_DAT.replacementprice | $Price %] 
    • [% END %] [% IF ITEM_DAT.materials %]
  • Materials specified: [% ITEM_DAT.materials | html %]
    • [% END %] -

    Statuses [% IF ( ITEM_DAT.status_advisory ) %]( +

    Statuses [% IF ( ITEM_DAT.status_advisory ) %]( [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %] - [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %] - [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %] - [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %] + [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %] + [% IF ( ITEM_DAT.damaged ) %]Damaged[% END %] + [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %] )[% END %]

    1. Current library: [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %] 
    2. 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 %], + Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %], [% END %] [% IF ( ITEM_DAT.datedue ) %] - Due back on [% ITEM_DAT.datedue | $KohaDates %] + Due back on [% ITEM_DAT.datedue | $KohaDates %] [% ELSE %] - Not checked out + Not checked out [% END %] [% END %]  
      3. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 0e550fd353..50f24e05f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -570,7 +570,7 @@ [% END %] - [% tnx('{count} item', '{count} items', SEARCH_RESULT.items_count, {count = SEARCH_RESULT.items_count}) | html %][% IF ( SEARCH_RESULT.availablecount ) %], [% SEARCH_RESULT.availablecount | html %] available:[% ELSE %], None available[% END %] + [% tnx('{count} item', '{count} items', SEARCH_RESULT.items_count, {count = SEARCH_RESULT.items_count}) | html %][% IF ( SEARCH_RESULT.availablecount ) %], [% SEARCH_RESULT.availablecount | html %] available:[% ELSE %], None available[% END %] [% IF MaxSearchResultsItemsPerRecordStatusCheck && SEARCH_RESULT.items_count > MaxSearchResultsItemsPerRecordStatusCheck %] @@ -618,10 +618,10 @@ ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => items_loo.damaged ) | html %]) [% END %] [% IF ( items_loo.intransit ) %] - (In transit) + (In transit) [% END %] [% IF ( items_loo.onhold ) %] - (On hold) + (On hold) [% END %] [% IF ( items_loo.notforloan ) %] [% items_loo.notforloan | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt index a081592272..25c74f9fcf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt @@ -68,9 +68,9 @@ [% END %] [% IF item.rota.active %] - Active + Active [% ELSE %] - Inactive + Inactive [% END %] [% IF !item.rota.active %] @@ -79,9 +79,9 @@

    		[% IF item.bib_item.get_transfer %] - Yes + Yes [% ELSE %] - No + No [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index adf125d512..126e49e524 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -151,11 +151,11 @@ [% END %] - [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]),
    [% END %] - [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]),
    [% END %] - [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %])
    [% END %] - [% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled | html %])[% END %] - [% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount | html %])[% END %] + [% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount | html %]),
    [% END %] + [% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount | html %]),
    [% END %] + [% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount | html %])
    [% END %] + [% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled | html %])[% END %] + [% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount | html %])[% END %]     [% IF ( resultsloo.other_items_loop ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt index 9555d29856..62fa53f9c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt @@ -54,8 +54,8 @@ Next>> [% END %]

    - [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %] - [% ELSE %]No results found + [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %] + [% ELSE %]No results found [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt index 8af5f2ce91..480177d966 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt @@ -50,7 +50,7 @@ [% IF ( total ) %]  Results [% from | html %] to [% to | html %] of [% total | html %]

    [% ELSE %] -   No results found
    +   No results found
    [% END %]

    [% IF ( total ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt index 43e862ede4..dcf404d0e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt @@ -52,8 +52,8 @@ Next>> [% END %]

    - [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %] - [% ELSE %]No results found + [% IF ( total ) %]Results [% from | html %] to [% to | html %] of [% total | html %] + [% ELSE %]No results found [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index 562854249e..d453a7de33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -247,7 +247,7 @@ [% r.biblio.biblioitem.size | html %] [% IF ar.biblio.biblioitem.isbn %] - ISBN: [% ar.biblio.biblioitem.isbn | html %] + ISBN: [% ar.biblio.biblioitem.isbn | html %] [% END %]

    @@ -354,7 +354,7 @@ [% r.biblio.biblioitem.size | html %] [% IF ar.biblio.biblioitem.isbn %] - ISBN: [% ar.biblio.biblioitem.isbn | html %] + ISBN: [% ar.biblio.biblioitem.isbn | html %] [% END %]

    @@ -458,7 +458,7 @@ [% r.biblio.biblioitem.size | html %] [% IF ar.biblio.biblioitem.isbn %] - ISBN: [% ar.biblio.biblioitem.isbn | html %] + ISBN: [% ar.biblio.biblioitem.isbn | html %] [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 267cb064e2..563aee1a32 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -42,13 +42,13 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index a000d35d52..4947def9f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -186,13 +186,13 @@ [% IF ( NOT_FOR_LOAN_FORCING ) %]
  • [% IF ( itemtype_notforloan ) %] - Item type is normally not for loan. + Item type is normally not for loan. [% ELSIF ( item_notforloan ) %] [% item_notforloan_lib = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %] - Item is normally not for loan[% IF (item_notforloan_lib) %] ([% item_notforloan_lib | html %])[% END %]. + Item is normally not for loan[% IF (item_notforloan_lib) %] ([% item_notforloan_lib | html %])[% END %]. [% END %] [% IF CAN_user_circulate_force_checkout %] - Check out anyway? + Check out anyway? [% END %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt index 243f6e068b..c94c19178d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt @@ -306,15 +306,15 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index b55a054fc4..027b9a1bdc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -84,16 +84,16 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index d9fb79eb53..5693489ecb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -20,7 +20,7 @@
  • - [% IF is_edit || course_reserve %] Edit [% ELSE %] Reserve [% END %] + [% IF is_edit || course_reserve %] Edit [% ELSE %] Reserve [% END %] [% biblio.title | html %] for [% course.course_name | html %]
    • @@ -31,7 +31,7 @@

    - [% IF is_edit || course_reserve %]Edit [% ELSE %]Reserve [% END %][% biblio.title | html %] for [% course.course_name | html %] + [% IF is_edit || course_reserve %]Edit [% ELSE %]Reserve [% END %][% biblio.title | html %] for [% course.course_name | html %]

    [% IF course_reserve && !is_edit%]
    This course already has this item on reserve.
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index fbd03d48fa..0b706dc761 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -268,9 +268,9 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt index ca5e55fee5..1c7c3d7aac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt @@ -161,9 +161,9 @@

    No DEPARTMENT authorized values found!

    [% IF ( CAN_user_parameters ) %] - Please create one or more authorized values with the category DEPARTMENT. + Please create one or more authorized values with the category DEPARTMENT. [% ELSE %] - An administrator must create one or more authorized values with the category DEPARTMENT. + An administrator must create one or more authorized values with the category DEPARTMENT. [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt index 7082b27c02..9440e482c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-bib-search.tt @@ -1,4 +1,4 @@ -[% INCLUDE 'doc-head-open.inc' %]Koha › Tools › Labels ›: Search[% INCLUDE 'doc-head-close.inc' %] +[% INCLUDE 'doc-head-open.inc' %]Koha › Tools › Labels ›: Search[% INCLUDE 'doc-head-close.inc' %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt index d8bda80551..7349d8fb06 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt @@ -58,11 +58,11 @@ [% ELSE %]

    [% IF ( label_ids ) %] - [% IF ( label_count == 1 ) %]Exporting [% label_count | html %] label[% ELSE %]Exporting [% label_count | html %] labels[% END %] + [% IF ( label_count == 1 ) %]Exporting 1 label[% ELSE %]Exporting [% label_count | html %] labels[% END %] [% ELSIF ( item_numbers ) %] - [% IF ( item_count == 1 ) %]Exporting [% item_count | html %] label[% ELSE %]Exporting [% item_count | html %] labels[% END %] + [% IF ( item_count == 1 ) %]Exporting 1 label[% ELSE %]Exporting [% item_count | html %] labels[% END %] [% ELSE %] - [% IF ( multi_batch_count == 1 ) %][% multi_batch_count | html %] batch to export[% ELSE %][% multi_batch_count | html %] batches to export[% END %] + [% IF ( multi_batch_count == 1 ) %]1 batch to export[% ELSE %][% multi_batch_count | html %] batches to export[% END %] [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index b6677ce9c2..1a328dac49 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -62,9 +62,9 @@

    [% IF type == 'credit' %] - Details of payment + Details of payment [% ELSIF type == 'debit' %] - Details of fee + Details of fee [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt index 848d37bed5..cb53a59913 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt @@ -96,20 +96,20 @@ [% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 5ea169e046..b9d46fc4b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -59,11 +59,11 @@ legend:hover {
  • [% IF ( opadd ) %] - Add patron + Add patron [% ELSIF ( opduplicate ) %] - Duplicate patron + Duplicate patron [% ELSE %] - Modify patron + Modify patron [% END %] [% IF categoryname %] ([% categoryname | html %]) @@ -111,11 +111,11 @@ legend:hover { [% UNLESS ( no_add ) %]

    [% IF ( opadd ) %] - Add patron + Add patron [% ELSIF ( opduplicate ) %] - Duplicate patron + Duplicate patron [% ELSE %] - Modify patron + Modify patron [% END %] [% INCLUDE 'patron-title.inc' %] [% IF categoryname %]([% categoryname | html %])[% END %] @@ -269,7 +269,7 @@ legend:hover { [% IF ( step_1 ) %] [% UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
    - [% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity + [% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity
      [% UNLESS ( I ) %] [% UNLESS notitle %] @@ -1316,7 +1316,7 @@ legend:hover { No [% ELSE %] - [% IF flagloo.yes %]Yes[% ELSE %]No[% END %] + [% IF flagloo.yes %]Yes[% ELSE %]No[% END %] [% END # /IF CAN_user_circulate_manage_restrictions %] [% END # /FOREACH flagloo %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 0488d014c5..8a9eaceee0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -412,9 +412,9 @@ [% IF Koha.Preference( 'OPACPrivacy') %]
    1. Privacy pref: - [% IF ( patron.privacy == 0 ) %]Forever[% END %] - [% IF ( patron.privacy == 1 ) %]Default[% END %] - [% IF ( patron.privacy == 2 ) %]Never[% END %] + [% IF ( patron.privacy == 0 ) %]Forever[% END %] + [% IF ( patron.privacy == 1 ) %]Default[% END %] + [% IF ( patron.privacy == 2 ) %]Never[% END %]
      2. [% END %] @@ -454,7 +454,7 @@ [% IF ( patron.password_expiration_date ) %] [% patron.password_expiration_date | $KohaDates %] [% ELSE %] - Never + Never [% END %] [% END %] @@ -477,11 +477,11 @@
    2. Check previous checkouts: [% IF ( patron.checkprevcheckout == 'yes' ) %] - Yes + Yes [% ELSIF ( patron.checkprevcheckout == 'no' ) %] - No + No [% ELSE %] - Inherited + Inherited [% END %]
      3. [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt index 14f7d18188..8922a7557c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -61,17 +61,17 @@

    • - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt index 8953297ab7..445ec01a03 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt @@ -64,21 +64,21 @@ [% IF ( ERRORS ) %] [% FOREACH ERROR IN ERRORS %]
    - There was a problem with this operation: + There was a problem with this operation: [% IF ( ERROR.badparam ) %] - ERROR: illegal parameter [% ERROR.badparam | html %] + ERROR: illegal parameter [% ERROR.badparam | html %] [% ELSIF ( ERROR.login ) %] - ERROR: You must log in to complete that action. + ERROR: You must log in to complete that action. [% ELSIF ( ERROR.failed_delete ) %] - ERROR: You cannot delete the tag [% ERROR.failed_delete | html %]. -
    Note: you can only delete your own tags. + ERROR: You cannot delete the tag [% ERROR.failed_delete | html %]. +
    Note: you can only delete your own tags. [% ELSIF ( ERROR.scrubbed ) %] - Note: your tag contained markup code that was removed. -
    The tag was added as "[% ERROR.scrubbed | html %]". + Note: your tag contained markup code that was removed. +
    The tag was added as "[% ERROR.scrubbed | html %]". [% ELSIF ( ERROR.scrubbed_all_bad ) %] - Note: your tag was entirely markup code. It was NOT added. -
    Please try again with plain text. - [% ELSE %]Unrecognized error. + Note: your tag was entirely markup code. It was NOT added. +
    Please try again with plain text. + [% ELSE %]Unrecognized error. [% END %]
    [% END %] @@ -89,9 +89,9 @@
    @@ -127,7 +127,7 @@
    [% added_count | html %] [% IF ( added_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully added.
    [% END %] [% IF ( deleted_count ) %] -
    [% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.
    +
    [% deleted_count | html %] [% IF ( deleted_count == 1 ) %]tag[% ELSE %]tags[% END %] successfully deleted.
    [% END %] [% END # /add_op %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index a8dcd2a5f8..b78a0cc857 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -148,7 +148,7 @@ [% END %] [% IF ( borrower.gonenoaddress ) %]
  • Please note: According to our records, we don't have up-to-date contact information. Please contact the library. - [% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %] + [% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %] [% IF ( Koha.Preference('OPACPatronDetails') ) %](Please note: there may be a delay in restoring your account if you submit online.)[% END %]
    • [% END %] @@ -431,11 +431,11 @@
    [% END %] @@ -724,9 +724,9 @@ [% ELSIF ( OVERDUE.norenew_overdue ) %] Not allowed(overdue) [% ELSIF ( OVERDUE.onreserve ) %] - On hold + On hold [% ELSE %] - No renewals left + No renewals left [% END %] [% END %] @@ -795,13 +795,13 @@ - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index b435b29501..7feec7e2fc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -246,9 +246,9 @@

    [% IF ( Koha.Preference('SCOAllowCheckin') ) %] - Check out, return, or renew an item: + Check out, return, or renew an item: [% ELSE %] - Check out or renew an item: + Check out or renew an item: [% END %]

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt index 6f394ad1cd..2a21289e7e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/text/explodedterms.tt @@ -1,8 +1,8 @@ [%- SWITCH index -%] [%- CASE 'su-na' -%] -Search also for narrower subjects +Search also for narrower subjects [%- CASE 'su-br' -%] -Search also for broader subjects +Search also for broader subjects [%- CASE 'su-rl' -%] -Search also for related subjects +Search also for related subjects [%- END -%] -- 2.39.5
    [% 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 %]
    [% IF ar.status == 'PENDING' %] - Pending + Pending [% ELSIF ar.status == 'PROCESSING' %] - Processing + Processing [% ELSIF ar.status == 'REQUESTED' %] - New + New [% ELSIF ar.status == 'COMPLETED' %] - Completed + Completed [% ELSIF ar.status == 'CANCELED' %] - Canceled + Canceled [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index ab184328ea..ba867c8cc4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -10,11 +10,11 @@ [% SET footerjs = 1 %] [% BLOCK display_bormessagepref %] [% IF ( bormessagepref ) %] -
  • Patron notification: +
  • Patron notification: [% FOREACH mtt IN bormessagepref.keys %] - [%~ IF ( mtt == 'email' ) %] Email[% END ~%] - [%~ IF ( mtt == 'phone' ) %] Phone[% END ~%] - [%~ IF ( mtt == 'sms' ) %] SMS[% END ~%] + [%~ IF ( mtt == 'email' ) %] Email[% END ~%] + [%~ IF ( mtt == 'phone' ) %] Phone[% END ~%] + [%~ IF ( mtt == 'sms' ) %] SMS[% END ~%] [%~ UNLESS loop.last %], [% ELSE %].[% END ~%] [% END %]
    • @@ -249,18 +249,18 @@ [% IF ( errmsgloo.ItemLocationUpdated ) %]

    Item shelving location updated. -
    Old value: +
    Old value: [% IF errmsgloo.ItemLocationUpdated.from %] [% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => errmsgloo.ItemLocationUpdated.from ) %] [% IF errmsgloo.ItemLocationUpdated.from == '' %] - empty + empty [% ELSIF av_description == '' %] - [% errmsgloo.ItemLocationUpdated.from | html %] (No description available) + [% errmsgloo.ItemLocationUpdated.from | html %] (No description available) [% ELSE %] [% av_description | html %] [% END %] [% ELSE %] - "Blank" + "Blank" [% END %]
    New value: [% IF errmsgloo.ItemLocationUpdated.to %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index b0c0933df3..7d1032386c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -63,11 +63,11 @@ [% IF ( run_report ) %] [% IF ( total ) %] -

    [% total | html %] items found for - [% IF ( branchlimit ) %][% Branches.GetName( branchlimit ) | html %][% ELSE %]All libraries[% END %] - [% IF ( itemtypeslimit ) %] and item type: [% ItemTypes.GetDescription( itemtypeslimit ) | html %][% END %] - [% IF ( ccodeslimit ) %] and collection: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode' authorised_value = ccodeslimit ) | html %][% END %] - [% IF ( locationslimit ) %] and shelving location: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location' authorised_value = locationslimit ) | html %][% END %] +
    [% total | html %] items found for + [% IF ( branchlimit ) %][% Branches.GetName( branchlimit ) | html %][% ELSE %]All libraries[% END %] + [% IF ( itemtypeslimit ) %] and item type: [% ItemTypes.GetDescription( itemtypeslimit ) | html %][% END %] + [% IF ( ccodeslimit ) %] and collection: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode' authorised_value = ccodeslimit ) | html %][% END %] + [% IF ( locationslimit ) %] and shelving location: [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location' authorised_value = locationslimit ) | html %][% END %]
    [% ELSE %]
    No items found.
    @@ -175,7 +175,7 @@ [% IF ( itemsloo.item('size') ) %][% itemsloo.item('size') | html %][% END %] - [% IF ( itemsloo.isbn ) %]ISBN: [% itemsloo.isbn | html %][% END %] + [% IF ( itemsloo.isbn ) %]ISBN: [% itemsloo.isbn | html %][% END %]

    		[% t.description | html %] [% IF t.is_enrollable_from_opac %] - Yes + Yes [% ELSE %] - No + No [% END %] [% IF t.is_email_required %] - Yes + Yes [% ELSE %] - No + No [% END %] [% Branches.GetName( t.branchcode ) | html %] [% IF cr.item.onloan %] - Checked out + Checked out [% ELSE %] - Available + Available [% END %] [% IF hold.found == 'F' %] - Fulfilled + Fulfilled [% ELSIF hold.cancellationdate %] - Cancelled + Cancelled [% IF hold.cancellation_reason %] ([% AuthorisedValues.GetByCode('HOLD_CANCELLATION', hold.cancellation_reason) | html %]) [% END %] [% ELSIF hold.found == 'W' %] - Waiting + Waiting [% ELSIF hold.found == 'P' %] - Processing + Processing [% ELSIF hold.found == 'T' %] - In transit + In transit [% ELSE %] - Pending + Pending [% END %]
    - [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email - [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print - [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed - [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms + [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email + [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print + [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed + [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms [% ELSE %][% QUEUED_MESSAGE.message_transport_type | html %][% END %] - [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent - [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending - [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed - [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted + [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent + [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending + [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed + [% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted [% ELSE %][% QUEUED_MESSAGE.status | html %][% END %] [% IF ( QUEUED_MESSAGE.status != 'pending' ) %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index e97f92d212..6911d5868f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -49,18 +49,18 @@
  • [% IF ( pay_individual ) %] - Pay an individual fine + Pay an individual fine [% ELSIF ( writeoff_individual ) %] - Write off an individual fine + Write off an individual fine [% ELSE %] [% IF ( selected_accts ) %] [% IF type == 'WRITEOFF' %] - Write off an amount toward selected fines + Write off an amount toward selected fines [% ELSE %] - Pay an amount toward selected fines + Pay an amount toward selected fines [% END %] [% ELSE %] - Pay an amount toward all fines + Pay an amount toward all fines [% END %] [% END %] @@ -75,18 +75,18 @@

    [% IF ( pay_individual ) %] - Pay an individual fine + Pay an individual fine [% ELSIF ( writeoff_individual ) %] - Write off an individual fine + Write off an individual fine [% ELSE %] [% IF ( selected_accts ) %] [% IF type == 'WRITEOFF' %] - Write off an amount toward selected fines + Write off an amount toward selected fines [% ELSE %] - Pay an amount toward selected fines + Pay an amount toward selected fines [% END %] [% ELSE %] - Pay an amount toward all fines + Pay an amount toward all fines [% END %] [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt index 81c7c03a3f..ce35ab360a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -46,11 +46,11 @@ [% SET routinglists = patron.get_routing_lists %]

    [% UNLESS ( routinglists ) %] -0 subscription routing lists +0 subscription routing lists [% ELSIF ( routinglists.count == 1 ) %] -[% routinglists.count | html %] subscription routing list +[% routinglists.count | html %] subscription routing list [% ELSE %] -[% routinglists.count | html %] subscription routing lists +[% routinglists.count | html %] subscription routing lists [% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index e9a57f91ea..554342bed3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -27,11 +27,11 @@
  • [% IF description %] - Edit [% description | html %] + Edit [% description | html %] [% ELSIF batch_id %] - Edit ([% batch_id | html %]) + Edit ([% batch_id | html %]) [% ELSE %] - New + New [% END %]
    • @@ -45,7 +45,10 @@ [% INCLUDE 'patroncards-toolbar.inc' %] -

    [% IF description %]Edit [% ELSIF batch_id %]Edit [% ELSE %]New [% END %]patron card batches

    +

    [% IF description %]Edit [% description | html %] + [% ELSIF batch_id %]Edit patron card batch [% batch_id | html %] + [% ELSE %]New patron card batch[% END %] +

    [% IF ( duplicate_message ) %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt index 16d698fb0f..f8e1c2f536 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt @@ -41,7 +41,9 @@ [% INCLUDE 'patroncards-toolbar.inc' %] -

    [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card layout

    +

    [% IF ( layout_id ) %]Edit patron card layout [% layout_id | html %] + [% ELSE %]Create patron card layout[% END %] +

    @@ -279,7 +281,9 @@
    - [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card graphic layout + [% IF ( layout_id ) %]Edit patron card graphic layout + [% ELSE %]Create patron card graphic layout[% END %] +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 4e8b2d1ba2..28e8b64eec 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -35,7 +35,7 @@ [% IF ( GNA ) %]
  • According to our records, we don't have up-to-date contact information. Please contact the library. - [% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %] + [% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %] [% IF ( Koha.Preference('OPACPatronDetails') ) %](Please note: there may be a delay in restoring your account if you submit online.)[% END %]
    • [% END %] @@ -144,9 +144,9 @@ [% IF (RESERVE_CHARGE) %]
    [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %] - You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] when you collect this item + You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] when you collect this item [% ELSE %] - You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] for placing this hold + You will be charged a hold fee of [% RESERVE_CHARGE | $Price %] for placing this hold [% END %]
    [% END %] @@ -170,11 +170,11 @@ [% IF bibitemloo.forced_hold_level %]
    [% IF bibitemloo.forced_hold_level == 'item' %] - You already have at least one item level hold on this title. - All further holds must be item level. + You already have at least one item level hold on this title. + All further holds must be item level. [% ELSE %] - You already have at least one record level hold on this title. - All further holds must be record level. + You already have at least one record level hold on this title. + All further holds must be record level. [% END %]
    [% END %] @@ -439,17 +439,17 @@ [% IF ( itemLoo.reservedate ) %] [% IF ( itemLoo.waitingdate ) %] - Waiting + Waiting [% ELSE %] - On hold + On hold [% END %] - for patron + for patron [% IF ( itemLoo.waitingdate ) %] - at + at [% ELSE %] - expected at + expected at [% END %] - [% itemLoo.ExpectedAtLibrary | html %] since + [% itemLoo.ExpectedAtLibrary | html %] since [% IF ( itemLoo.waitingdate ) %] [% itemLoo.waitingdate | $KohaDates %] [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt index dc2f998029..cfbac7a6a5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reset-password.tt @@ -38,29 +38,29 @@

    [% SWITCH error %] [% CASE 'no_change' %] - New password must not be the same as old password. + New password must not be the same as old password. [% CASE 'passwords_mismatch' %] - Passwords do not match. Please re-type your new password. + Passwords do not match. Please re-type your new password. [% CASE 'password_too_short' %] - Password must be at least [% minPasswordLength | html %] characters long. + Password must be at least [% minPasswordLength | html %] characters long. [% CASE 'password_too_weak' %] - Password must contain at least one digit, one lowercase and one uppercase. + Password must contain at least one digit, one lowercase and one uppercase. [% CASE 'password_has_whitespaces' %] - Password must not contain leading or trailing whitespaces. + Password must not contain leading or trailing whitespaces. [% 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. + 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.
    . [% CASE 'account_locked' %] This account has been locked! [% IF Categories.can_any_reset_password && Koha.Preference('OpacBaseURL') %] You must reset your password via e-mail. [% ELSE %] - You must contact the library for assistance. + You must contact the library for assistance. [% END %] [% CASE %] - An unknown error occurred. Please try again or contact the library for assistance. + An unknown error occurred. Please try again or contact the library for assistance. [% END %]

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt index 823e0bf0a5..00f93e7e0a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt @@ -64,10 +64,10 @@ Your cart [% IF BIBLIO_RESULT.publishercode %] - Published by: [% BIBLIO_RESULT.publishercode | $raw %] + Published by: [% BIBLIO_RESULT.publishercode | $raw %] [% IF ( BIBLIO_RESULT.publicationyear ) %] in [% BIBLIO_RESULT.publicationyear | $raw %] - [% END %] + [% END %] [% IF ( BIBLIO_RESULT.pages ) %] , [% BIBLIO_RESULT.pages | $raw %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt index 755f1951fc..2197e4fe96 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt @@ -59,72 +59,72 @@

    Subscription information for [% subscription_LOO.bibliotitle | html %]

    - The current subscription began on [% subscription_LOO.startdate | html %] and is issued + The current subscription began on [% subscription_LOO.startdate | html %] and is issued [% IF ( subscription_LOO.periodicity1 ) %] - twice per day + twice per day [% END %] [% IF ( subscription_LOO.periodicity2 ) %] - every day + every day [% END %] [% IF ( subscription_LOO.periodicity3 ) %] - three times per week + three times per week [% END %] [% IF ( subscription_LOO.periodicity4 ) %] - every week + every week [% END %] [% IF ( subscription_LOO.periodicity5 ) %] - every 2 weeks + every 2 weeks [% END %] [% IF ( subscription_LOO.periodicity6 ) %] - every 3 weeks + every 3 weeks [% END %] [% IF ( subscription_LOO.periodicity7 ) %] - every month + every month [% END %] [% IF ( subscription_LOO.periodicity8 ) %] - every 2 months + every 2 months [% END %] [% IF ( subscription_LOO.periodicity9 ) %] - every quarter + every quarter [% END %] [% IF ( subscription_LOO.periodicity10 ) %] - twice per year + twice per year [% END %] [% IF ( subscription_LOO.periodicity11 ) %] - every year + every year [% END %] [% IF ( subscription_LOO.periodicity12 ) %] - every 2 years + every 2 years [% END %] [% IF ( subscription_LOO.periodicity13 ) %] - irregularly + irregularly [% END %] [% IF ( subscription_LOO.arrival1 ) %] - on Monday + on Monday [% END %] [% IF ( subscription_LOO.arrival2 ) %] - on Tuesday + on Tuesday [% END %] [% IF ( subscription_LOO.arrival3 ) %] - on Wednesday + on Wednesday [% END %] [% IF ( subscription_LOO.arrival4 ) %] - on Thursday + on Thursday [% END %] [% IF ( subscription_LOO.arrival5 ) %] - on Friday + on Friday [% END %] [% IF ( subscription_LOO.arrival6 ) %] - on Saturday + on Saturday [% END %] [% IF ( subscription_LOO.arrival7 ) %] - on Sunday + on Sunday [% END %] - for - [% IF ( subscription_LOO.numberlength ) %][% subscription_LOO.numberlength | html %] issues[% END %] - [% IF ( subscription_LOO.weeklength ) %][% subscription_LOO.weeklength | html %] weeks[% END %] - [% IF ( subscription_LOO.monthlength ) %][% subscription_LOO.monthlength | html %] months[% END %] + for + [% IF ( subscription_LOO.numberlength ) %][% subscription_LOO.numberlength | html %] issues[% END %] + [% IF ( subscription_LOO.weeklength ) %][% subscription_LOO.weeklength | html %] weeks[% END %] + [% IF ( subscription_LOO.monthlength ) %][% subscription_LOO.monthlength | html %] months[% END %]

    The first subscription was started on [% subscription_LOO.histstartdate | html %]

    [% IF ( subscription_LOO.histenddate ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 05388eb3e8..e53cab6163 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -532,9 +532,9 @@
    - This list is empty. + This list is empty. [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] - You can add to your lists from the results of any search. + You can add to your lists from the results of any search. [% END %]
    @@ -689,12 +689,12 @@ [% SET contents = s.get_contents %]
    [% s.shelfname | html %][% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %][% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %] [% IF s.is_private %] - [% IF s.is_shared %]Shared[% ELSE %]Private[% END %] + [% IF s.is_shared %]Shared[% ELSE %]Private[% END %] [% ELSE %] - Public + Public [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index 5404864f45..7821e5099f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -88,10 +88,10 @@ [% END %] [% IF review.your_comment %] - Added [% review.datereviewed | $KohaDates %] by you + Added [% review.datereviewed | $KohaDates %] by you [% ELSE %] [% IF ( review.borrowernumber && ShowReviewer != "none" ) %] - Added [% review.datereviewed | $KohaDates %] by + Added [% review.datereviewed | $KohaDates %] by [% SWITCH ShowReviewer %] [% CASE 'full' %] [% review.borrtitle | html %] [% review.firstname | html %] [% review.surname | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index d3a23f688e..0a2a26460f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -281,12 +281,12 @@ [% IF ( op_else ) %]

    [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] - Purchase suggestions + Purchase suggestions [% ELSE %] [% IF ( loggedinusername ) %] - Your purchase suggestions + Your purchase suggestions [% ELSE %] - Purchase suggestions + Purchase suggestions [% END %] [% END %]

    @@ -437,12 +437,12 @@ [% END %]     		Status: - [% IF ( suggestions_loo.ASKED ) %]Requested - [% ELSIF ( suggestions_loo.CHECKED ) %]Checked by the library - [% ELSIF ( suggestions_loo.ACCEPTED ) %]Accepted by the library - [% ELSIF ( suggestions_loo.ORDERED ) %]Ordered by the library - [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined - [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library + [% IF ( suggestions_loo.ASKED ) %]Requested + [% ELSIF ( suggestions_loo.CHECKED ) %]Checked by the library + [% ELSIF ( suggestions_loo.ACCEPTED ) %]Accepted by the library + [% ELSIF ( suggestions_loo.ORDERED ) %]Ordered by the library + [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined + [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library [% ELSE %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) | html %] [% END %] [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason | html %])[% END %] Fines: [% IF ( ISSUE.charges ) %] - Yes (Item overdue or lost) + Yes (Item overdue or lost) [% ELSIF ( ISSUE.rentalfines ) %] - Yes (Rental fees) + Yes (Rental fees) [% ELSE %] - No + No [% END %] Status: [% IF ( RECALL.requested ) %] - Requested + Requested [% ELSIF ( RECALL.overdue ) %] - Overdue to be returned + Overdue to be returned [% ELSIF ( RECALL.in_transit ) %] - In transit to [% RECALL.library.branchname | html %] + In transit to [% RECALL.library.branchname | html %] [% ELSIF ( RECALL.waiting ) %] - Ready for pickup + Ready for pickup [% END %] @@ -897,19 +897,19 @@ [% ar.patron_notes | html %] [% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %][% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %] [% IF ar.status == 'PENDING' %] - Pending + Pending [% ELSIF ar.status == 'PROCESSING' %] - Processing + Processing [% ELSIF ar.status == 'REQUESTED' %] - New + New [% ELSIF ar.status == 'COMPLETED' %] - Completed + Completed [% ELSIF ar.status == 'CANCELED' %] - Canceled + Canceled [% END %]