Bugzilla – Attachment 133129 Details for
Bug 29602
We must be nicer with translators
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29602: Surround strings with span tag
Bug-29602-Surround-strings-with-span-tag.patch (text/plain), 247.54 KB, created by
Victor Grousset/tuxayo
on 2022-04-10 02:45:12 UTC
(
hide
)
Description:
Bug 29602: Surround strings with span tag
Filename:
MIME Type:
Creator:
Victor Grousset/tuxayo
Created:
2022-04-10 02:45:12 UTC
Size:
247.54 KB
patch
obsolete
>From c5c2dbef8edf69a9595e306f290fd78dee83c19d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 30 Nov 2021 14:54:15 +0100 >Subject: [PATCH] Bug 29602: Surround strings with span tag > >To be nicer with translators. > >Update the PO files for whichever languages will show how this is >useful. > >Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> >--- > .../prog/en/includes/about-team.inc | 54 +++---- > .../prog/en/includes/accounts.inc | 50 +++---- > .../includes/authorities-search-results.inc | 34 ++--- > .../batch_authority_record_modification.inc | 7 +- > .../batch_biblio_record_deletion.inc | 12 +- > .../batch_biblio_record_modification.inc | 16 +- > .../background_jobs/batch_hold_cancel.inc | 17 ++- > .../batch_item_record_deletion.inc | 18 ++- > .../batch_item_record_modification.inc | 8 +- > .../prog/en/includes/borrower_debarments.inc | 8 +- > .../mana/mana-report-search-result.inc | 4 +- > .../prog/en/includes/patron-title.inc | 2 +- > .../prog/en/includes/renew_strings.inc | 30 ++-- > .../prog/en/includes/transfer_reasons.inc | 20 +-- > .../prog/en/includes/xslt-handler.inc | 14 +- > .../intranet-tmpl/prog/en/modules/about.tt | 10 +- > .../prog/en/modules/acqui/basket.tt | 34 ++--- > .../prog/en/modules/acqui/basketgroup.tt | 6 +- > .../prog/en/modules/acqui/booksellers.tt | 2 +- > .../prog/en/modules/acqui/duplicate_orders.tt | 10 +- > .../prog/en/modules/acqui/histsearch.tt | 10 +- > .../prog/en/modules/acqui/invoice.tt | 4 +- > .../prog/en/modules/acqui/orderreceive.tt | 10 +- > .../prog/en/modules/acqui/parcel.tt | 14 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 6 +- > .../en/modules/admin/authorised_values.tt | 26 ++-- > .../prog/en/modules/admin/authtypes.tt | 12 +- > .../prog/en/modules/admin/background_jobs.tt | 28 ++-- > .../prog/en/modules/admin/biblio_framework.tt | 16 +- > .../prog/en/modules/admin/branches.tt | 36 ++--- > .../prog/en/modules/admin/cash_registers.tt | 18 +-- > .../prog/en/modules/admin/categories.tt | 78 +++++----- > .../prog/en/modules/admin/cities.tt | 16 +- > .../prog/en/modules/admin/classsources.tt | 38 ++--- > .../prog/en/modules/admin/credit_types.tt | 14 +- > .../prog/en/modules/admin/currency.tt | 24 +-- > .../prog/en/modules/admin/debit_types.tt | 10 +- > .../prog/en/modules/admin/desks.tt | 16 +- > .../prog/en/modules/admin/didyoumean.tt | 7 +- > .../prog/en/modules/admin/itemtypes.tt | 28 ++-- > .../prog/en/modules/admin/library_groups.tt | 12 +- > .../en/modules/admin/marc-overlay-rules.tt | 6 +- > .../modules/admin/marc_subfields_structure.tt | 4 +- > .../prog/en/modules/admin/marctagstructure.tt | 2 +- > .../prog/en/modules/admin/matching-rules.tt | 14 +- > .../prog/en/modules/admin/preferences.tt | 4 +- > .../prog/en/modules/admin/smtp_servers.tt | 10 +- > .../prog/en/modules/admin/usage_statistics.tt | 18 +-- > .../prog/en/modules/admin/z3950servers.tt | 4 +- > .../prog/en/modules/catalogue/detail.tt | 10 +- > .../prog/en/modules/catalogue/results.tt | 2 +- > .../prog/en/modules/cataloguing/addbooks.tt | 2 +- > .../prog/en/modules/cataloguing/merge.tt | 2 +- > .../prog/en/modules/circ/pendingreserves.tt | 2 +- > .../prog/en/modules/circ/reserveratios.tt | 2 +- > .../prog/en/modules/circ/returns.tt | 22 +-- > .../prog/en/modules/ill/ill-requests.tt | 2 +- > .../en/modules/labels/label-edit-layout.tt | 16 +- > .../en/modules/labels/label-edit-profile.tt | 10 +- > .../prog/en/modules/labels/label-manage.tt | 16 +- > .../prog/en/modules/members/housebound.tt | 40 ++--- > .../prog/en/modules/members/memberentrygen.tt | 30 ++-- > .../prog/en/modules/members/merge-patrons.tt | 48 +++--- > .../prog/en/modules/members/moremember.tt | 12 +- > .../prog/en/modules/members/notices.tt | 20 +-- > .../prog/en/modules/members/printfeercpt.tt | 2 +- > .../prog/en/modules/members/printinvoice.tt | 2 +- > .../prog/en/modules/members/statistics.tt | 12 +- > .../prog/en/modules/offline_circ/list.tt | 8 +- > .../prog/en/modules/patroncards/manage.tt | 26 ++-- > .../prog/en/modules/pos/printreceipt.tt | 2 +- > .../en/modules/reports/acquisitions_stats.tt | 26 ++-- > .../prog/en/modules/reports/bor_issues_top.tt | 22 +-- > .../prog/en/modules/reports/dictionary.tt | 12 +- > .../modules/reports/guided_reports_start.tt | 12 +- > .../prog/en/modules/reports/issues_stats.tt | 33 ++--- > .../en/modules/reports/orders_by_budget.tt | 2 +- > .../prog/en/modules/reserve/request.tt | 32 ++-- > .../en/modules/serials/serials-collection.tt | 4 +- > .../modules/serials/showpredictionpattern.tt | 2 +- > .../en/modules/serials/subscription-detail.tt | 14 +- > .../serials/subscription-frequencies.tt | 8 +- > .../en/modules/serials/subscription-renew.tt | 6 +- > .../prog/en/modules/suggestion/suggestion.tt | 42 +++--- > .../prog/en/modules/tags/review.tt | 19 +-- > .../en/modules/tools/additional-contents.tt | 18 +-- > .../prog/en/modules/tools/batchMod-del.tt | 4 +- > .../prog/en/modules/tools/batchMod-edit.tt | 4 +- > .../modules/tools/batch_extend_due_dates.tt | 2 +- > .../prog/en/modules/tools/csv-profiles.tt | 28 ++-- > .../prog/en/modules/tools/export.tt | 2 +- > .../prog/en/modules/tools/inventory.tt | 12 +- > .../prog/en/modules/tools/letter.tt | 29 ++-- > .../en/modules/tools/manage-marc-import.tt | 34 ++--- > .../prog/en/modules/tools/modborrowers.tt | 66 +++------ > .../prog/en/modules/tools/overduerules.tt | 21 +-- > .../prog/en/modules/tools/preview_letter.tt | 16 +- > .../prog/en/modules/tools/problem-reports.tt | 12 +- > .../prog/en/modules/tools/quotes.tt | 10 +- > .../prog/en/modules/tools/viewlog.tt | 140 +++++++++--------- > .../modules/virtualshelves/downloadshelf.tt | 6 +- > .../virtualshelves/tables/shelves_results.tt | 7 +- > .../bootstrap/en/includes/accounts.inc | 50 +++---- > .../includes/authorities-search-results.inc | 14 +- > .../en/includes/opac-authorities.inc | 26 ++-- > .../en/includes/opac-detail-sidebar.inc | 18 +-- > .../bootstrap/en/includes/xslt-handler.inc | 14 +- > .../en/modules/opac-reportproblem.tt | 6 +- > .../en/modules/opac-request-article.tt | 4 +- > .../bootstrap/en/modules/opac-suggestions.tt | 14 +- > 110 files changed, 944 insertions(+), 976 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc >index d121290966..f53c6794eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc >@@ -1,32 +1,32 @@ > [%- BLOCK role -%] > [%- SWITCH role.key -%] >- [%- CASE 'manager' -%]Release manager >- [%- CASE 'manager_assistant' -%]Release manager assistant >- [%- CASE 'manager_mentor' -%]Release manager mentor >- [%- CASE 'qa_manager' -%]Quality assurance manager >- [%- CASE 'qa' -%]Quality assurance team >- [%- CASE 'documentation' -%]Documentation manager >- [%- CASE 'documentation_team' -%]Documentation team >- [%- CASE 'translation' -%]Translation manager >- [%- CASE 'translations' -%]Translation managers >- [%- CASE 'translation_assistant' -%]Translation manager assistant >- [%- CASE 'te' -%]Topic expert >- [%- CASE 'bugwrangler' -%]Bug wrangler >- [%- CASE 'maintainer' -%]Release maintainer >- [%- CASE 'maintainer_assistant' -%]Release maintainer assistant >- [%- CASE 'maintainer_mentor' -%]Release maintainer mentor >- [%- CASE 'wiki' -%]Wiki curator >- [%- CASE 'ci' -%]Continuous integration manager >- [%- CASE 'packaging' -%]Packaging manager >- [%- CASE 'packaging_assistant' -%]Packaging manager assistant >- [%- CASE 'chairperson' -%]Meetings chairperson >- [%- CASE 'newsletter' -%]Newsletter editor >- [%- CASE 'mm' -%]Module maintainer >- [%- CASE 'vm' -%]Virtual machine maintainer >- [%- CASE 'database' -%]Documentation specialist >- [%- CASE 'live_cd' -%]Live CD maintainer >- [%- CASE 'accessibility_advocate'-%]Accessibility advocate >- [%- CASE 'meeting_facilitator' -%]Meeting facilitator >+ [%- CASE 'manager' -%]<span>Release manager</span> >+ [%- CASE 'manager_assistant' -%]<span>Release manager assistant</span> >+ [%- CASE 'manager_mentor' -%]<span>Release manager mentor</span> >+ [%- CASE 'qa_manager' -%]<span>Quality assurance manager</span> >+ [%- CASE 'qa' -%]<span>Quality assurance team</span> >+ [%- CASE 'documentation' -%]<span>Documentation manager</span> >+ [%- CASE 'documentation_team' -%]<span>Documentation team</span> >+ [%- CASE 'translation' -%]<span>Translation manager</span> >+ [%- CASE 'translations' -%]<span>Translation managers</span> >+ [%- CASE 'translation_assistant' -%]<span>Translation manager assistant</span> >+ [%- CASE 'te' -%]<span>Topic expert</span> >+ [%- CASE 'bugwrangler' -%]<span>Bug wrangler</span> >+ [%- CASE 'maintainer' -%]<span>Release maintainer</span> >+ [%- CASE 'maintainer_assistant' -%]<span>Release maintainer assistant</span> >+ [%- CASE 'maintainer_mentor' -%]<span>Release maintainer mentor</span> >+ [%- CASE 'wiki' -%]<span>Wiki curator</span> >+ [%- CASE 'ci' -%]<span>Continuous integration manager</span> >+ [%- CASE 'packaging' -%]<span>Packaging manager</span> >+ [%- CASE 'packaging_assistant' -%]<span>Packaging manager assistant</span> >+ [%- CASE 'chairperson' -%]<span>Meetings chairperson</span> >+ [%- CASE 'newsletter' -%]<span>Newsletter editor</span> >+ [%- CASE 'mm' -%]<span>Module maintainer</span> >+ [%- CASE 'vm' -%]<span>Virtual machine maintainer</span> >+ [%- CASE 'database' -%]<span>Documentation specialist</span> >+ [%- CASE 'live_cd' -%]<span>Live CD maintainer</span> >+ [%- CASE 'accessibility_advocate'-%]<span>Accessibility advocate</span> >+ [%- CASE 'meeting_facilitator' -%]<span>Meeting facilitator</span> > [%- END -%] > [%- END -%] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >index 841896b034..6110f8af8b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc >@@ -11,36 +11,36 @@ > > [%- BLOCK debit_type_description -%] > [%- SWITCH debit_type.code -%] >- [%- CASE 'ACCOUNT' -%]Account creation fee >- [%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee >- [%- CASE 'ARTICLE_REQUEST' -%]Article request fee >- [%- CASE 'LOST' -%]Lost item >- [%- CASE 'MANUAL' -%]Manual fee >- [%- CASE 'NEW_CARD' -%]New card >- [%- CASE 'OVERDUE' -%]Fine >- [%- CASE 'PROCESSING' -%]Lost item processing fee >- [%- CASE 'RENT' -%]Rental fee >- [%- CASE 'RENT_DAILY' -%]Daily rental fee >- [%- CASE 'RENT_RENEW' -%]Renewal of rental item >- [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item >- [%- CASE 'RESERVE' -%]Hold fee >- [%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long >- [%- CASE 'Payout' -%]Payout >- [%- CASE -%][% debit_type.description | html %] >+ [%- CASE 'ACCOUNT' -%]<span>Account creation fee</span> >+ [%- CASE 'ACCOUNT_RENEW' -%]<span>Account renewal fee</span> >+ [%- CASE 'ARTICLE_REQUEST' -%]<span>Article request fee</span> >+ [%- CASE 'LOST' -%]<span>Lost item</span> >+ [%- CASE 'MANUAL' -%]<span>Manual fee</span> >+ [%- CASE 'NEW_CARD' -%]<span>New card</span> >+ [%- CASE 'OVERDUE' -%]<span>Fine</span> >+ [%- CASE 'PROCESSING' -%]<span>Lost item processing fee</span> >+ [%- CASE 'RENT' -%]<span>Rental fee</span> >+ [%- CASE 'RENT_DAILY' -%]<span>Daily rental fee</span> >+ [%- CASE 'RENT_RENEW' -%]<span>Renewal of rental item</span> >+ [%- CASE 'RENT_DAILY_RENEW' -%]<span>Renewal of daily rental item</span> >+ [%- CASE 'RESERVE' -%]<span>Hold fee</span> >+ [%- CASE 'RESERVE_EXPIRED' -%]<span>Hold waiting too long</span> >+ [%- CASE 'Payout' -%]<span>Payout</span> >+ [%- CASE -%]<span>[% debit_type.description | html %]</span> > [%- END -%] > [%- END -%] > > [%- BLOCK credit_type_description -%] > [%- SWITCH credit_type.code -%] >- [%- CASE 'PAYMENT' -%]Payment >- [%- CASE 'WRITEOFF' -%]Writeoff >- [%- CASE 'FORGIVEN' -%]Forgiven >- [%- CASE 'CREDIT' -%]Credit >- [%- CASE 'LOST_FOUND' -%]Lost item fee refund >- [%- CASE 'OVERPAYMENT' -%]Overpayment refund >- [%- CASE 'REFUND' -%]Refund >- [%- CASE 'CANCELLATION' -%]Cancelled charge >- [%- CASE -%][% credit_type.description | html %] >+ [%- CASE 'PAYMENT' -%]<span>Payment</span> >+ [%- CASE 'WRITEOFF' -%]<span>Writeoff</span> >+ [%- CASE 'FORGIVEN' -%]<span>Forgiven</span> >+ [%- CASE 'CREDIT' -%]<span>Credit</span> >+ [%- CASE 'LOST_FOUND' -%]<span>Lost item fee refund</span> >+ [%- CASE 'OVERPAYMENT' -%]<span>Overpayment refund</span> >+ [%- CASE 'REFUND' -%]<span>Refund</span> >+ [%- CASE 'CANCELLATION' -%]<span>Cancelled charge</span> >+ [%- CASE -%]<span>[% credit_type.description | html %]</span> > [%- END -%] > [%- END -%] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >index 66d8c7f633..819face44c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >@@ -39,13 +39,13 @@ > [% UNLESS ( type=='seefrom' || type=='seealso' ) %] > <span class="type"> > [% SWITCH type %] >- [% CASE 'earlier' %](Earlier heading) >- [% CASE 'later' %](Later heading) >- [% CASE 'acronym' %](Acronym) >- [% CASE 'musical' %](Musical composition) >- [% CASE 'broader' %](Broader heading) >- [% CASE 'narrower' %](Narrower heading) >- [% CASE 'parent' %](Immediate parent body) >+ [% CASE 'earlier' %]<span>(Earlier heading)</span> >+ [% CASE 'later' %]<span>(Later heading)</span> >+ [% CASE 'acronym' %]<span>(Acronym)</span> >+ [% CASE 'musical' %]<span>(Musical composition)</span> >+ [% CASE 'broader' %]<span>(Broader heading)</span> >+ [% CASE 'narrower' %]<span>(Narrower heading)</span> >+ [% CASE 'parent' %]<span>(Immediate parent body)</span> > [% CASE %][% IF type %]([% type | html %]) > [% END %] > [% END %] >@@ -132,15 +132,15 @@ > > [% BLOCK language %] > [% SWITCH lang %] >- [% CASE ['en', 'eng'] %]English >- [% CASE ['fr', 'fre'] %]French >- [% CASE ['it', 'ita'] %]Italian >- [% CASE ['de', 'ger', 'deu'] %]German >- [% CASE ['es', 'spa'] %]Spanish >- [% CASE ['heb'] %]Hebrew >- [% CASE ['ara'] %]Arabic >- [% CASE ['gre'] %]Greek (modern) >- [% CASE ['grc'] %]Greek (to 1453) >- [% CASE %][% lang | html %] >+ [% CASE ['en', 'eng'] %]<span>English</span> >+ [% CASE ['fr', 'fre'] %]<span>French</span> >+ [% CASE ['it', 'ita'] %]<span>Italian</span> >+ [% CASE ['de', 'ger', 'deu'] %]<span>German</span> >+ [% CASE ['es', 'spa'] %]<span>Spanish</span> >+ [% CASE ['heb'] %]<span>Hebrew</span> >+ [% CASE ['ara'] %]<span>Arabic</span> >+ [% CASE ['gre'] %]<span>Greek (modern)</span> >+ [% CASE ['grc'] %]<span>Greek (to 1453)</span> >+ [% CASE %]<span>[% lang | html %]</span> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc >index 58291f570d..37af0630b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc >@@ -1,3 +1,4 @@ >+[% SET KohaSpan %] > [% BLOCK report %] > [% SET report = job.report %] > [% IF report %] >@@ -25,11 +26,13 @@ > [% ELSIF m.type == 'error' %] > <i class="fa fa-exclamation error"></i> > [% END %] >+ [% authority_link = BLOCK %]<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% m.authid | uri %]">[% m.authid | html %]</a>[% END %] > [% SWITCH m.code %] > [% CASE 'authority_not_modified' %] >- Authority record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% m.authid | uri %]">[% m.authid | html %]</a> has not been modified. An error occurred on modifying it[% IF m.error %] ([% m.error | html %])[% END %]. >+ <span>Authority record [% authority_link | $KohaSpan %] has not been modified. An error occurred on modifying it</span> >+ [% IF m.error %] ([% m.error | html %])[% END %]. > [% CASE 'authority_modified' %] >- Authority record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% m.authid | uri %]">[% m.authid | html %]</a> has successfully been modified.. >+ <span>Authority record [% authority_link | $KohaSpan %] has successfully been modified.</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc >index 83f81cb538..0d2925f5be 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc >@@ -29,17 +29,17 @@ > [% END %] > [% SWITCH m.code %] > [% CASE 'biblio_not_exists' %] >- The biblionumber [% m.biblionumber | html %] does not exist in the database. >+ <span>The biblionumber [% m.biblionumber | html %] does not exist in the database.</span> > [% CASE 'item_issued' %] >- At least one item is checked out on bibliographic record [% m.biblionumber | html %]. >+ <span>At least one item is checked out on bibliographic record [% m.biblionumber | html %].</span> > [% CASE 'reserve_not_cancelled' %] >- Bibliographic record [% m.biblionumber | html %] was not deleted. A hold could not be canceled (reserve_id [% m.reserve_id | html %]). >+ <span>Bibliographic record [% m.biblionumber | html %] was not deleted. A hold could not be canceled (reserve_id [% m.reserve_id | html %]).</span> > [% CASE 'item_not_deleted' %] >- The bibliographic record [% m.biblionumber | html %] was not deleted. An error was encountered when deleting an item (itemnumber [% m.itemnumber | html %]). >+ <span>The bibliographic record [% m.biblionumber | html %] was not deleted. An error was encountered when deleting an item (itemnumber [% m.itemnumber | html %]).</span> > [% CASE 'biblio_not_deleted' %] >- Bibliographic record [% m.biblionumber | html %] was not deleted. An error occurred. >+ <span>Bibliographic record [% m.biblionumber | html %] was not deleted. An error occurred.</span> > [% CASE 'biblio_deleted' %] >- Bibliographic record [% m.biblionumber | html %] has been deleted successfully. >+ <span>Bibliographic record [% m.biblionumber | html %] has been deleted successfully.</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc >index 89fd36ac6b..7315c35c84 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc >@@ -1,12 +1,14 @@ >+[% USE KohaSpan %] > [% BLOCK report %] > [% SET report = job.report %] > [% IF report %] > [% IF report.total_records == report.total_success %] > <div class="dialog message"> >- All records have successfully been modified! <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a> >+ <span>All records have successfully been modified!</span> >+ <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a> > [% IF lists.count %] > <br /> >- Add modified records to the following list: >+ <span>Add modified records to the following list:</span> > <select name="add_bibs_to_list" id="add_bibs_to_list"> > <option value="">Select a list</option> > [% FOREACH list IN lists %] >@@ -17,8 +19,8 @@ > </div> > [% ELSE %] > <div class="dialog message"> >- [% 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 %] >+ <span>[% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred.</span> >+ [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %] > <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a> > </div> > [% END %] >@@ -35,11 +37,13 @@ > [% ELSIF m.type == 'error' %] > <i class="fa fa-exclamation error"></i> > [% END %] >+ [% biblio_link = BLOCK %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.biblionumber | uri %]">[% m.biblionumber | html %]</a>[% END %] > [% SWITCH m.code %] > [% CASE 'biblio_not_modified' %] >- Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.biblionumber | uri %]">[% m.biblionumber | html %]</a> has not been modified. An error occurred on modifying it.[% IF m.error %] ([% m.error | html %])[% END %]. >+ <span>Bibliographic record [% biblio_link %] has not been modified. An error occurred on modifying it.</span> >+ [% IF m.error %] ([% m.error | html %])[% END %]. > [% CASE 'biblio_modified' %] >- Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.biblionumber | uri %]">[% m.biblionumber | html %]</a> has successfully been modified. >+ <span>Bibliographic record [% biblio_link %] has successfully been modified.</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc >index 655ca32c15..280149b7fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc >@@ -1,3 +1,4 @@ >+[% USE KohaSpan %] > [% BLOCK report %] > [% SET report = job.report %] > [% IF report %] >@@ -7,8 +8,8 @@ > </div> > [% ELSE %] > <div class="dialog message"> >- [% report.total_success | html %] / [% report.total_holds | html %] holds have successfully been modified. Some errors occurred. >- [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %] >+ <span>[% report.total_success | html %] / [% report.total_holds | html %] holds have successfully been modified. Some errors occurred.</span> >+ [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %] > </div> > [% END %] > [% END %] >@@ -28,16 +29,18 @@ > [% SWITCH m.code %] > [% CASE 'hold_not_cancelled' %] > [% IF m.biblio && m.patron %] >- Hold on <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% m.biblio.biblionumber | uri %]">[% m.biblio.title | html %]</a> for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% m.patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=m.patron %]</a> has not been cancelled. >+ <span>Hold on <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% m.biblio.biblionumber | uri %]">[% m.biblio.title | html %]</a> for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% m.patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=m.patron %]</a> has not been cancelled.</span> > [% END %] >- An error occurred on cancelling. >+ <span>An error occurred on cancelling.</span> > [% SWITCH m.error %] > [% CASE 'hold_not_found' %] >- No hold with id [% m.hold_id | html %] found. >- [% CASE %]Unknown error '[% m.error | html %]'. >+ <span>No hold with id [% m.hold_id | html %] found.</span> >+ [% CASE %]<span>Unknown error '[% m.error | html %]'.</span> > [% END %] > [% CASE 'hold_cancelled' %] >- Hold on <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% m.biblio_id | uri %]">[% m.biblio.title | html %]</a> for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% m.patron_id | uri %]">[% INCLUDE 'patron-title.inc' patron=m.patron %]</a> has successfully been cancelled. >+ [% biblio_link = BLOCK %]<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% m.biblio_id | uri %]">[% m.biblio.title | html %]</a>[% END %] >+ [% patron_link = BLOCK %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% m.patron_id | uri %]">[% INCLUDE 'patron-title.inc' patron=m.patron %]</a>[% END %] >+ <span>Hold on [% biblio_link | $KohaSpan %] for [% patron_link | $KohaSpan %] has successfully been cancelled.</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc >index 85a4b806b0..b65e4db5ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc >@@ -1,3 +1,4 @@ >+[% USE KohaSpan %] > [% BLOCK report %] > [% SET report = job.report %] > [% IF report %] >@@ -39,16 +40,17 @@ > [% END %] > [% SWITCH m.code %] > [% CASE 'item_not_deleted' %] >- Item with barcode <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% m.biblionumber | uri %]&itemnumber=[% m.itemnumber | uri %]">[% m.barcode | html %]</a> cannot be deleted: >+ [% item_link = BLOCK %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% m.biblionumber | uri %]&itemnumber=[% m.itemnumber | uri %]">[% m.barcode | html %]</a>[% END %] >+ <span>Item with barcode [% item_link | $KohaSpan%] cannot be deleted:</span> > [% SWITCH m.reason %] >- [% CASE "book_on_loan" %]Item is checked out >- [% CASE "not_same_branch" %]Item does not belong to your library >- [% CASE "book_reserved" %]Item has a waiting hold >- [% CASE "linked_analytics" %]Item has linked analytics >- [% CASE "last_item_for_hold" %]Last item for bibliographic record with biblio-level hold on it >- [% CASE %]Unknown reason '[% m.reason | html %]' >+ [% CASE "book_on_loan" %]<span>Item is checked out</span> >+ [% CASE "not_same_branch" %]<span>Item does not belong to your library</span> >+ [% CASE "book_reserved" %]<span>Item has a waiting hold</span> >+ [% CASE "linked_analytics" %]<span>Item has linked analytics</span> >+ [% CASE "last_item_for_hold" %]<span>Last item for bibliographic record with biblio-level hold on it</span> >+ [% CASE %]<span>Unknown reason '[% m.reason | html %]'</span> > [% END %] >- [% CASE %]Unknown message '[% m.code | html %]' >+ [% CASE %]<span>Unknown message '[% m.code | html %]'</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc >index 37546d29cc..4e5d532ea2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc >@@ -5,12 +5,12 @@ > [% IF report %] > <div class="dialog message"> > [% IF report.modified_itemnumbers.size %] >- [% report.modified_itemnumbers.size | html %] item(s) modified (with [% report.modified_fields | html %] field(s) modified). >+ <span>[% report.modified_itemnumbers.size | html %] item(s) modified (with [% report.modified_fields | html %] field(s) modified).</span> > [% ELSE %] >- No items modified. >+ <span>No items modified.</span> > [% END %] > >- [% IF job.status == 'cancelled' %]The job has been cancelled before it finished.[% END %] >+ [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %] > <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a> > </div> > [% END %] >@@ -27,7 +27,7 @@ > <i class="fa fa-exclamation error"></i> > [% END %] > [% SWITCH m.code %] >- [% CASE %]Unknown message '[% m.code | html %]' >+ [% CASE %]<span>Unknown message '[% m.code | html %]'</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >index bd224f6a73..9a0cba9b8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc >@@ -21,13 +21,13 @@ > <td> > [% SWITCH d.type %] > [% CASE 'MANUAL' %] >- Manual >+ <span>Manual</span> > [% CASE 'OVERDUES' %] >- Overdues >+ <span>Overdues</span> > [% CASE 'SUSPENSION' %] >- Suspension >+ <span>Suspension</span> > [% CASE 'DISCHARGE' %] >- Discharge >+ <span>Discharge</span> > [% END %] > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc >index 76f897989e..6ea4b2f26c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc >@@ -104,9 +104,9 @@ > [% ELSE %] > <h4> > [% IF ( msg ) %] >- [% msg | html %] (Statuscode: [% statuscode | html %]) >+ [% msg | html %] <span>(Status code: [% statuscode | html %])</span> > [% ELSE %] >- No results found >+ <span>No results found</span> > [% END %] > </h4> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >index 5a9b14d727..2ec1cd6ec8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >@@ -71,7 +71,7 @@ > [%- data.cardnumber | html -%] > [%- END -%] > [%- ELSE -%] >- A patron from library [% Branches.GetName( patron.branchcode ) | html -%] >+ <span>A patron from library [% Branches.GetName( patron.branchcode ) | html -%]<span> > [%- END -%] > > [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/renew_strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/renew_strings.inc >index fd02ab0be7..fd81f1240a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/renew_strings.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/renew_strings.inc >@@ -1,32 +1,32 @@ > [% SWITCH error %] > [% CASE 'no_item' %] >- No matching item could be found >+ <span>No matching item could be found</span> > [% CASE 'no_checkout' %] >- Item is not checked out >+ <span>Item is not checked out</span> > [% CASE 'too_soon' %] >- Cannot be renewed yet >+ <span>Cannot be renewed yet</span> > [% CASE 'too_many' %] >- Renewed the maximum number of times >+ <span>Renewed the maximum number of times</span> > [% CASE 'auto_too_soon' %] >- Scheduled for automatic renewal and cannot be renewed yet >+ <span>Scheduled for automatic renewal and cannot be renewed yet</span> > [% CASE 'auto_too_late' %] >- Scheduled for automatic renewal and cannot be renewed any more >+ <span>Scheduled for automatic renewal and cannot be renewed any more</span> > [% CASE 'auto_account_expired' %] >- Scheduled for automatic renewal and cannot be renewed because the patron's account has expired >+ <span>Scheduled for automatic renewal and cannot be renewed because the patron's account has expired</span> > [% CASE 'auto_renew' %] >- Scheduled for automatic renewal >+ <span>Scheduled for automatic renewal</span> > [% CASE 'auto_too_much_oweing' %] >- Scheduled for automatic renewal and cannot be renewed because the patron has too many outstanding charges >+ <span>Scheduled for automatic renewal and cannot be renewed because the patron has too many outstanding charges</span> > [% CASE 'on_reserve' %] >- On hold for another patron >+ <span>On hold for another patron</span> > [% CASE 'patron_restricted' %] >- Patron is currently restricted >+ <span>Patron is currently restricted</span> > [% CASE 'item_denied_renewal' %] >- Item is not allowed renewal >+ <span>Item is not allowed renewal</span> > [% CASE 'onsite_checkout' %] >- Item is an onsite checkout >+ <span>Item is an onsite checkout</span> > [% CASE 'has_fine' %] >- Item has an outstanding fine >+ <span>Item has an outstanding fine</span> > [% CASE %] >- Unknown error >+ <span>Unknown error</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/transfer_reasons.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/transfer_reasons.inc >index f1736669ad..dfdc7a8ed6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/transfer_reasons.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/transfer_reasons.inc >@@ -1,14 +1,14 @@ > [%- BLOCK transfer_reason -%] > [%- SWITCH transfer.reason -%] >- [%- CASE 'Manual' -%]Manual >- [%- CASE 'StockrotationAdvance' -%]Stock rotation advance >- [%- CASE 'StockrotationRepatriation' -%]Stock rotation repatriation >- [%- CASE 'ReturnToHome' -%]Automatic return to home >- [%- CASE 'ReturnToHolding' -%]Automatic return to holding >- [%- CASE 'RotatingCollection' -%]Rotating collection >- [%- CASE 'Reserve' -%]Hold >- [%- CASE 'LostReserve' -%]Hold lost >- [%- CASE 'CancelReserve' -%]Hold cancelled >- [%- CASE -%][% transfer.reason | html %] >+ [%- CASE 'Manual' -%]<span>Manual</span> >+ [%- CASE 'StockrotationAdvance' -%]<span>Stock rotation advance</span> >+ [%- CASE 'StockrotationRepatriation' -%]<span>Stock rotation repatriation</span> >+ [%- CASE 'ReturnToHome' -%]<span>Automatic return to home</span> >+ [%- CASE 'ReturnToHolding' -%]<span>Automatic return to holding</span> >+ [%- CASE 'RotatingCollection' -%]<span>Rotating collection</span> >+ [%- CASE 'Reserve' -%]<span>Hold</span> >+ [%- CASE 'LostReserve' -%]<span>Hold lost</span> >+ [%- CASE 'CancelReserve' -%]<span>Hold cancelled</span> >+ [%- CASE -%]<span>[% transfer.reason | html %]</span> > [%- END -%] > [%- END -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/xslt-handler.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/xslt-handler.inc >index b3e93f35ff..bfe0f15138 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/xslt-handler.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/xslt-handler.inc >@@ -1,16 +1,16 @@ > [% SWITCH code %] > [% CASE 'XSLTH_ERR_NO_FILE' %] >- No XSLT file passed. >+ <span>No XSLT file passed.</span> > [% CASE 'XSLTH_ERR_FILE_NOT_FOUND' %] >- XSLT file not found. >+ <span>XSLT file not found.</span> > [% CASE 'XSLTH_ERR_LOADING' %] >- Error while loading stylesheet. >+ <span>Error while loading stylesheet.</span> > [% CASE 'XSLTH_ERR_PARSING_CODE' %] >- Error while parsing stylesheet. >+ <span>Error while parsing stylesheet.</span> > [% CASE 'XSLTH_ERR_PARSING_DATA' %] >- Error while parsing input. >+ <span>Error while parsing input.</span> > [% CASE 'XSLTH_ERR_TRANSFORMING' %] >- Error while transforming input. >+ <span>Error while transforming input.</span> > [% CASE 'XSLTH_NO_STRING_PASSED' %] >- No string to transform. >+ <span>No string to transform.</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 01b7d64efd..19df3bd3e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -281,11 +281,11 @@ > <h2>Logging system does not behave correctly</h2> > [% FOR e IN log4perl_errors %] > [% SWITCH e %] >- [% CASE 'missing_config_entry' %]There is no 'log4perl_conf' entry in the config file. >- [% CASE 'cannot_read_config_file' %]The log4perl config file cannot be opened. >- [% CASE 'logfile_not_writable' %]One of the logfiles listed in the config file is not writable. >- [% CASE 'cannot_init_module' %]The Koha::Logger module cannot be initiated correctly (check the log file). >- [% CASE %]Unknown error "[% e | html %]" >+ [% CASE 'missing_config_entry' %]<span>There is no 'log4perl_conf' entry in the config file.</span> >+ [% CASE 'cannot_read_config_file' %]<span>The log4perl config file cannot be opened.</span> >+ [% CASE 'logfile_not_writable' %]<span>One of the logfiles listed in the config file is not writable.</span> >+ [% CASE 'cannot_init_module' %]<span>The Koha::Logger module cannot be initiated correctly (check the log file).</span> >+ [% CASE %]<span>Unknown error '[% e | html %]'.</span> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index c4a43aebb6..fac3582905 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -217,15 +217,15 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'no_email' %] >- This vendor has no contact selected for sending orders to or is missing an e-mail address. >+ <span>This vendor has no contact selected for sending orders to or is missing an e-mail address.</span> > [% CASE 'no_basketno' %] >- No basket given. >+ <span>No basket given.</span> > [% CASE 'no_letter' %] >- There is no notice template with code ACQORDER defined. >+ <span>There is no notice template with code ACQORDER defined.</span> > [% CASE 'email_sent' %] >- Order e-mail was sent to the vendor. >+ <span>Order e-mail was sent to the vendor.</span> > [% CASE %] >- ERROR! - [% m.code | html %] >+ <span>ERROR! - [% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -317,9 +317,9 @@ > [% IF ( ediaccount ) %] > [%- BLOCK edi_status -%] > [%- SWITCH edi_order.status -%] >- [%- CASE 'Pending' -%]Pending >- [%- CASE 'Sent' -%]Sent >- [%- CASE 'Processed' -%]Processed >+ [%- CASE 'Pending' -%]<span>Pending</span> >+ [%- CASE 'Sent' -%]<span>Sent</span> >+ [%- CASE 'Processed' -%]<span>Processed</span> > [%- END -%] > [%- END -%] > [% IF ( edi_order ) %] >@@ -337,9 +337,9 @@ > <li> > <span class="label">Create items when:</span> > [% SWITCH basket.create_items %] >- [% CASE 'receiving' %]Receiving items >- [% CASE 'cataloguing' %]Cataloguing items >- [% CASE %]Placing orders >+ [% CASE 'receiving' ]<span>Receiving items</span> >+ [% CASE 'cataloguing' ]<span>Cataloguing items</span> >+ [% CASE ]<span>Placing orders</span> > [% END %] > </li> > [% END %] >@@ -355,15 +355,15 @@ > > [% IF basketgroup.closed %] > [% IF ( CAN_user_acquisition_group_manage ) %] >- <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup">[% basketgroup.name | html %] (closed)</a> >+ <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup">[% basketgroup.name | html %] <span>(closed)</span></a> > [% ELSE %] >- [% basketgroup.name | html %] (closed) >+ [% basketgroup.name | html %] <span>(closed)</span> > [% END %] > [% ELSIF ( ! CAN_user_acquisition_group_manage ) %] > [%- IF basketgroup.id -%] > [% basketgroup.name | html %] > [%- ELSE -%] >- No group >+ <span>No group</span> > [%- END -%] > [% ELSE %] > [% IF ( CAN_user_acquisition_group_manage ) %] >@@ -391,7 +391,7 @@ > [% UNLESS bg.closed %] > <option value="[% bg.id | html %]">[% bg.name | html %]</option> > [% ELSE %] >- <option value="[% bg.id | html %]" disabled="disabled">[% bg.name | html %] (closed)</option> >+ <option value="[% bg.id | html %]" disabled="disabled">[% bg.name | html %] <span>(closed)</span></option> > [% END %] > [% END %] > [% END %] >@@ -570,7 +570,7 @@ > </td> > [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %] > [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %] >- <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] </td> >+ <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] <span>(Uncertain)</span> [% END %] </td> > <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_excluded | $Price %]</td> > <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td> > <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td> >@@ -693,7 +693,7 @@ > <td class="number"> > [% order.rrp_tax_excluded | $Price %] > [% IF ( order.uncertain ) %] >- (Uncertain) >+ <span>(Uncertain)</span> > [% END %] > </td> > <td class="number">[% order.ecost_tax_excluded | $Price %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 7bf2c17cc7..190d07b051 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -200,7 +200,7 @@ fieldset.various li { > [% IF ( basket.basketname ) %] > [% basket.basketname | html %] > [% ELSE %] >- No name, basketnumber: [% basket.basketno | html %] >+ <span>No name, basketnumber: [% basket.basketno | html %]</span> > [% END %] > </a>, <br /> > Total: [% basket.total | $Price %] >@@ -350,7 +350,7 @@ fieldset.various li { > <td>[% IF ( basketgroup.name ) %] > [% basketgroup.name | html %] > [% ELSE %] >- Basket group no. [% basketgroup.id | html %] >+ <span>Basket group no. [% basketgroup.id | html %]</span> > [% END %] > </td> > <td>[% basketgroup.id | html %]</td> >@@ -390,7 +390,7 @@ fieldset.various li { > [% IF ( basketgroup.name ) %] > [% basketgroup.name | html %] > [% ELSE %] >- Basket group no. [% basketgroup.id | html %] >+ <span>Basket group no. [% basketgroup.id | html %]</span> > [% END %] > </td> > <td>[% basketgroup.id | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index 7a35a24842..6370fd09f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -142,7 +142,7 @@ > [% IF basket.basketgroup %] > [% basketgroup = basket.basketgroup %] > [% IF basketgroup.closed %] >- [% basketgroup.name | html %] (closed) >+ [% basketgroup.name | html %] <span>(closed)</span> > [% ELSE %] > <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basket.booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]">[% basketgroup.name | html %]</a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >index 30fdf74cac..5fe95f1132 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >@@ -97,11 +97,11 @@ Acquisitions › Koha > </td> > <td> > [% SWITCH order.orderstatus %] >- [% CASE 'new' %]New >- [% CASE 'ordered' %]Ordered >- [% CASE 'partial' %]Partially received >- [% CASE 'complete' %]Received >- [% CASE 'cancelled' %]Cancelled >+ [% CASE 'new' %]<span>New</span> >+ [% CASE 'ordered' %]<span>Ordered</span> >+ [% CASE 'partial' %]<span>Partially received</span> >+ [% CASE 'complete' %]<span>Received</span> >+ [% CASE 'cancelled' %]<span>Cancelled</span> > [% END %] > </td> > <td>[% order.basketname | html %] (<a href="basket.pl?basketno=[% order.basketno | uri %]">[% order.basketno | html %]</a>)</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 4bb0e1bb7c..37b557cc40 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -89,11 +89,11 @@ > </td> > <td> > [% SWITCH order.orderstatus %] >- [% CASE 'new' %]New >- [% CASE 'ordered' %]Ordered >- [% CASE 'partial' %]Partially received >- [% CASE 'complete' %]Received >- [% CASE 'cancelled' %]Cancelled >+ [% CASE 'new' %]<span>New</span> >+ [% CASE 'ordered' %]<span>Ordered</span> >+ [% CASE 'partial' %]<span>Partially received</span> >+ [% CASE 'complete' %]<span>Received</span> >+ [% CASE 'cancelled' %]<span>Cancelled</span> > [% END %] > [% IF order.is_standing %](standing order)[% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index ce0a059b87..742926c34b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -226,7 +226,7 @@ > [% IF budget.b_active %] > [% budget.b_txt | html %] > [% ELSE %] >- [% budget.b_txt | html %] (inactive) >+ [% budget.b_txt | html %] <span>(inactive)</span> > [% END %] > </option> > [% END %] >@@ -381,7 +381,7 @@ > <td><p>[% order.branchcode | html %]</p></td> > <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td> > <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td> >- <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %]</td> >+ <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] <span>(Uncertain)</span> [% END %]</td> > <td class="number">[% order.quantity | html %]</td> > <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td> > <td class="number tax_included">[% order.total_tax_included | $Price %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 0f84cb4384..648a170c51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -148,19 +148,19 @@ > [%# FIXME We should only see/display Complete here, right? %] > [% CASE 'new' %] > <td data-order="status_1"> >- New >+ <span>New</span> > [% CASE 'ordered' %] > <td data-order="status_2"> >- Ordered >+ <span>Ordered</span> > [% CASE 'partial' %] > <td data-order="status_3"> >- Partial >+ <span>Partial</span> > [% CASE 'complete' %] > <td data-order="status_4"> >- Complete >+ <span>Complete</span> > [% CASE 'cancelled' %] > <td data-order="status_5"> >- Cancelled >+ <span>Cancelled</span> > [% END %] > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 02ef881c06..2b3f4c1499 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -66,9 +66,9 @@ > [% END %] > <h1> > [% IF ( invoiceclosedate ) %] >- Receipt summary for <em>[% name | html %]</em> [% IF ( invoice ) %] <em> [ [% invoice | html %] ] </em>[% END %] >+ <span>Receipt summary for <em>[% name | html %]</em><span> [% IF ( invoice ) %] <em> [ [% invoice | html %] ] </em>[% END %] > [% ELSE %] >- Receive orders from [% name | html %] >+ <span>Receive orders from [% name | html %]</span> > [% END %] > </h1> > >@@ -85,7 +85,7 @@ > > [% IF (error_cancelling_receipt) %] > <div class="dialog alert"> >- Cannot cancel receipt. Possible reasons : >+ <span>Cannot cancel receipt. Possible reasons :</span> > <ul> > <li> > The order line you are trying to cancel was created from a partial receipt >@@ -135,7 +135,7 @@ > </div> > [% ELSE %] > <p> >- Invoice is closed, so you can't receive orders anymore. >+ <span>Invoice is closed, so you can't receive orders anymore.</span> > [% IF CAN_user_acquisition_reopen_closed_invoices %] > <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid | uri %]&referer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]">Reopen it</a>. > [% END %] >@@ -269,17 +269,17 @@ > [% IF loop_receive.cannot_cancel or ( order.basket.effective_create_items == "receiving" and loop_receive.holds > 0 ) %] > [% IF loop_receive.cannot_cancel %] > [% span_title = BLOCK %] >- Cannot cancel receipt of this order line because it >+ <span>Cannot cancel receipt of this order line because it > was created from a partial receipt of order line no. > [% order.parent_ordernumber | html %], which is > already received. Try cancelling this one first and >- retry. >+ retry.</span> > [% END %] > [% ELSE %] > [%# FIXME Here we block the cancellation if holds exist. Actually it could be possible if items will be exist after the deletion %] > [%# Some additional checks should be added in the pl file %] > [% span_title = BLOCK %] >- Cannot cancel receipt of this order line because at least one reservation exists on the records. >+ <span>Cannot cancel receipt of this order line because at least one reservation exists on the records.</span> > [% END %] > [% END %] > <span title="[% span_title | collapse | html %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index 1560479772..bb75fa5b6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -356,11 +356,11 @@ > > [% IF close_form %] > [% IF budget_periods.size == 0 %] >- You cannot move funds of this budget, there is no active budget. >- Please create a new active budget and retry. >+ <span>You cannot move funds of this budget, there is no active budget. >+ Please create a new active budget and retry.</span> > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> > [% ELSIF number_of_unreceived_orders == 0 %] >- There are no unreceived orders for this budget. >+ <span>There are no unreceived orders for this budget.</span> > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> > [% ELSE %] > <h3>The unreceived orders from the following funds will be moved</h3> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index c59f878a0e..e2ccd1a83e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -274,31 +274,31 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this authorized value. Perhaps the value already exists. >+ <span>An error occurred when updating this authorized value. Perhaps the value already exists.</span> > [% CASE 'error_on_insert' %] >- An error occurred when inserting this authorized value. Perhaps the value or the category already exists. >+ <span>An error occurred when inserting this authorized value. Perhaps the value or the category already exists.</span> > [% CASE 'error_on_insert_cat' %] >- An error occurred when inserting this authorized value category. Perhaps the category name already exists. >+ <span>An error occurred when inserting this authorized value category. Perhaps the category name already exists.</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this authorized value. Check the logs. >+ <span>An error occurred when deleting this authorized value. Check the logs.</span> > [% CASE 'error_on_delete_category' %] >- An error occurred when deleting this authorized value category. Check the logs. >+ <span>An error occurred when deleting this authorized value category. Check the logs.</span> > [% CASE 'success_on_update' %] >- Authorized value updated successfully. >+ <span>Authorized value updated successfully.</span> > [% CASE 'success_on_insert' %] >- Authorized value added successfully. >+ <span>Authorized value added successfully.</span> > [% CASE 'success_on_insert_cat' %] >- Authorized value category added successfully. >+ <span>Authorized value category added successfully.</span> > [% CASE 'success_on_delete' %] >- Authorized value deleted successfully. >+ <span>Authorized value deleted successfully.</span> > [% CASE 'success_on_delete_category' %] >- Authorized value category deleted successfully. >+ <span>Authorized value category deleted successfully.</span> > [% CASE 'cat_already_exists' %] >- This authorized value category already exists. >+ <span>This authorized value category already exists.</span> > [% CASE 'invalid_category_name' %] >- The authorized value category 'branches', 'itemtypes' and 'cn_source' are used internally by Koha and are not valid. >+ <span>The authorized value category 'branches', 'itemtypes' and 'cn_source' are used internally by Koha and are not valid.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END # /FOR m IN messages %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index c34c004cf9..d6bde4457f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -69,17 +69,17 @@ Authority types › Administration › Koha > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this authority type. Perhaps it already exists. >+ <span>An error occurred when updating this authority type. Perhaps it already exists.</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this authority type. The authority type code might already exist. >+ <span>An error occurred when adding this authority type. The authority type code might already exist.</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this authority type. Check the logs. >+ <span>An error occurred when deleting this authority type. Check the logs.</span> > [% CASE 'success_on_update' %] >- Authority type updated successfully. >+ <span>Authority type updated successfully.</span> > [% CASE 'success_on_insert' %] >- Authority type added successfully. >+ <span>Authority type added successfully.</span> > [% CASE 'success_on_delete' %] >- Authority type deleted successfully. >+ <span>Authority type deleted successfully.</span> > [% CASE %] > [% m.code | html %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >index 861325d7ac..baea27077c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >@@ -6,17 +6,17 @@ > [% BLOCK show_job_status %] > [% SWITCH job.status %] > [% CASE "new" %] >- New >+ <span>New</span> > [% CASE "cancelled" %] >- Cancelled >+ <span>Cancelled</span> > [% CASE "finished" %] >- Finished >+ <span>Finished</span> > [% CASE "started" %] >- Started >+ <span>Started</span> > [% CASE "running" %] >- Running >+ <span>Running</span> > [% CASE "failed" %] >- Failed >+ <span>Failed</span> > [% CASE # Default case %] > [% job.status | html %] > [% END -%] >@@ -24,20 +24,20 @@ > [% BLOCK show_job_type %] > [% SWITCH job_type %] > [% CASE 'batch_biblio_record_modification' %] >- Batch bibliographic record modification >+ <span>Batch bibliographic record modification</span> > [% CASE 'batch_biblio_record_deletion' %] >- Batch bibliographic record record deletion >+ <span>Batch bibliographic record record deletion</span> > [% CASE 'batch_authority_record_modification' %] >- Batch authority record modification >+ <span>Batch authority record modification</span> > [% CASE 'batch_authority_record_deletion' %] >- Batch authority record deletion >+ <span>Batch authority record deletion</span> > [% CASE 'batch_item_record_modification' %] >- Batch item record modification >+ <span>Batch item record modification</span> > [% CASE 'batch_item_record_deletion' %] >- Batch item record deletion >+ <span>Batch item record deletion</span> > [% CASE "batch_hold_cancel" %] >- Batch hold cancellation >- [% CASE %]Unknown job type '[% job_type | html %]' >+ <span>Batch hold cancellation</span> >+ [% CASE %]<span>Unknown job type '[% job_type | html %]'</span> > [% END %] > > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index ce45d1260f..40f6a2e2dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -75,21 +75,21 @@ MARC frameworks › Administration › Koha > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this framework. Perhaps it already exists. >+ <span>An error occurred when updating this framework. Perhaps it already exists.</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this framework. The framework might already exist. >+ <span>An error occurred when adding this framework. The framework might already exist.</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this framework. Check the logs. >+ <span>An error occurred when deleting this framework. Check the logs.</span> > [% CASE 'success_on_update' %] >- Framework updated successfully. >+ <span>Framework updated successfully.</span> > [% CASE 'success_on_insert' %] >- Framework added successfully. >+ <span>Framework added successfully.</span> > [% CASE 'success_on_delete' %] >- Framework deleted successfully. >+ <span>Framework deleted successfully.</span> > [% CASE 'already_exists' %] >- This framework code already exists. >+ <span>This framework code already exists.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 7f5db486e4..780a6cdece 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -77,42 +77,42 @@ Libraries › Administration › Koha > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this library. Perhaps it already exists. >+ <span>An error occurred when updating this library. Perhaps it already exists.</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this library. The branchcode might already exist. >+ <span>An error occurred when adding this library. The branchcode might already exist.</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this library. Check the logs. >+ <span>An error occurred when deleting this library. Check the logs.</span> > [% CASE 'success_on_update' %] >- Library updated successfully. >+ <span>Library updated successfully.</span> > [% CASE 'success_on_insert' %] >- Library added successfully. >+ <span>Library added successfully.</span> > [% CASE 'success_on_delete' %] >- Library deleted successfully. >+ <span>Library deleted successfully.</span> > [% CASE 'cannot_delete_library' %] >- This library cannot be deleted. Patrons or items are still using it >+ <span>This library cannot be deleted. Patrons or items are still using it</span> > [% IF m.data.patrons_count and m.data.items_count %] >- ([% m.data.patrons_count | html %] patrons and [% m.data.items_count | html %] items). >+ <span>([% m.data.patrons_count | html %] patrons and [% m.data.items_count | html %] items).</span> > [% ELSIF m.data.patrons_count %] >- ([% m.data.patrons_count | html %] patrons). >+ <span>([% m.data.patrons_count | html %] patrons).</span> > [% ELSIF m.data.items_count %] >- ([% m.data.items_count | html %] items). >+ <span>([% m.data.items_count | html %] items).</span> > [% END %] > [% CASE 'error_on_update_category' %] >- An error occurred when updating this library category. Perhaps it already exists. >+ <span>An error occurred when updating this library category. Perhaps it already exists.</span> > [% CASE 'error_on_insert_category' %] >- An error occurred when adding this library category. The categorycode might already exist. >+ <span>An error occurred when adding this library category. The categorycode might already exist.</span> > [% CASE 'error_on_delete_category' %] >- An error occurred when deleting this library category. Check the logs. >+ <span>An error occurred when deleting this library category. Check the logs.</span> > [% CASE 'success_on_update_category' %] >- Library category updated successfully. >+ <span>Library category updated successfully.</span> > [% CASE 'success_on_insert_category' %] >- Library category added successfully. >+ <span>Library category added successfully.</span> > [% CASE 'success_on_delete_category' %] >- Library category deleted successfully. >+ <span>Library category deleted successfully.</span> > [% CASE 'cannot_delete_category' %] >- This library category cannot be deleted. [% m.data.libraries_count | html %] libraries are still using it. >+ <span>This library category cannot be deleted. [% m.data.libraries_count | html %] libraries are still using it.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >index 1a39afd51e..e44dca1e3e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >@@ -76,23 +76,23 @@ Cash registers › Administration › Koha > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'success_on_insert' %] >- Cash register added successfully. >+ <span>Cash register added successfully.</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this cash register. >+ <span>An error occurred when adding this cash register.</span> > [% CASE 'success_on_update' %] >- Cash register updated successfully. >+ <span>Cash register updated successfully.</span> > [% CASE 'error_on_update' %] >- An error occurred when updating this cash register. >+ <span>An error occurred when updating this cash register.</span> > [% CASE 'success_on_default' %] >- Library default updated successfully. >+ <span>Library default updated successfully.</span> > [% CASE 'error_on_update' %] >- An error on setting library default. >+ <span>An error on setting library default.</span> > [% CASE 'success_on_archive' %] >- Cash register archived successfully. >+ <span>Cash register archived successfully.</span> > [% CASE 'success_on_restore' %] >- Cash register restored successfully. >+ <span>Cash register restored successfully.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index a5e5b8e85f..d38b1f993c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -95,21 +95,21 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this patron category. Perhaps it already exists. >+ <span>An error occurred when updating this patron category. Perhaps it already exists.</span> > [% CASE 'error_on_insert' %] >- An error occurred when inserting this patron category. The patron category might already exist. >+ <span>An error occurred when inserting this patron category. The patron category might already exist.</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this patron category. Check the logs. >+ <span>An error occurred when deleting this patron category. Check the logs.</span> > [% CASE 'success_on_update' %] >- Patron category updated successfully. >+ <span>Patron category updated successfully.</span> > [% CASE 'success_on_insert' %] >- Patron category inserted successfully. >+ <span>Patron category inserted successfully.</span> > [% CASE 'success_on_delete' %] >- Patron category deleted successfully. >+ <span>Patron category deleted successfully.</span> > [% CASE 'already_exists' %] >- This patron category already exists. >+ <span>This patron category already exists.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -462,11 +462,11 @@ > <td> > [% SWITCH category.checkprevcheckout %] > [% CASE 'yes' %] >- Yes >+ <span>Yes</span> > [% CASE 'no' %] >- No >+ <span>No</span> > [% CASE 'inherit' %] >- Inherit >+ <span>Inherit</span> > [% END %] > </td> > </tr> >@@ -476,11 +476,11 @@ > <td> > [% SWITCH category.default_privacy %] > [% CASE 'default' %] >- Default >+ <span>Default</span> > [% CASE 'never' %] >- Never >+ <span>Never</span> > [% CASE 'forever' %] >- Forever >+ <span>Forever</span> > [% END %] > </td> > </tr> >@@ -544,12 +544,12 @@ > </td> > <td> > [% SWITCH category.category_type %] >- [% CASE 'A' %]Adult >- [% CASE 'C' %]Child >- [% CASE 'P' %]Prof. >- [% CASE 'I' %]Org. >- [% CASE 'S' %]Staff >- [% CASE 'X' %]Statistical >+ [% CASE 'A' %]<span>Adult</span> >+ [% CASE 'C' %]<span>Child</span> >+ [% CASE 'P' %]<span>Prof.</span> >+ [% CASE 'I' %]<span>Org.</span> >+ [% CASE 'S' %]<span>Staff</span> >+ [% CASE 'X' %]<span>Statistical</span> > [% END %] > </td> > <td> >@@ -589,19 +589,19 @@ > [% NEXT IF !Koha.Preference( 'ILLModule' ) && prefs.message_name.match('^Ill_') %] > [% FOREACH transport IN prefs.transports %] > [% IF ( transport.transport ) %] >- [% IF ( prefs.Item_Due ) %]Item due >- [% ELSIF ( prefs.Advance_Notice ) %]Advance notice >- [% ELSIF ( prefs.Hold_Filled ) %]Hold filled >- [% ELSIF ( prefs.Item_Check_in ) %]Item check-in >- [% ELSIF ( prefs.Item_Checkout ) %]Item checkout >- [% ELSIF ( prefs.Ill_ready ) %]Interlibrary loan ready >- [% ELSIF ( prefs.Ill_unavailable ) %]Interlibrary loan unavailable >- [% ELSIF ( prefs.Auto_Renewals ) %]Auto renewal >- [% ELSIF ( prefs.Hold_Reminder ) %]Hold reminder >- [% ELSE %]Unknown >+ [% IF ( prefs.Item_Due ) %]<span>Item due</span> >+ [% ELSIF ( prefs.Advance_Notice ) %]<span>Advance notice</span> >+ [% ELSIF ( prefs.Hold_Filled ) %]<span>Hold filled</span> >+ [% ELSIF ( prefs.Item_Check_in ) %]<span>Item check-in</span> >+ [% ELSIF ( prefs.Item_Checkout ) %]<span>Item checkout</span> >+ [% ELSIF ( prefs.Ill_ready ) %]<span>Interlibrary loan ready</span> >+ [% ELSIF ( prefs.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span> >+ [% ELSIF ( prefs.Auto_Renewals ) %]<span>Auto renewal</span> >+ [% ELSIF ( prefs.Hold_Reminder ) %]<span>Hold reminder</span> >+ [% ELSE %]<span>Unknown</span> > [% END %]: > <strong>[% transport.transport | html %]</strong><br /> >- [% ELSE %]None<br />[% END %] >+ [% ELSE %]<span>None</span><br />[% END %] > [% END %] > [% END %] > [% ELSE %] >@@ -634,29 +634,29 @@ > <td> > [% SWITCH category.checkprevcheckout %] > [% CASE 'yes' %] >- Yes >+ <span>Yes</span> > [% CASE 'no' %] >- No >+ <span>No</span> > [% CASE 'inherit' %] >- Inherit >+ <span>Inherit</span> > [% END %] > </td> > [% END %] > <td> > [% SWITCH category.default_privacy %] > [% CASE 'default' %] >- Default >+ <span>Default</span> > [% CASE 'never' %] >- Never >+ <span>Never</span> > [% CASE 'forever' %] >- Forever >+ <span>Forever</span> > [% END %] > </td> > <td> > [% IF category.exclude_from_local_holds_priority %] >- Yes >+ <span>Yes</span> > [% ELSE %] >- No >+ <span>No</span> > [% END %] > </td> > <td class="actions"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 2138aac124..f31d1fdade 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -74,21 +74,21 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this city. Perhaps it already exists. >+ <span>An error occurred when updating this city. Perhaps it already exists.</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this city. The city id might already exist. >+ <span>An error occurred when adding this city. The city id might already exist.</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this city. Check the logs. >+ <span>An error occurred when deleting this city. Check the logs.</span> > [% CASE 'success_on_update' %] >- City updated successfully. >+ <span>City updated successfully.</span> > [% CASE 'success_on_insert' %] >- City added successfully. >+ <span>City added successfully.</span> > [% CASE 'success_on_delete' %] >- City deleted successfully. >+ <span>City deleted successfully.</span> > [% CASE 'already_exists' %] >- This city already exists. >+ <span>This city already exists.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index 399dacdb8a..0e21c3a0b6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -107,43 +107,43 @@ Classification sources › Administration › Koha > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update_source' %] >- An error occurred when updating this classification source. >+ <span>An error occurred when updating this classification source.</span> > [% CASE 'success_on_update_source' %] >- Classification source updated successfully. >+ <span>Classification source updated successfully.</span> > [% CASE 'error_on_insert_source' %] >- An error occurred when adding this classification source. Perhaps the code already exists? >+ <span>An error occurred when adding this classification source. Perhaps the code already exists?</span> > [% CASE 'success_on_insert_source' %] >- Classification source added successfully. >+ <span>Classification source added successfully.</span> > [% CASE 'error_on_delete_source' %] >- An error occurred when deleting this classification source. >+ <span>An error occurred when deleting this classification source.</span> > [% CASE 'success_on_delete_source' %] >- Classification source deleted successfully. >+ <span>Classification source deleted successfully.</span> > [% CASE 'error_on_update_sort_rule' %] >- An error occurred when updating this filing rule. >+ <span>An error occurred when updating this filing rule.</span> > [% CASE 'success_on_update_sort_rule' %] >- Filing rule updated successfully. >+ <span>Filing rule updated successfully.</span> > [% CASE 'error_on_insert_sort_rule' %] >- An error occurred when adding this filing rule. Perhaps the code already exists? >+ <span>An error occurred when adding this filing rule. Perhaps the code already exists?</span> > [% CASE 'success_on_insert_sort_rule' %] >- Filing rule added successfully. >+ <span>Filing rule added successfully.</span> > [% CASE 'error_on_delete_sort_rule' %] >- An error occurred when deleting this filing rule. Perhaps it is used by at least one classification source? >+ <span>An error occurred when deleting this filing rule. Perhaps it is used by at least one classification source?</span> > [% CASE 'success_on_delete_sort_rule' %] >- Filing rule deleted successfully. >+ <span>Filing rule deleted successfully.</span> > [% CASE 'error_on_update_split_rule' %] >- An error occurred when updating this splitting rule. >+ <span>An error occurred when updating this splitting rule.</span> > [% CASE 'success_on_update_split_rule' %] >- Splitting rule updated successfully. >+ <span>Splitting rule updated successfully.</span> > [% CASE 'error_on_insert_split_rule' %] >- An error occurred when adding this splitting rule. Perhaps the code already exists? >+ <span>An error occurred when adding this splitting rule. Perhaps the code already exists?</span> > [% CASE 'success_on_insert_split_rule' %] >- Splitting rule added successfully. >+ <span>Splitting rule added successfully.</span> > [% CASE 'error_on_delete_split_rule' %] >- An error occurred when deleting this splitting rule. Perhaps it is used by at least one classification source? >+ <span>An error occurred when deleting this splitting rule. Perhaps it is used by at least one classification source?</span> > [% CASE 'success_on_delete_split_rule' %] >- Splitting rule deleted successfully. >+ <span>Splitting rule deleted successfully.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >index d1d37a5e17..3c2555ba2f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >@@ -64,15 +64,15 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'success_on_saving' %] >- Credit type saved successfully. >+ <span>Credit type saved successfully</span> > [% CASE 'error_on_saving' %] >- An error occurred when saving this credit type. >+ <span>An error occurred when saving this credit type</span> > [% CASE 'success_on_archive' %] >- Credit type archived successfully. >+ <span>Credit type archived successfully</span> > [% CASE 'success_on_restore' %] >- Credit type restored successfully. >+ <span>Credit type restored successfully</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -127,7 +127,7 @@ > <li> > <label for="branches">Libraries limitation: </label> > [% IF credit_type && credit_type.is_system %] >- No library limitation >+ <span>No library limitation</span> > [% ELSE %] > <select id="branches" name="branches" multiple size="10"> > <option value="">All libraries</option> >@@ -193,7 +193,7 @@ > [% limits_count = credit_type.library_limits.count %] > [% tnx('{count} library limitation', '{count} library limitations', limits_count, { count => limits_count }) %] > [% ELSE %] >- No limitation >+ <span>No library limitation</span> > [% END %] > </td> > <td class="actions"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index cc9fce0a83..d4faa3f64d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -72,19 +72,19 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this currency. Perhaps it already exists. >+ <span>An error occurred when updating this currency. Perhaps it already exists</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this currency. The currency code might already exist. >+ <span>An error occurred when adding this currency. The currency code might already exist</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this currency. Check the logs. >+ <span>An error occurred when deleting this currency. Check the logs</span> > [% CASE 'success_on_update' %] >- Currency updated successfully. >+ <span>Currency updated successfully</span> > [% CASE 'success_on_insert' %] >- Currency added successfully. >+ <span>Currency added successfully</span> > [% CASE 'success_on_delete' %] >- Currency deleted successfully. >+ <span>Currency deleted successfully</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -98,9 +98,9 @@ > <fieldset class="rows"> > <legend> > [% IF currency %] >- Modify currency >+ <span>Modify currency</span> > [% ELSE %] >- New currency >+ <span>New currency</span> > [% END %] > </legend> > <ol> >@@ -163,11 +163,11 @@ > <h3>Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]</h3> > <p> > [% IF nb_of_orders %] >- This currency is used by [% nb_of_orders | html %] orders. >+ <span>This currency is used by [% nb_of_orders | html %] orders.</span> > [% ELSIF nb_of_vendors %] >- This currency is used by [% nb_of_vendors | html %] vendors. >+ <span>This currency is used by [% nb_of_vendors | html %] vendors.</span> > [% END %] >- Deletion not possible >+ <span>Deletion not possible</span> > </p> > <form action="/cgi-bin/koha/admin/currency.pl" method="post"> > <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button> >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 98f6dc3ef1..20a08df5d8 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 >@@ -62,15 +62,15 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'success_on_saving' %] >- Debit type saved successfully. >+ <span>Debit type saved successfully</span> > [% CASE 'error_on_saving' %] >- An error occurred when saving this debit type. >+ <span>An error occurred when saving this debit type</span> > [% CASE 'success_on_archive' %] >- Debit type archived successfully. >+ <span>Debit type archived successfully</span> > [% CASE 'success_on_restore' %] >- Debit type restored successfully. >+ <span>Debit type restored successfully</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >index a1cb6437be..0e302c4ff7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >@@ -74,21 +74,21 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this desk. Perhaps it already exists. >+ <span>An error occurred when updating this desk. Perhaps it already exists</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this desk. The desk ID might already exist. >+ <span>An error occurred when adding this desk. The desk ID might already exist</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this desk. Check the logs. >+ <span>An error occurred when deleting this desk. Check the logs</span> > [% CASE 'success_on_update' %] >- Desk updated successfully. >+ <span>Desk updated successfully</span> > [% CASE 'success_on_insert' %] >- Desk added successfully. >+ <span>Desk added successfully</span> > [% CASE 'success_on_delete' %] >- Desk deleted successfully. >+ <span>Desk deleted successfully</span> > [% CASE 'already_exists' %] >- This desk already exists. >+ <span>This desk already exists</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >index 4b6a7ffbaf..2d81110399 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >@@ -11,12 +11,11 @@ > <div class="plugindesc"> > [% SWITCH plugin.name %] > [% CASE 'AuthorityFile' %] >- Suggest authorities which are relevant to the term the user searched for. >+ <span>Suggest authorities which are relevant to the term the user searched for.</span> > [% CASE 'ExplodedTerms' %] >- Suggest that patrons expand their searches to include >- broader/narrower/related terms. >+ <span>Suggest that patrons expand their searches to include broader/narrower/related terms.</span> > [% CASE 'LibrisSpellcheck' %] >- Use the LIBRIS spellcheck API. >+ <span>Use the LIBRIS spellcheck API.</span> > [% END %] > </div> > </div> >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 d395f946b7..cb3216ab1e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -131,23 +131,23 @@ Item types › Administration › Koha > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this item type. Perhaps the value already exists. >+ <span>An error occurred when updating this item type. Perhaps the value already exists</span> > [% CASE 'error_on_insert' %] >- An error occurred when inserting this item type. Perhaps the value already exists. >+ <span>An error occurred when inserting this item type. Perhaps the value already exists</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this item type. Check the logs. >+ <span>An error occurred when deleting this item type. Check the logs</span> > [% CASE 'success_on_update' %] >- Item type updated successfully. >+ <span>Item type updated successfully</span> > [% CASE 'success_on_insert' %] >- Item type inserted successfully. >+ <span>Item type inserted successfully</span> > [% CASE 'success_on_delete' %] >- Item type deleted successfully. >+ <span>Item type deleted successfully</span> > [% CASE 'already_exists' %] >- This item type already exists. >+ <span>This item type already exists</span> > [% CASE 'cannot_be_deleted' %] >- Cannot delete this item type. <p><strong>This record is in use</strong>. Deletion is not possible.</p> >+ <span>Cannot delete this item type. <p><strong>This record is in use</strong>. Deletion is not possible.</p></span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -222,9 +222,9 @@ Item types › Administration › Koha > </select> > <div class="hint"> > [% IF ( CAN_user_parameters_manage_auth_values ) %] >- Options are defined by the authorized value <a target="_blank" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=ITEMTYPECAT">ITEMTYPECAT</a>. >+ <span>Options are defined by the authorized value <a target="_blank" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=ITEMTYPECAT">ITEMTYPECAT</a>.</span> > [% ELSE %] >- Options are defined by the authorized value ITEMTYPECAT. >+ <span>Options are defined by the authorized value ITEMTYPECAT.</span> > [% END %] > </div> > </li> >@@ -498,13 +498,13 @@ Item types › Administration › Koha > <td> > [% IF itemtype.parent_type %] > [% IF itemtype.parent.translated_descriptions.size %] >- [% itemtype.parent.description | html %] (default)<br/> >+ [% itemtype.parent.description | html %] <span>(default)</span><br/> > [% ELSE %] > [% itemtype.parent.description | html %] > [% END %] > </br> > [% IF itemtype.translated_descriptions.size %] >- [% itemtype.description | html %] (default)<br/> >+ [% itemtype.description | html %] <span>(default)</span><br/> > [% FOR description IN itemtype.translated_descriptions %] > [% IF description.translation == itemtype.translated_description %] > -- <strong>[% description.translation | html %]</strong> >@@ -518,7 +518,7 @@ Item types › Administration › Koha > [% END %] > [% ELSE %] > [% IF itemtype.translated_descriptions.size %] >- [% itemtype.description | html %] (default)<br/> >+ [% itemtype.description | html %] <span>(default)</span><br/> > [% FOR description IN itemtype.translated_descriptions %] > [% IF description.translation == itemtype.translated_description %] > <strong>[% description.translation | html %]</strong> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >index 94e1ec0af4..50622ac4b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >@@ -30,9 +30,9 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_insert' %] >- An error occurred when adding this library. The library id might already exist in this group. >+ <span>An error occurred when adding this library. The library id might already exist in this group.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -40,17 +40,17 @@ > [% IF added %] > <div class="dialog message group-added"> > [% IF added.branchcode %] >- [% added.library.branchname | html | $KohaSpan class = 'name' %] added to group. >+ <span>[% added.library.branchname | html | $KohaSpan class = 'name' %] added to group.</span> > [% ELSE %] >- Group [% added.title | html | $KohaSpan class = 'name' %] created. >+ <span>Group [% added.title | html | $KohaSpan class = 'name' %] created.</span> > [% END %] > </div> > [% ELSIF deleted %] > <div class="dialog message group-deleted"> > [% IF deleted.title %] >- Group [% deleted.title | html | $KohaSpan class = 'name' %] has been deleted. >+ <span>Group [% deleted.title | html | $KohaSpan class = 'name' %] has been deleted.</span> > [% ELSE %] >- [% deleted.library | html | $KohaSpan class = 'name' %] has been removed from group. >+ <span>[% deleted.library | html | $KohaSpan class = 'name' %] has been removed from group.</span> > [% END %] > </div> > [% ELSIF error_duplicate_title %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >index 433cb512d2..348686ddad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >@@ -44,11 +44,11 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'invalid_tag_regexp' %] >- Invalid regular expression "[% m.tag | html %]". >+ <span>Invalid regular expression "[% m.tag | html %]".</span> > [% CASE 'invalid_control_field_actions' %] >- Invalid combination of actions for tag [% m.tag | html %]. Control field rules do not allow "Appended: Append" and "Removed: Skip". >+ <span>Invalid combination of actions for tag [% m.tag | html %]. Control field rules do not allow "Appended: Append" and "Removed: Skip".</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% 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 881adf1a3e..e4c485ceec 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 >@@ -55,8 +55,8 @@ > [% IF ( frameworkcode ) %] > [% frameworkcode | html %] > [% ELSE %] >- Default >- [% END %] framework structure >+ <span>Default</span> >+ [% END %] <span>framework structure</span> > </a> > </li> > >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 88b58d9446..661c645a17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -43,7 +43,7 @@ MARC frameworks › Administration › Koha > [% IF framework %] > [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) > [% ELSE %] >- Default MARC framework >+ <span>Default MARC framework</span> > [% END%] > </a> > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >index 06983048ec..2d342dd0ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >@@ -18,13 +18,13 @@ > > [% BLOCK norms_text %] > [% SWITCH norm %] >- [% CASE 'none' %]None >- [% CASE 'remove_spaces' %]Remove spaces >- [% CASE 'upper_case' %]Uppercase >- [% CASE 'lower_case' %]Lowercase >- [% CASE 'legacy_default' %]Legacy default >- [% CASE 'ISBN' %]ISBN >- [% CASE %][% norm | html %] >+ [% CASE 'none' ]<span>None</span> >+ [% CASE 'remove_spaces' ]<span>Remove spaces</span> >+ [% CASE 'upper_case' ]<span>Uppercase</span> >+ [% CASE 'lower_case' ]<span>Lowercase</span> >+ [% CASE 'legacy_default' ]<span>Legacy default</span> >+ [% CASE 'ISBN' ]<span>ISBN</span> >+ [% CASE ]<span>[% norm | html %]</span> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index c9def9f39c..1b2c479d14 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -186,8 +186,8 @@ > [% FOR w IN LINE.WARNINGS %] > <div class="dialog alert"> > [% SWITCH w %] >- [% CASE "bcrypt_config_not_set" %]Pseudonymization must only be turned on if the 'bcrypt_settings' configuration entry exists and is correctly filled in the Koha configuration file. >- [% CASE %]Unknown warning "[% w | html %]" >+ [% CASE "bcrypt_config_not_set" %]<span>Pseudonymization must only be turned on if the 'bcrypt_settings' configuration entry exists and is correctly filled in the Koha configuration file.</span> >+ [% CASE %]<span>Unknown warning "[% w | html %]"</span> > [% END %] > </div> > [% END %] >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 cb0eef2ca7..43c688a216 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 >@@ -64,15 +64,15 @@ > <div class="dialog [% m.type | html %]" id="smtp_action_result_dialog"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred trying to open the server for editing. The passed id is invalid. >+ <span>An error occurred trying to open the server for editing. The passed id is invalid.</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding the server. The library already has an SMTP server set. >+ <span>An error occurred when adding the server. The library already has an SMTP server set.</span> > [% CASE 'success_on_update' %] >- Server updated successfully. >+ <span>Server updated successfully.</span> > [% CASE 'success_on_insert' %] >- Server added successfully. >+ <span>Server added successfully.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >index 2e02b03eb0..6d84ea4d51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >@@ -39,21 +39,21 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this patron category. Perhaps it already exists. >+ <span>An error occurred when updating this patron category. Perhaps it already exists</span> > [% CASE 'error_on_insert' %] >- An error occurred when inserting this patron category. The patron category might already exist. >+ <span>An error occurred when inserting this patron category. The patron category might already exist</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this patron category. Check the logs. >+ <span>An error occurred when deleting this patron category. Check the logs</span> > [% CASE 'success_on_update' %] >- Patron category updated successfully. >+ <span>Patron category updated successfully</span> > [% CASE 'success_on_insert' %] >- Patron category inserted successfully. >+ <span>Patron category inserted successfully</span> > [% CASE 'success_on_delete' %] >- Patron category deleted successfully. >+ <span>Patron category deleted successfully</span> > [% CASE 'already_exists' %] >- This patron category already exists. >+ <span>This patron category already exists</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -181,7 +181,7 @@ > [% IF UsageStatsLastUpdateTime %] > [% UsageStatsLastUpdateTime | html %] > [% ELSE %] >- Your data have never been shared >+ <span>Your data have never been shared</span> > [% END %] > </li> > <li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 585e6bc86b..dd6206780f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -5,9 +5,9 @@ > > [% BLOCK ServerType %] > [% IF (server.servertype||type) == 'sru' %] >- SRU >+ <span>SRU</span> > [% ELSIF (server.servertype||type) == 'zed' %] >- Z39.50 >+ </span>Z39.50</span> > [% END %] > [% END %] > >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 4063f09858..0282cc3176 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -827,11 +827,11 @@ Note that permanent location is a code, and location may be an authval. > <td data-order="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates%]</td> > <td> > [% SWITCH order.orderstatus %] >- [% CASE 'new' %]New >- [% CASE 'ordered' %]Ordered >- [% CASE 'partial' %]Partial >- [% CASE 'complete' %]Complete >- [% CASE 'cancelled' %]Cancelled >+ [% CASE 'new' ]<span>New</span> >+ [% CASE 'ordered' ]<span>Ordered</span> >+ [% CASE 'partial' ]<span>Partial</span> >+ [% CASE 'complete' ]<span>Complete</span> >+ [% CASE 'cancelled' ]<span>Cancelled</span> > [% END %] > </td> > <td>[% order.quantity | html %]</td> >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 d404da064d..fd1f2a7e18 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -514,7 +514,7 @@ > [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %] > [% IF ( holdforclub ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&club=[% holdforclub | uri %]">Place hold for [% holdforclub_name | html %]</a></span>[% END %] > [% ELSE %] >- Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %]) >+ <span>Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])</span> > [% END %] > [% END # /IF SEARCH_RESULT.norequests %] > [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %] >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 74f9bd7e86..a8657fb77f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -124,7 +124,7 @@ > [% IF ( resultsloo.publicationyear ) %] - [% resultsloo.publicationyear | html %][% END %] > [% IF ( resultsloo.publishercode ) %]- [% resultsloo.publishercode | html %][% END %] > [% IF ( resultsloo.copyrightdate ) %] - [% resultsloo.copyrightdate | html %][% END %] >- [% IF ( resultsloo.edition ) %]Edition: [% resultsloo.edition | html %][% END %] >+ [% IF ( resultsloo.edition ) %]<span>Edition: </span>[% resultsloo.edition | html %][% END %] > [% IF ( resultsloo.place ) %] ; [% resultsloo.place | html %][% END %] > [% IF ( resultsloo.pages ) %] - [% resultsloo.pages | html %][% END %] > [% IF ( resultsloo.item('size') ) %] ; [% resultsloo.item('size') | html %][% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index 2f3864f29d..537148c52a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -77,7 +77,7 @@ div#result { margin-top: 1em; } > <td> > [% record.biblionumber | html %] > [% IF loop.first %] >- (record kept) >+ <span>(record kept)</span> > [% END %] > </td> > [% FOREACH key IN report_header.keys.sort %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index af7c47b588..551615b10e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -126,7 +126,7 @@ > <td> > [% IF ( hold_info.barcodes.size ) %] > [% SET barcode = hold_info.barcodes.first %] >- [% IF ( hold_info.item ) %]Only [% barcode | html %][% ELSE %][% barcode | html %] or any available.[% END %] >+ [% IF ( hold_info.item ) %]<span>Only [% barcode | html %]</span>[% ELSE %]<span>[% barcode | html %] or any available.</span>[% END %] > [% END %] > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 3bb679fe9f..53081d2ab2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -117,7 +117,7 @@ > [% END %] > [% IF ( reserveloo.pendingorders ) %]<br><strong>[% reserveloo.pendingorders | html %] pending</strong>[% END %] > [% ELSE %] >- 0 to order >+ <span>0 to order</span> > [% END %] > </p> > </td> >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 86ab52b251..9075869be3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -125,16 +125,16 @@ > <h3>Reason for transfer</h3> > <p> > [%- SWITCH trigger -%] >- [%- CASE 'Manual' -%]Manual >- [%- CASE 'StockrotationAdvance' -%]Stock rotation advance >- [%- CASE 'StockrotationRepatriation' -%]Stock rotation repatriation >- [%- CASE 'ReturnToHome' -%]Return to home library >- [%- CASE 'ReturnToHolding' -%]Return to holding library >- [%- CASE 'RotatingCollection' -%]Rotating collection >- [%- CASE 'Reserve' -%]Reserve >- [%- CASE 'LostReserve' -%]Lost reserve >- [%- CASE 'CancelReserve' -%]Cancelled reserve >- [%- CASE 'TransferCancellation' -%]Transfer was cancelled whilst in transit >+ [%- CASE 'Manual' -]<span>Manual</span> >+ [%- CASE 'StockrotationAdvance' -]<span>Stock rotation advance</span> >+ [%- CASE 'StockrotationRepatriation' -]<span>Stock rotation repatriation</span> >+ [%- CASE 'ReturnToHome' -]<span>Return to home library</span> >+ [%- CASE 'ReturnToHolding' -]<span>Return to holding library</span> >+ [%- CASE 'RotatingCollection' -]<span>Rotating collection</span> >+ [%- CASE 'Reserve' -]<span>Reserve</span> >+ [%- CASE 'LostReserve' -]<span>Lost reserve</span> >+ [%- CASE 'CancelReserve' -]<span>Cancelled reserve</span> >+ [%- CASE 'TransferCancellation' -]<span>Transfer was cancelled whilst in transit</span> > [%- END -%] > </p> > </div> >@@ -1081,7 +1081,7 @@ > [% riloo.duedate | html %] > [% END %] > [% ELSE %] >- Not checked out >+ <span>Not checked out</span> > [% END %] > [% IF ( riloo.damaged ) %] > <span class="dmg">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => riloo.damaged ) | html %]</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index 70d3faf1f2..1d93ea2541 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -725,7 +725,7 @@ > [% INCLUDE $tpl log=log %] > [% END %] > [% ELSE %] >- There are no recorded logs for this request >+ <span>There are no recorded logs for this request</span> > [% END %] > </div> > <div class="modal-footer"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >index b1effad732..0c32ee24cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >@@ -2,11 +2,11 @@ > [% SET footerjs = 1 %] > [%- BLOCK translate_label_types -%] > [%- SWITCH type -%] >- [%- CASE 'BIB' -%] Only the bibliographic data is printed >- [%- CASE 'BARBIB'-%] Barcode proceeds bibliographic data >- [%- CASE 'BIBBAR'-%] Bibliographic data proceeds barcode >- [%- CASE 'ALT' -%] Barcode and bibliographic data are printed on alternating labels >- [%- CASE 'BAR' -%] Only the barcode is printed >+ [%- CASE 'BIB' -]<span> Only the bibliographic data is printed</span> >+ [%- CASE 'BARBIB'-]<span> Barcode proceeds bibliographic data</span> >+ [%- CASE 'BIBBAR'-]<span> Bibliographic data proceeds barcode</span> >+ [%- CASE 'ALT' -]<span> Barcode and bibliographic data are printed on alternating labels</span> >+ [%- CASE 'BAR' -]<span> Only the barcode is printed</span> > [%- END -%] > [%- END -%] > [% INCLUDE 'doc-head-open.inc' %] >@@ -16,9 +16,9 @@ > > [% BLOCK translate_justification_types %] > [% SWITCH type %] >-[% CASE 'L' %]Left >-[% CASE 'C' %]Center >-[% CASE 'R' %]Right >+[% CASE 'L' ]<span>Left</span> >+[% CASE 'C' ]<span>Center</span> >+[% CASE 'R' ]<span>Right</span> > [% END %] > [% END %] > <body id="labels_label-edit-layout" class="tools labels"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >index a9a075db49..48073db2f9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >@@ -86,15 +86,15 @@ > [% END %] > [% SWITCH unit.type %] > [% CASE 'POINT' %] >- PostScript points >+ <span>PostScript points</span> > [% CASE 'AGATE' %] >- Agates >+ <span>Agates</span> > [% CASE 'INCH' %] >- US Inches >+ <span>US Inches</span> > [% CASE 'MM' %] >- SI Millimeters >+ <span>SI Millimeters</span> > [% CASE 'CM' %] >- SI Centimeters >+ <span>SI Centimeters</span> > [% END %] > </option> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index 40d861ac9e..d283fc6844 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -3,14 +3,14 @@ > [% SET footerjs = 1 %] > [% BLOCK translate_label_element %] > [%- SWITCH element -%] >-[%- CASE 'layout' -%]layout >-[%- CASE 'Layouts' -%]Layouts >-[%- CASE 'template' -%]template >-[%- CASE 'Templates' -%]Templates >-[%- CASE 'profile' -%]profile >-[%- CASE 'Profiles' -%]Profiles >-[%- CASE 'batch' -%]batch >-[%- CASE 'Batches' -%]Batches >+[%- CASE 'layout' -]<span>layout</span> >+[%- CASE 'Layouts' -]<span>Layouts</span> >+[%- CASE 'template' -]<span>template</span> >+[%- CASE 'Templates' -]<span>Templates</span> >+[%- CASE 'profile' -]<span>profile</span> >+[%- CASE 'Profiles' -]<span>Profiles</span> >+[%- CASE 'batch' -]<span>batch</span> >+[%- CASE 'Batches' -]<span>Batches</span> > [%- END -%] > [% END %] > [% INCLUDE 'doc-head-open.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >index faa533abd5..2724a51e47 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -20,22 +20,14 @@ > <li> > <span class="label" class="required"> Delivery day:</span> > [% hpd = housebound_profile.day %] >- [% IF hpd == 'any' %] >- Any >- [% ELSIF hpd == 'monday' %] >- Monday >- [% ELSIF hpd == 'tuesday' %] >- Tuesday >- [% ELSIF hpd == 'wednesday' %] >- Wednesday >- [% ELSIF hpd == 'thursday' %] >- Thursday >- [% ELSIF hpd == 'friday' %] >- Friday >- [% ELSIF hpd == 'saturday' %] >- Saturday >- [% ELSIF hpd == 'sunday' %] >- Sunday >+ [% IF hpd == 'any' %]<span>Any</span> >+ [% ELSIF hpd == 'monday' %]<span>Monday</span> >+ [% ELSIF hpd == 'tuesday' %]<span>Tuesday</span> >+ [% ELSIF hpd == 'wednesday' %]<span>Wednesday</span> >+ [% ELSIF hpd == 'thursday' %]<span>Thursday</span> >+ [% ELSIF hpd == 'friday' %]<span>Friday</span> >+ [% ELSIF hpd == 'saturday' %]<span>Saturday</span> >+ [% ELSIF hpd == 'sunday' %]<span>Sunday</span> > [% END %] > </li> > <li> >@@ -96,21 +88,21 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_profile_store' %] >- An error occurred whilst updating this housebound profile. >+ <span>An error occurred whilst updating this housebound profile</span> > [% CASE 'error_on_profile_create' %] >- An error occurred whilst creating this housebound profile. >+ <span>An error occurred whilst creating this housebound profile</span> > [% CASE 'error_on_visit_load' %] >- An error occurred whilst loading the housebound visit. >+ <span>An error occurred whilst loading the housebound visit</span> > [% CASE 'error_on_visit_delete' %] >- An error occurred whilst deleting a housebound visit. >+ <span>An error occurred whilst deleting a housebound visit</span> > [% CASE 'error_on_visit_store' %] >- An error occurred whilst updating a housebound visit. >+ <span>An error occurred whilst updating a housebound visit</span> > [% CASE 'error_on_visit_create' %] >- An error occurred whilst creating a new housebound visit. >+ <span>An error occurred whilst creating a new housebound visit</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] >- Please try again later. >+ <span>Please try again later</span> > </div> > [% 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 0185c6c938..13dcde0353 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -83,7 +83,7 @@ legend:hover { > <div class="dialog alert">Something went wrong when creating the patron. Check the logs.</div> > [% CASE 'error_on_update_patron' %] > <div class="dialog alert">Something went wrong when updating the patron. Check the logs.</div> >- [% CASE %]Unhandled error: [% message.error | html %] >+ [% CASE %]<div class="dialog alert">Unhandled error: [% message.error | html %]</div> > [% END %] > [% END %] > [% END %] >@@ -198,20 +198,20 @@ legend:hover { > <input type="checkbox" id="toggle_hidden_fields" title="These fields are collapsed by default by the CollapseFieldsPatronAddForm system preference"><strong>Show collapsed fields:</strong> > [% FOREACH field IN fieldstohide.split(',') %] > [% SWITCH field %] >- [% CASE 'identity' %] Patron identity | >- [% CASE 'guarantor' %] Guarantor information | >- [% CASE 'primary_address' %] Main address | >- [% CASE 'primary_contact' %] Contact information | >- [% CASE 'alt_address' %] Alternate address | >- [% CASE 'alt_contact' %] Alternate contact | >- [% CASE 'lib_mgmt' %] Library management | >- [% CASE 'lib_setup' %] Library setup | >- [% CASE 'login' %] OPAC/Staff interface login | >- [% CASE 'flags' %] Patron account flags | >- [% CASE 'debarments' %] Patron restrictions | >- [% CASE 'housebound' %] Housebound roles | >- [% CASE 'additional' %] Additional attributes and identifiers | >- [% CASE 'messaging' %] Patron messaging preferences | >+ [% CASE 'identity' %] <span>Patron identity</span> | >+ [% CASE 'guarantor' %] <span>Guarantor information</span> | >+ [% CASE 'primary_address' %] <span>Main address</span> | >+ [% CASE 'primary_contact' %] <span>Contact information</span> | >+ [% CASE 'alt_address' %] <span>Alternate address</span> | >+ [% CASE 'alt_contact' %] <span>Alternate contact</span> | >+ [% CASE 'lib_mgmt' %] <span>Library management</span> | >+ [% CASE 'lib_setup' %] <span>Library setup</span> | >+ [% CASE 'login' %] <span>OPAC/Staff interface login</span> | >+ [% CASE 'flags' %] <span>Patron account flags</span> | >+ [% CASE 'debarments' %] <span>Patron restrictions</span> | >+ [% CASE 'housebound' %] <span>Housebound roles</span> | >+ [% CASE 'additional' %] <span>Additional attributes and identifiers</span> | >+ [% CASE 'messaging' %] <span>Patron messaging preferences</span> | > [% END %] > [% END %] > </p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index 5ab5e2d7ea..3e260361f8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >@@ -51,30 +51,30 @@ > > [% BLOCK display_names %] > [% SWITCH rs %] >- [% CASE 'Accountline' %]account lines >- [% CASE 'ArticleRequest' %]article requests >- [% CASE 'BorrowerAttribute' %]extended patron attributes >- [% CASE 'BorrowerDebarment' %]patron restrictions >- [% CASE 'BorrowerFile' %]patrons files >- [% CASE 'BorrowerModification' %]patron modification requests >- [% CASE 'ClubEnrollment' %]club enrollments >- [% CASE 'Issue' %]checkouts >- [% CASE 'ItemsLastBorrower' %]marks as last borrower of item >- [% CASE 'Linktracker' %]tracked link clicks >- [% CASE 'Message' %]patron messages >- [% CASE 'MessageQueue' %]patron notices >- [% CASE 'OldIssue' %]previous checkouts >- [% CASE 'OldReserve' %]filled holds >- [% CASE 'Rating' %]ratings >- [% CASE 'Reserve' %]current holds >- [% CASE 'Review' %]reviews >- [% CASE 'Statistic' %]statistics >- [% CASE 'SearchHistory' %]historical searches >- [% CASE 'Suggestion' %]purchase suggestions >- [% CASE 'TagAll' %]tags >- [% CASE 'Virtualshelfcontent' %]list items >- [% CASE 'Virtualshelfshare' %]list shares >- [% CASE 'Virtualshelve' %]lists >+ [% CASE 'Accountline' %]<span>account lines</span> >+ [% CASE 'ArticleRequest' %]<span>article requests</span> >+ [% CASE 'BorrowerAttribute' %]<span>extended patron attributes</span> >+ [% CASE 'BorrowerDebarment' %]<span>patron restrictions</span> >+ [% CASE 'BorrowerFile' %]<span>patrons files</span> >+ [% CASE 'BorrowerModification' %]<span>patron modification requests</span> >+ [% CASE 'ClubEnrollment' %]<span>club enrollments</span> >+ [% CASE 'Issue' %]<span>checkouts</span> >+ [% CASE 'ItemsLastBorrower' %]<span>marks as last borrower of item</span> >+ [% CASE 'Linktracker' %]<span>tracked link clicks</span> >+ [% CASE 'Message' %]<span>patron messages</span> >+ [% CASE 'MessageQueue' %]<span>patron notices</span> >+ [% CASE 'OldIssue' %]<span>previous checkouts</span> >+ [% CASE 'OldReserve' %]<span>filled holds</span> >+ [% CASE 'Rating' %]<span>ratings</span> >+ [% CASE 'Reserve' %]<span>current holds</span> >+ [% CASE 'Review' %]<span>reviews</span> >+ [% CASE 'Statistic' %]<span>statistics</span> >+ [% CASE 'SearchHistory' %]<span>historical searches</span> >+ [% CASE 'Suggestion' %]<span>purchase suggestions</span> >+ [% CASE 'TagAll' %]<span>tags</span> >+ [% CASE 'Virtualshelfcontent' %]<span>list items</span> >+ [% CASE 'Virtualshelfshare' %]<span>list shares</span> >+ [% CASE 'Virtualshelve' %]<span>lists</span> > [% CASE %][% rs | html %] > [% END %] > [% END %] >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 f62109cb17..400a6978b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -238,17 +238,17 @@ > <span class="label">Main contact method: </span> > [% SWITCH patron.primary_contact_method %] > [% CASE 'phone' %] >- Primary phone >+ <span>Primary phone</span> > [% CASE 'phonepro' %] >- Secondary phone >+ <span>Secondary phone</span> > [% CASE 'mobile' %] >- Other phone >+ <span>Other phone</span> > [% CASE 'email' %] >- Primary email >+ <span>Primary email</span> > [% CASE 'emailpro' %] >- Secondary email >+ <span>Secondary email</span> > [% CASE 'fax' %] >- Fax >+ <span>Fax</span> > [% END %] > </li> > [% 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 034d1d3e05..5d45ddc190 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -87,16 +87,16 @@ > <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</td> > <td> > [% IF ( QUEUED_MESSAGE.failure_code ) %] >- [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %] >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower >- [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]Invalid [% matches.0 | html %] email address found [% borrowernumber | html %] >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]No notes from SMS driver >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]Unhandled email failure, check the logs for further details >- [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]Unknown error >- [% ELSE %]Error occurred while sending email. >+ [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]<span><span>Invalid borrowernumber [% borrowernumber | html %]</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]<span>Unable to find an email address for this borrower</span> >+ [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]<span>Invalid [% matches.0 | html %] email address found [% borrowernumber | html %]</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]<span>Missing from email address</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]<span>Missing SMS number</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]<span>Message is duplicate</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]<span>No notes from SMS driver</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]<span>Unhandled email failure, check the logs for further details</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]<span>Unknown error</span> >+ [% ELSE %]<span>Error occurred while sending email.</span> > [% END %] > [% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >index 6227f8f7b6..ef68ee893f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >@@ -26,7 +26,7 @@ > [% slip | $raw %] > [% END %] > [% ELSE %] >- No print template found >+ <span>No print template found</span> > [% END %] > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >index 0362452c25..2393e209be 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >@@ -26,7 +26,7 @@ > [% slip | $raw %] > [% END %] > [% ELSE %] >- No print template found >+ <span>No print template found</span> > [% END %] > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index ed664cc005..14298e6f44 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -60,17 +60,17 @@ > <th> > [% SWITCH cn %] > [% CASE 'itype' %] >- Item type >+ <span>Item type</span> > [% CASE 'ccode' %] >- Collection >+ <span>Collection</span> > [% CASE 'location' %] >- Shelving location >+ <span>Shelving location</span> > [% CASE 'homebranch' %] >- Home library >+ <span>Home library</span> > [% CASE 'holdingbranch' %] >- Holding library >+ <span>Holding library</span> > [% CASE %] >- [% cn | html %] >+ <span>[% cn | html %]</span> > [% END %] > </th> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index d80c6ab15f..f231dd5eea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >@@ -61,13 +61,13 @@ > <td> > [% SWITCH ( operation.action ) -%] > [% CASE "issue" -%] >- Check out >+ <span>Check out</span> > [% CASE "return" -%] >- Check in >+ <span>Check in</span> > [% CASE "payment" -%] >- Payment >+ <span>Payment</span> > [% CASE # default case -%] >- [% operation.action | html %] >+ <span>[% operation.action | html %]</span> > [% END -%] > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >index aca3aa02c4..b7ce452569 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >@@ -2,23 +2,23 @@ > [% SET footerjs = 1 %] > [% BLOCK translate_card_element %] > [%- SWITCH element -%] >-[%- CASE 'layout' -%]layout >-[%- CASE 'Layouts' -%]Layouts >-[%- CASE 'template' -%]template >-[%- CASE 'Templates' -%]Templates >-[%- CASE 'profile' -%]profile >-[%- CASE 'Profiles' -%]Profiles >-[%- CASE 'batch' -%]batch >-[%- CASE 'Batches' -%]Batches >-[%- CASE 'Actions' -%]Actions >+[%- CASE 'layout' -]<span>layout</span> >+[%- CASE 'Layouts' -]<span>Layouts</span> >+[%- CASE 'template' -]<span>template</span> >+[%- CASE 'Templates' -]<span>Templates</span> >+[%- CASE 'profile' -]<span>profile</span> >+[%- CASE 'Profiles' -]<span>Profiles</span> >+[%- CASE 'batch' -]<span>batch</span> >+[%- CASE 'Batches' -]<span>Batches</span> >+[%- CASE 'Actions' -]<span>Actions</span> > [%- END -%] > [% END %] > [% BLOCK translate_card_elements %] > [%- SWITCH element -%] >-[%- CASE 'layout' -%]layouts >-[%- CASE 'template' -%]templates >-[%- CASE 'profile' -%]profiles >-[%- CASE 'batch' -%]batches >+[%- CASE 'layout' -]<span>layouts</span> >+[%- CASE 'template' -]<span>templates</span> >+[%- CASE 'profile' -]<span>profiles</span> >+[%- CASE 'batch' -]<span>batches</span> > [%- END -%] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt >index f0f7180be4..581d5668fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/printreceipt.tt >@@ -26,7 +26,7 @@ > [% slip | $raw %] > [% END %] > [% ELSE %] >- No print template found >+ <span>No print template found</span> > [% END %] > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >index 8ae84ad28f..54eae66a3c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt >@@ -48,18 +48,18 @@ > [% FOREACH loopfilte IN mainloo.loopfilter %] > <p> > [% SWITCH loopfilte.crit %] >- [% CASE '0' %] Placed on (from) >- [% CASE '1' %] Placed on (to) >- [% CASE '2' %] Received on (from) >- [% CASE '3' %] Received on (to) >- [% CASE '4' %] Vendor >- [% CASE '5' %] Home library >- [% CASE '6' %] Collection >- [% CASE '7' %] Item type >- [% CASE '8' %] Fund >- [% CASE '9' %] Sort1 >- [% CASE '10' %] Sort2 >- [% CASE %] Unknown filter >+ [% CASE '0' %]<span>Placed on (from)</span> >+ [% CASE '1' %]<span>Placed on (to)</span> >+ [% CASE '2' %]<span>Received on (from)</span> >+ [% CASE '3' %]<span>Received on (to)</span> >+ [% CASE '4' %]<span>Vendor</span> >+ [% CASE '5' %]<span>Home library</span> >+ [% CASE '6' %]<span>Collection</span> >+ [% CASE '7' %]<span>Item type</span> >+ [% CASE '8' %]<span>Fund</span> >+ [% CASE '9' %]<span>Sort1</span> >+ [% CASE '10' %]<span>Sort2</span> >+ [% CASE %]<span>Unknown filter</span> > [% END %] > : [% loopfilte.filter | html %] > </p> >@@ -192,7 +192,7 @@ > [% IF ccode_label %] > [% ccode_label | html %] > [% ELSE %] >- Collection >+ <span>Collection</span> > [% END %] > </td> > <td><input type="radio" name="Line" value="items.ccode" /></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >index 9bdf3897e7..af079b3e56 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >@@ -54,27 +54,27 @@ > <li> > [% SWITCH loopfilte.crit -%] > [% CASE "Issue From" -%] >- Checked out after [% loopfilte.filter | $KohaDates %] >+ <span>Checked out after [% loopfilte.filter | $KohaDates %]</span> > [% CASE "Issue To" -%] >- Checked out before [% loopfilte.filter | $KohaDates %] >+ <span>Checked out before [% loopfilte.filter | $KohaDates %]</span> > [% CASE "Return From" -%] >- Checked in after [% loopfilte.filter | $KohaDates %] >+ <span>Checked in after [% loopfilte.filter | $KohaDates %]</span> > [% CASE "Return To" -%] >- Checked in before [% loopfilte.filter | $KohaDates %] >+ <span>Checked in before [% loopfilte.filter | $KohaDates %]</span> > [% CASE "Branch" -%] >- Library is [% Branches.GetName( loopfilte.filter ) | html %] >+ <span>Library is [% Branches.GetName( loopfilte.filter ) | html %]</span> > [% CASE "Doc Type" -%] >- Item type is [% ItemTypes.GetDescription( loopfilte.filter ) | html %] >+ <span>Item type is [% ItemTypes.GetDescription( loopfilte.filter ) | html %]</span> > [% CASE "Bor Cat" -%] >- Patron category code is [% loopfilte.filter | html %] >+ <span>Patron category code is [% loopfilte.filter | html %]</span> > [% CASE "Day" -%] >- Day is [% loopfilte.filter | html %] >+ <span>Day is [% loopfilte.filter | html %]</span> > [% CASE "Month" -%] >- Month is [% loopfilte.filter | html %] >+ <span>Month is [% loopfilte.filter | html %]</span> > [% CASE "Year" -%] >- Year is [% loopfilte.filter | html %] >+ <span>Year is [% loopfilte.filter | html %]</span> > [% CASE # default case -%] >- [% loopfilte.crit | html %] = [% loopfilte.filter | html %] >+ <span>[% loopfilte.crit | html %] = [% loopfilte.filter | html %]</span> > [% END -%] > </li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >index 47b08c8a25..65881d1a00 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >@@ -11,12 +11,12 @@ > > [%- BLOCK area_name -%] > [%- SWITCH area -%] >- [%- CASE 'CIRC' -%]Circulation >- [%- CASE 'CAT' -%]Catalog >- [%- CASE 'PAT' -%]Patrons >- [%- CASE 'ACQ' -%]Acquisitions >- [%- CASE 'ACC' -%]Accounts >- [%- CASE 'SER' -%]Serials >+ [%- CASE 'CIRC' -]<span>Circulation</span> >+ [%- CASE 'CAT' -]<span>Catalog</span> >+ [%- CASE 'PAT' -]<span>Patrons</span> >+ [%- CASE 'ACQ' -]<span>Acquisitions</span> >+ [%- CASE 'ACC' -]<span>Accounts</span> >+ [%- CASE 'SER' -]<span>Serials</span> > [%- END -%] > [%- END -%] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index c962ff3fd2..55d9e83113 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -9,12 +9,12 @@ > > [%- BLOCK area_name -%] > [%- SWITCH area -%] >- [%- CASE 'CIRC' -%]Circulation >- [%- CASE 'CAT' -%]Catalog >- [%- CASE 'PAT' -%]Patrons >- [%- CASE 'ACQ' -%]Acquisitions >- [%- CASE 'ACC' -%]Accounts >- [%- CASE 'SER' -%]Serials >+ [%- CASE 'CIRC' -%]<span>Circulation</span> >+ [%- CASE 'CAT' -%]<span>Catalog</span> >+ [%- CASE 'PAT' -%]<span>Patrons</span> >+ [%- CASE 'ACQ' -%]<span>Acquisitions</span> >+ [%- CASE 'ACC' -%]<span>Accounts</span> >+ [%- CASE 'SER' -%]<span>Serials</span> > [%- END -%] > [%- END -%] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >index 4dd120b2f5..6b7436ae4b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >@@ -59,24 +59,23 @@ > <li> > [% END %] > [% SWITCH loopfilte.crit %] >- [% CASE 0 %]Period from >- [% CASE 1 %]Period to >- [% CASE 2 %]Patron category = >- [% CASE 3 %]Item type = >- [% CASE 4 %]Issuing library = >- [% CASE 5 %]Collection = >- [% CASE 6 %]Location = >- [% CASE 7 %]Item call number >= >- [% CASE 8 %]Item call number < >- [% CASE 9 %]Patron sort1 = >- [% CASE 10 %]Patron sort2 = >- [% CASE 11 %]Home library = >- [% CASE 12 %]Holding library = >- [% CASE 13 %]Patron library = >- [% CASE 14 %]Issuing library = >- [% CASE %][% loopfilte.crit | html %] = >+ [% CASE 0 ]<span>Period from [% loopfilte.filter | html %]</span> >+ [% CASE 1 ]<span>Period to [% loopfilte.filter | html %]</span> >+ [% CASE 2 ]<span>Patron category = [% loopfilte.filter | html %]</span> >+ [% CASE 3 ]<span>Item type = [% loopfilte.filter | html %]</span> >+ [% CASE 4 ]<span>Issuing library = [% loopfilte.filter | html %]</span> >+ [% CASE 5 ]<span>Collection = [% loopfilte.filter | html %]</span> >+ [% CASE 6 ]<span>Location = [% loopfilte.filter | html %]</span> >+ [% CASE 7 ]<span>Item call number >= [% loopfilte.filter | html %]</span> >+ [% CASE 8 ]<span>Item call number < [% loopfilte.filter | html %]</span> >+ [% CASE 9 ]<span>Patron sort1 = [% loopfilte.filter | html %]</span> >+ [% CASE 10 ]<span>Patron sort2 = [% loopfilte.filter | html %]</span> >+ [% CASE 11 ]<span>Home library = [% loopfilte.filter | html %]</span> >+ [% CASE 12 ]<span>Holding library = [% loopfilte.filter | html %]</span> >+ [% CASE 13 ]<span>Patron library = [% loopfilte.filter | html %]</span> >+ [% CASE 14 ]<span>Issuing library = [% loopfilte.filter | html %]</span> >+ [% CASE ]<span>[% loopfilte.crit | html %] = [% loopfilte.filter | html %]</span> > [% END %] >- [% loopfilte.filter | html %] > </li> > [% END %] > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index 12ad1fde6a..96edad15e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -113,7 +113,7 @@ > [% bdgclass=budgetsloo.active? "": "b_inactive" | html %] > <option class="[% bdgclass | html %]" value="[% budgetsloo.value | html %]"> > [% END %] >- [% budgetsloo.description | html %] [% IF !budgetsloo.active %](inactive)[% END %] >+ [% budgetsloo.description | html %] [% IF !budgetsloo.active %]<span>(inactive)</span>[% END %] > </option> > [% END %] > </select> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 97698a8ff8..82cc777950 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -633,35 +633,35 @@ > <i class="fa fa-times fa-lg" title="Cannot be put on hold"></i> > [% IF itemloo.not_holdable %] > [% IF itemloo.not_holdable == 'damaged' %] >- Item damaged >+ <span>Item damaged</span> > [% ELSIF itemloo.not_holdable == 'ageRestricted' %] >- Age restricted >+ <span>Age restricted</span> > [% ELSIF itemloo.not_holdable == 'tooManyHoldsForThisRecord' %] >- Exceeded max holds per record >+ <span>Exceeded max holds per record</span> > [% ELSIF itemloo.not_holdable == 'tooManyReservesToday' %] >- Daily hold limit reached for patron >+ <span>Daily hold limit reached for patron</span> > [% ELSIF itemloo.not_holdable == 'tooManyReserves' %] >- Too many holds >+ <span>Too many holds</span> > [% ELSIF itemloo.not_holdable == 'notReservable' %] >- Not holdable >+ <span>Not holdable</span> > [% ELSIF itemloo.not_holdable == 'cannotReserveFromOtherBranches' %] >- Patron is from different library >+ <span>Patron is from different library</span> > [% ELSIF itemloo.not_holdable == 'branchNotInHoldGroup' %] >- Cannot place hold from patron's library >+ <span>Cannot place hold from patron's library</span> > [% ELSIF itemloo.not_holdable == 'itemAlreadyOnHold' %] >- Patron already has hold for this item >+ <span>Patron already has hold for this item</span> > [% ELSIF itemloo.not_holdable == 'cannotBeTransferred' %] >- Cannot be transferred to pickup library >+ <span>Cannot be transferred to pickup library</span> > [% ELSIF itemloo.not_holdable == 'pickupNotInHoldGroup' %] >- Only pickup locations within the same hold group are allowed >+ <span>Only pickup locations within the same hold group are allowed</span> > [% ELSIF itemloo.not_holdable == 'noReservesAllowed' %] >- No reserves are allowed on this item >+ <span>No reserves are allowed on this item</span> > [% ELSIF itemloo.not_holdable == 'libraryNotPickupLocation' %] >- Library is not a pickup location >+ <span>Library is not a pickup location</span> > [% ELSIF itemloo.not_holdable == 'no_valid_pickup_location' %] >- No valid pickup location >+ <span>No valid pickup location</span> > [% ELSE %] >- [% itemloo.not_holdable | html %] >+ <span>[% itemloo.not_holdable | html %]</span> > [% END %] > [% END %] > </span> >@@ -1055,7 +1055,7 @@ > [% IF i %] > [% ItemTypes.GetDescription( i ) | html %] > [% ELSE %] >- Any item type >+ <span>Any item type</span> > [% END %] > </h5> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 69575baacc..7e6520749c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -230,7 +230,7 @@ > [% IF serial.publisheddate %] > [% serial.publisheddate | $KohaDates %] > [% ELSE %] >- Unknown >+ <span>Unknown</span> > [% END %] > </td> > <td data-order="[% serial.publisheddatetext | html %]"> >@@ -242,7 +242,7 @@ > [% IF serial.planneddate %] > [% serial.planneddate | $KohaDates %] > [% ELSE %] >- Unknown >+ <span>Unknown</span> > [% END %] > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt >index c684348deb..eb4e5b3d47 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt >@@ -65,7 +65,7 @@ > [% IF (prediction.publicationdate) %] > [% prediction.publicationdate | $KohaDates %] > [% ELSE %] >- unknown >+ <span>unknown</span> > [% END %] > </td> > [% IF (ask_for_irregularities) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index b374082364..7d9d9bdbd1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -333,14 +333,14 @@ > [% IF serialslis.planneddate %] > [% serialslis.planneddate | html %] > [% ELSE %] >- Unknown >+ <span>Unknown</span> > [% END %] > </td> > <td> > [% IF serialslis.publisheddate %] > [% serialslis.publisheddate | html %] > [% ELSE %] >- Unknown >+ <span>Unknown</span> > [% END %] > </td> > <td> >@@ -468,11 +468,11 @@ > <td data-order="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</td> > <td data-order="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</td> > [% SWITCH order.orderstatus %] >- [% CASE 'new' %]<td data-order="status_1">New >- [% CASE 'ordered' %]<td data-order="status_2">Ordered >- [% CASE 'partial' %]<td data-order="status_3">Partial >- [% CASE 'complete' %]<td data-order="status_4">Complete >- [% CASE 'cancelled' %]<td data-order="status_5">Cancelled >+ [% CASE 'new' %]<td data-order="status_1"><span>New</span> >+ [% CASE 'ordered' %]<td data-order="status_2"><span>Ordered</span> >+ [% CASE 'partial' %]<td data-order="status_3"><span>Partial</span> >+ [% CASE 'complete' %]<td data-order="status_4"><span>Complete</span> >+ [% CASE 'cancelled' %]<td data-order="status_5"><span>Cancelled</span> > [% END %] > </td> > <td>[% order.order_internalnote | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >index 037192bdcd..3566022ae8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >@@ -10,10 +10,10 @@ > > [% BLOCK translate_frequnit %] > [% SWITCH frequnit %] >-[% CASE 'day' %] day >-[% CASE 'week' %] week >-[% CASE 'month' %] month >-[% CASE 'year' %] year >+[% CASE 'day' %]<span> day</span> >+[% CASE 'week' %]<span> week</span> >+[% CASE 'month' %]<span> month</span> >+[% CASE 'year' %]<span> year</span> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt >index 3cf27e27a5..d2738d3acd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt >@@ -49,9 +49,9 @@ > <option value="[% value | html %]"> > [% END %] > [% SWITCH subtype %] >- [% CASE 'numberlength'%]issues >- [% CASE 'weeklength' %]weeks >- [% CASE 'monthlength' %]months >+ [% CASE 'numberlength' %]<span>issues</span> >+ [% CASE 'weeklength' %]<span>weeks</span> >+ [% CASE 'monthlength' %]<span>months</span> > [% END %] > </option> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 1f691dcf93..438a85cea1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -195,22 +195,22 @@ > <span class="label">Status:</span> > [% SET status_found = 0 %] > [% IF ( STATUS == 'ASKED' ) %] >- Pending >+ <span>Pending</span> > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'ACCEPTED' ) %] >- Accepted >+ <span>Accepted<span> > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'CHECKED' ) %] >- Checked >+ <span>Checked</span> > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'REJECTED' ) %] >- Rejected >+ <span>Rejected</span> > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'ORDERED' ) %] >- Ordered >+ <span>Ordered</span> > [% SET status_found = 1 %] > [% ELSIF ( STATUS == 'AVAILABLE' ) %] >- Available >+ <span>Available</span> > [% SET status_found = 1 %] > [% ELSE %] > [% FOREACH s IN SuggestionStatuses %] >@@ -335,11 +335,11 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'biblio_exists' %] >- A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message. >+ <span>A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message.</span> > [% CASE 'manager_not_enough_permissions' %] >- The manager you selected does not have sufficient permissions. >+ <span>The manager you selected does not have sufficient permissions.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> <!-- /.dialog --> > [% END %] >@@ -675,11 +675,11 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'already_exists' %] >- The suggestion has not been added. A suggestion with this title already exists (<a href='/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id | html %]&op=show'>suggestion #[% m.id | html %]</a>) >+ <span>The suggestion has not been added. A suggestion with this title already exists (<a href='/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id | html %]&op=show'>suggestion #[% m.id | html %]</a>)</span> > [% CASE 'biblio_exists' %] >- A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message. >+ <span>A similar document already exists: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> <!-- /.dialog --> > [% END # /FOR m %] >@@ -691,20 +691,20 @@ > <li> > <a href="#[% suggestion.suggestiontype | uri %]"> > [% IF ( suggestion.suggestiontypelabel ) %] >- [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending >- [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted >- [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]Checked >- [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]Rejected >- [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available >- [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]Ordered >- [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]Status unknown >- [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]Any >+ [% IF (suggestion.suggestiontypelabel == "Pending") %]<span>Pending</span> >+ [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]<span>Accepted</span> >+ [% ELSIF (suggestion.suggestiontypelabel == "Checked") %]<span>Checked</span> >+ [% ELSIF (suggestion.suggestiontypelabel == "Rejected") %]<span>Rejected</span> >+ [% ELSIF (suggestion.suggestiontypelabel == "Available") %]<span>Available</span> >+ [% ELSIF (suggestion.suggestiontypelabel == "Ordered") %]<span>Ordered</span> >+ [% ELSIF (suggestion.suggestiontypelabel == "Unknown") %]<span>Status unknown</span> >+ [% ELSIF (suggestion.suggestiontypelabel == "__ANY__") %]<span>Any</span> > [% ELSE %][% suggestion.suggestiontypelabel | html %][% END %] > [% ELSE %] > [% IF ( suggestion.suggestiontype ) %] > [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.suggestiontype ) | html %] > [% ELSE %] >- No name >+ <span>No name</span> > [% END %] > [% END %] > ([% suggestion.suggestions_loop.size | html %])</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index 1aae1a0b77..e7962321fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -64,17 +64,18 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > [% IF ( message_loop ) %] > <div class="dialog alert" id="main_error"> > [% FOREACH message_loo IN message_loop %] >- [% IF ( message_loo.date_from ) %]<strong>Error: </strong>"Date from" is not a legal value ("[% message_loo.date_from | html %]"). >- [% ELSIF ( message_loo.date_to ) %]<strong>Error: </strong>"Date to" is not a legal value ("[% message_loo.date_to | html %]"). >- [% ELSIF ( message_loo.failed_ok ) %]<strong>Error: </strong>Failed to approve term ([% message_loo.failed_ok | html %]). >- [% ELSIF ( message_loo.failed_rej ) %]<strong>Error: </strong>Failed to reject term ([% message_loo.failed_rej | html %]). >- [% ELSIF ( message_loo.approver ) %]No match for user ([% message_loo.approver | html %]). FILTER REQUIRES BORROWERNUMBER (not name). >- [% ELSIF ( message_loo.approved_by ) %]<strong>Error: </strong>No match for borrowernumber ([% message_loo.approved_by | html %]). >- [% ELSIF ( message_loo.op_zero ) %]<strong>Error: </strong> The root koha user in your KOHA_CONF file >+ [% IF ( message_loo.date_from ) %]<strong>Error: </strong><span>"Date from" is not a legal value ("[% message_loo.date_from | html %]").</span> >+ [% ELSIF ( message_loo.date_to ) %]<strong>Error: </strong><span>"Date to" is not a legal value ("[% message_loo.date_to | html %]").</span> >+ [% ELSIF ( message_loo.failed_ok ) %]<strong>Error: </strong><span>Failed to approve term ([% message_loo.failed_ok | html %]).</span> >+ [% ELSIF ( message_loo.failed_rej ) %]<strong>Error: </strong><span>Failed to reject term ([% message_loo.failed_rej | html %]).</span> >+ [% ELSIF ( message_loo.approver ) %]<span>No match for user ([% message_loo.approver | html %]). FILTER REQUIRES BORROWERNUMBER (not name).</span> >+ [% ELSIF ( message_loo.approved_by ) %]<strong>Error: </strong><span>No match for borrowernumber ([% message_loo.approved_by | html %]).</span> >+ [% ELSIF ( message_loo.op_zero ) %]<strong>Error: </strong> >+ <span>The root koha user in your KOHA_CONF file > (default: kohaadmin) is not a valid tag moderator. These actions are logged > by borrowernumber, so the moderator must exist in your borrowers table. >- Please log in as a different authorized staff user to moderate tags. >- [% ELSE %]Unrecognized error! >+ Please log in as a different authorized staff user to moderate tags.</span> >+ [% ELSE %]<span>Unrecognized error!</span> > [% END %] > <br /> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >index b611e4df73..0313ced75e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt >@@ -46,9 +46,9 @@ > <li> > <a href="#" aria-current="page"> > [% IF additional_content.idnew %] >- <span>Modify additional content<span> >+ <span>Modify additional content</span> > [% ELSE %] >- <span>Add additional content<span> >+ <span>Add additional content</span> > [% END %] > ([% IF category == 'news' %]<span>News</span>[% ELSE %]<span>HTML customizations</span>[% END %]) > </a> >@@ -84,19 +84,19 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this content. Perhaps it already exists. >+ <span>An error occurred when updating this content. Perhaps it already exists</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this content. Check the logs >+ <span>An error occurred when adding this content. Check the logs > [% CASE 'error_on_delete' %] >- An error occurred when deleting this content. Check the logs. >+ <span>An error occurred when deleting this content. Check the logs</span> > [% CASE 'success_on_update' %] >- Content updated successfully. >+ <span>Content updated successfully</span> > [% CASE 'success_on_insert' %] >- Content added successfully. >+ <span>Content added successfully</span> > [% CASE 'success_on_delete' %] >- Content deleted successfully. >+ <span>Content deleted successfully</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index 7b266f8173..5814326646 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -43,10 +43,10 @@ > <div class="dialog alert" style="margin:auto;"> > [% END %] > [% IF message.code == 'cannot_enqueue_job' %] >- Cannot enqueue this job. >+ <span>Cannot enqueue this job.</span> > [% END %] > [% IF message.error %] >- (The error was: [% message.error | html %], see the Koha log file for more information). >+ <span>(The error was: [% message.error | html %], see the Koha log file for more information).</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index c2cdfc8d5b..e437a8702e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -65,10 +65,10 @@ > <div class="dialog alert" style="margin:auto;"> > [% END %] > [% IF message.code == 'cannot_enqueue_job' %] >- Cannot enqueue this job. >+ <span>Cannot enqueue this job.</span> > [% END %] > [% IF message.error %] >- (The error was: [% message.error | html %], see the Koha log file for more information). >+ <span>(The error was: [% message.error | html %], see the Koha log file for more information).</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >index d57915bbef..17e8635501 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >@@ -50,7 +50,7 @@ > <div><i class="fa fa-exclamation error"></i> > [% END %] > [% IF message.error %] >- (The error was: [% message.error | html %]. See the Koha logfile for more information). >+ <span>(The error was: [% message.error | html %]. See the Koha logfile for more information).</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >index d68696d0ab..d56cd01b7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >@@ -61,21 +61,21 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this CSV profile. Perhaps it already exists. >+ <span>An error occurred when updating this CSV profile. Perhaps it already exists</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this CSV profile. >+ <span>An error occurred when adding this CSV profile</span> > [% CASE 'error_on_delete' %] >- An error occurred when deleting this CSV profile. Check the logs. >+ <span>An error occurred when deleting this CSV profile. Check the logs</span> > [% CASE 'success_on_update' %] >- CSV profile updated successfully. >+ <span>CSV profile updated successfully</span> > [% CASE 'success_on_insert' %] >- CSV profile added successfully. >+ <span>CSV profile added successfully</span> > [% CASE 'success_on_delete' %] >- CSV profile deleted successfully. >+ <span>CSV profile deleted successfully</span> > [% CASE 'already_exists' %] >- This CSV profile already exists. >+ <span>This CSV profile already exists</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -126,12 +126,12 @@ > [% END %] > > [% BLOCK used_for_description %] >- [% IF used_for_code == 'export_records' %] Export records >- [% ELSIF used_for_code == 'late_issues' %] Late serial issues claims >- [% ELSIF used_for_code == 'late_orders' %] Export late orders >- [% ELSIF used_for_code == 'export_basket' %] Basket export in acquisition >- [% ELSIF used_for_code == 'export_lost_items' %] Export lost items in report >- [% ELSE %] Unknown usage >+ [% IF used_for_code == 'export_records' ]<span> Export records</span> >+ [% ELSIF used_for_code == 'late_issues' ]<span> Late serial issues claims</span> >+ [% ELSIF used_for_code == 'late_orders' ]<span> Export late orders</span> >+ [% ELSIF used_for_code == 'export_basket' ]<span> Basket export in acquisition</span> >+ [% ELSIF used_for_code == 'export_lost_items' ]<span> Export lost items in report</span> >+ [% ELSE ]<span> Unknown usage</span> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >index fee9ea6132..3b8ed38f42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -40,7 +40,7 @@ > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] >- [% CASE 'invalid_mimetype' %]The file used does not have a valid format. Only csv and txt are allowed. >+ [% CASE 'invalid_mimetype' %]<span>The file used does not have a valid format. Only csv and txt are allowed.</span> > [% CASE %][% m.code | html %] > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index c7a7ab748a..1ce6001c70 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -314,17 +314,17 @@ > <td> > [% FOREACH problem IN result.problems %] > [% IF problem.key == 'wrongplace' %] >- Found in wrong place<br/> >+ <span>Found in wrong place<span><br/> > [% ELSIF problem.key == 'changestatus' %] >- Unknown not-for-loan status<br/> >+ <span>Unknown not-for-loan status<span><br/> > [% ELSIF problem.key == 'not_scanned' %] >- Missing (not scanned)<br/> >+ <span>Missing (not scanned)</span><br/> > [% ELSIF problem.key == 'checkedout' %] >- Still checked out<br/> >+ <span>Still checked out</span><br/> > [% ELSIF problem.key == 'no_barcode' %] >- No barcode<br/> >+ <span>No barcode</span><br/> > [% ELSIF problem.key == 'out_of_order' %] >- Item may be shelved out of order<br/> >+ <span>Item may be shelved out of order</span><br/> > [% END %] > [% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index f2337e39e9..098ff37e00 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -191,7 +191,7 @@ > [% IF lette.branchname %] > [% lette.branchname | html %] > [% ELSE %] >- (All libraries) >+ <span>(All libraries)</span> > [% END %] > </td> > <td> >@@ -304,7 +304,7 @@ > [% IF ( branchcode ) %] > [% Branches.GetName( branchcode ) | html %] > [% ELSE %] >- All libraries >+ <span>All libraries</span> > [% END %] > [% END %] > </li> >@@ -439,20 +439,13 @@ > [% NEXT IF letter.message_transport_type == "phone" && !Koha.Preference('PhoneNotification') %] > <h3> > [% SWITCH letter.message_transport_type %] >- [% CASE 'email' %] >- Email >- [% CASE 'print' %] >- Print >- [% CASE 'sms' %] >- SMS >- [% CASE 'feed' %] >- Feed >- [% CASE 'itiva' %] >- Phone ( Itiva ) >- [% CASE 'phone' %] >- Phone >- [% CASE %] >- [% letter.message_transport_type | html %] >+ [% CASE 'email' %]<span>Email</span> >+ [% CASE 'print' %]<span>Print</span> >+ [% CASE 'sms' %]<span>SMS</span> >+ [% CASE 'feed' %]<span>Feed</span> >+ [% CASE 'itiva' %]<span>Phone ( Itiva )</span> >+ [% CASE 'phone' %]<span>Phone</span> >+ [% CASE %]<span>[% letter.message_transport_type | html %]</span> > [% END %] > </h3> > [% IF letter.message_transport_type == "sms" and not Koha.Preference("SMSSendDriver") %] >@@ -546,7 +539,7 @@ > </tr> > </thead> > <tr> >- <td>[% IF letter.branchcode %][% Branches.GetName( letter.branchcode ) | html %][% ELSE %](All libraries)[% END %]</td> >+ <td>[% IF letter.branchcode %][% Branches.GetName( letter.branchcode ) | html %][% ELSE %]<span>(All libraries)</span>[% END %]</td> > <td>[% letter.module | html %]</td> > <td>[% letter.code | html %]</td> > <td>[% letter.name | html %]</td> >@@ -567,7 +560,7 @@ > [% END # /IF delete_confirm %] > > [% IF ( delete_confirmed ) %] >- Data deleted >+ <span>Data deleted</span> > <form action="[% action | html %]" method="post"> > <input type="submit" value="OK" /> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 75777fc3a3..258cadd50b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -167,7 +167,7 @@ > [% IF ( current_matcher_id ) %] > [% current_matcher_code | html %] ([% current_matcher_description | html %]) > [% ELSE %] >- No matching rule in effect >+ <span>No matching rule in effect</span> > [% END %] > [% END %] > </li> >@@ -178,13 +178,13 @@ > [% ELSE %] > <span class="label">Action if matching record found:</span> > [% IF ( overlay_action == 'replace' ) %] >- Replace existing record with incoming record >+ <span>Replace existing record with incoming record</span> > [% ELSIF ( overlay_action == 'create_new' ) %] >- Add incoming record >+ <span>Add incoming record</span> > [% ELSIF ( overlay_action == 'ignore' ) %] >- Ignore incoming record (its items may still be processed) >+ <span>Ignore incoming record (its items may still be processed)</span> > [% ELSE %] >- [% overlay_action | html %] >+ <span>[% overlay_action | html %]</span> > [% END %] > [% END %] > </li> >@@ -211,15 +211,15 @@ > [% ELSE %] > <span class="label">Item processing:</span> > [% IF ( item_action == 'always_add' ) %] >- Always add items >+ <span>Always add items</span> > [% ELSIF ( item_action == 'add_only_for_matches' ) %] >- Add items only if matching bib was found >+ <span>Add items only if matching bib was found</span> > [% ELSIF ( item_action == 'add_only_for_new' ) %] >- Add items only if no matching bib was found >+ <span>Add items only if no matching bib was found</span> > [% ELSIF ( item_action == 'ignore' ) %] >- Ignore items >+ <span>Ignore items</span> > [% ELSE %] >- [% item_action | html %] >+ <span>[% item_action | html %]</span> > [% END %] > [% END %] > </li> >@@ -365,19 +365,19 @@ > <td>[% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %]</td> > <td> > [% IF ( batch_lis.import_status == 'cleaned' ) %] >- Cleaned >+ <span>Cleaned</span> > [% ELSIF ( batch_lis.import_status == 'imported' ) %] >- Imported >+ <span>Imported</span> > [% ELSIF ( batch_lis.import_status == 'importing' ) %] >- Importing >+ <span>Importing</span> > [% ELSIF ( batch_lis.import_status == 'reverted' ) %] >- Reverted >+ <span>Reverted</span> > [% ELSIF ( batch_lis.import_status == 'reverting' ) %] >- Reverting >+ <span>Reverting</span> > [% ELSIF ( batch_lis.import_status == 'staged' ) %] >- Staged >+ <span>Staged</span> > [% ELSE %] >- [% batch_lis.import_status | html %] >+ <span>[% batch_lis.import_status | html %]</span> > [% END %] > </td> > <td>[% batch_lis.upload_timestamp | $KohaDates with_hours=1 %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index f60a917a9b..1a69521b97 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -290,50 +290,28 @@ > <label for="[% field.name | html %]"> > [% END %] > [% SWITCH ( field.name ) %] >- [% CASE 'surname' %] >- Surname: >- [% CASE 'firstname' %] >- First name: >- [% CASE 'branchcode' %] >- Library: >- [% CASE 'categorycode' %] >- Patron category: >- [% CASE 'streetnumber' %] >- Street number: >- [% CASE 'address' %] >- Address: >- [% CASE 'address2' %] >- Address 2: >- [% CASE 'city' %] >- City: >- [% CASE 'state' %] >- State: >- [% CASE 'zipcode' %] >- ZIP/Postal code: >- [% CASE 'country' %] >- Country: >- [% CASE 'email' %] >- Primary email: >- [% CASE 'phone' %] >- Phone: >- [% CASE 'mobile' %] >- Mobile: >- [% CASE 'sort1' %] >- Sort 1: >- [% CASE 'sort2' %] >- Sort 2: >- [% CASE 'dateenrolled' %] >- Registration date: >- [% CASE 'dateexpiry' %] >- Expiry date: >- [% CASE 'borrowernotes' %] >- Circulation note: >- [% CASE 'opacnote' %] >- OPAC note: >- [% CASE 'debarred' %] >- Restriction expiration: >- [% CASE 'debarredcomment' %] >- Restriction comment: >+ [% CASE 'surname' %]<span>Surname:</span> >+ [% CASE 'firstname' %]<span>First name:</span> >+ [% CASE 'branchcode' %]<span>Library:</span> >+ [% CASE 'categorycode' %]<span>Patron category:</span> >+ [% CASE 'streetnumber' %]<span>Street number:</span> >+ [% CASE 'address' %]<span>Address:</span> >+ [% CASE 'address2' %]<span>Address 2:</span> >+ [% CASE 'city' %]<span>City:</span> >+ [% CASE 'state' %]<span>State:</span> >+ [% CASE 'zipcode' %]<span>ZIP/Postal code:</span> >+ [% CASE 'country' %]<span>Country:</span> >+ [% CASE 'email' %]<span>Primary email:</span> >+ [% CASE 'phone' %]<span>Phone:</span> >+ [% CASE 'mobile' %]<span>Mobile:</span> >+ [% CASE 'sort1' %]<span>Sort 1:</span> >+ [% CASE 'sort2' %]<span>Sort 2:</span> >+ [% CASE 'dateenrolled' %]<span>Registration date:</span> >+ [% CASE 'dateexpiry' %]<span>Expiry date:</span> >+ [% CASE 'borrowernotes' %]<span>Circulation note:</span> >+ [% CASE 'opacnote' %]<span>OPAC note:</span> >+ [% CASE 'debarred' %]<span>Restriction expiration:</span> >+ [% CASE 'debarredcomment' %]<span>Restriction comment:</span> > [% END %] > </label> > [% IF ( field.type == 'text' ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >index 659f092ed4..bbaf254c8d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >@@ -91,20 +91,13 @@ > [% NEXT IF mtt == 'phone' AND !Koha.Preference('PhoneNotification') %] > <th scpre="col"> > [% SWITCH mtt %] >- [% CASE 'email' %] >- Email >- [% CASE 'print' %] >- Print >- [% CASE 'sms' %] >- SMS >- [% CASE 'feed' %] >- Feed >- [% CASE 'itiva' %] >- Phone (i-tiva) >- [% CASE 'phone' %] >- Phone >- [% CASE %] >- [% mtt | html %] >+ [% CASE 'email' %]<span>Email</span> >+ [% CASE 'print' %]<span>Print</span> >+ [% CASE 'sms' %]<span>SMS</span> >+ [% CASE 'feed' %]<span>Feed</span> >+ [% CASE 'itiva' %]<span>Phone (i-tiva)</span> >+ [% CASE 'phone' %]<span>Phone</span> >+ [% CASE %]<span>[% mtt | html %]</span> > [% END %] > </th> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >index 1b9013fe11..aa9bbd5f2e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/preview_letter.tt >@@ -8,14 +8,14 @@ > [%# FIXME The message block does not appear at the top of the modal! %] > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] >- [% CASE 'no_data_for_preview' %]You did not specify data for preview. >- [% CASE 'preview_not_available' %]Preview is not available for letters '[% m.letter_code | html %]'. >- [% CASE 'not_checked_in_yet' %]Do not forget that the issue has not been checked in yet. >- [% CASE 'not_checked_out_yet' %]Do not forget that the issue has not been checked out yet. >- [% CASE 'no_checkout' %]This item is not checked out. >- [% CASE 'no_item_or_no_patron' %]The item or the patron does not exist. >- [% CASE 'no_hold' %]No hold is placed by this patron on this bibliographic record. >- [% CASE %][% m.code | html %] >+ [% CASE 'no_data_for_preview' %]<span>You did not specify data for preview.</span> >+ [% CASE 'preview_not_available' %]<span>Preview is not available for letters '[% m.letter_code | html %]'.</span> >+ [% CASE 'not_checked_in_yet' %]<span>Do not forget that the issue has not been checked in yet.</span> >+ [% CASE 'not_checked_out_yet' %]<span>Do not forget that the issue has not been checked out yet.</span> >+ [% CASE 'no_checkout' %]<span>This item is not checked out.</span> >+ [% CASE 'no_item_or_no_patron' %]<span>The item or the patron does not exist.</span> >+ [% CASE 'no_hold' %]<span>No hold is placed by this patron on this bibliographic record.</span> >+ [% CASE %]<span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >index 2bc746507c..7531c5f750 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt >@@ -93,8 +93,8 @@ > <td><a href="[% OPACBaseURL | url %][% report.problempage | url %]">[% OPACBaseURL | url %][% report.problempage | html %]</a></td> > <td> > [% SWITCH report.recipient %] >- [% CASE 'admin' %]Koha administrator >- [% CASE 'library' %]A librarian >+ [% CASE 'admin' %]<span>Koha administrator</span> >+ [% CASE 'library' %]<span>A librarian</span> > [% END %] > </td> > <td data-order="[% report.created_on | html %]">[% report.created_on | $KohaDates with_hours => 1 %]</td> >@@ -102,10 +102,10 @@ > <td class="status[% report.status | html %]" name="status"> > <span id="status_[% report.reportid | html %]"> > [% SWITCH report.status %] >- [% CASE 'New' %]New >- [% CASE 'Closed' %]Closed >- [% CASE 'Viewed' %]Viewed >- [% CASE %]Unknown status ([% report.status | html %]) >+ [% CASE 'New' %]<span>New</span> >+ [% CASE 'Closed' %]<span>Closed</span> >+ [% CASE 'Viewed' %]<span>Viewed</span> >+ [% CASE %]<span>Unknown status ([% report.status | html %])</span> > [% END %] > </span> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index f5907c032b..635d6f2bbe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -36,15 +36,15 @@ > <div class="dialog [% m.type | html %]" id="quote_action_result_dialog"> > [% SWITCH m.code %] > [% CASE 'error_on_update' %] >- An error occurred when updating this quote. Perhaps it already exists. >+ <span>An error occurred when updating this quote. Perhaps it already exists</span> > [% CASE 'error_on_insert' %] >- An error occurred when adding this quote. >+ <span>An error occurred when adding this quote</span> > [% CASE 'success_on_update' %] >- Quote updated successfully. >+ <span>Quote updated successfully</span> > [% CASE 'success_on_insert' %] >- Quote added successfully. >+ <span>Quote added successfully</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index cdb1ef959c..f7cbcd044c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -65,38 +65,38 @@ > > [% BLOCK translate_log_module %] > [% SWITCH module %] >-[% CASE 'AUTH' %]Authentication[% UNLESS Koha.Preference('AuthFailureLog') || Koha.Preference('AuthScuccessLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >-[% CASE 'CATALOGUING' %]Catalog[% UNLESS Koha.Preference('CataloguingLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'AUTH' %]<span>Authentication</span>[% UNLESS Koha.Preference('AuthFailureLog') || Koha.Preference('AuthScuccessLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'CATALOGUING' %]<span>Catalog</span>[% UNLESS Koha.Preference('CataloguingLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'AUTHORITIES' %]Authorities[% UNLESS Koha.Preference('AuthoritiesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'AUTHORITIES' %]<span>Authorities</span>[% UNLESS Koha.Preference('AuthoritiesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'MEMBERS' %]Patrons[% UNLESS Koha.Preference('BorrowersLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'MEMBERS' %]<span>Patrons</span>[% UNLESS Koha.Preference('BorrowersLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'ACQUISITIONS' %]Acquisitions [% UNLESS Koha.Preference('AcquisitionLog') %]<i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'ACQUISITIONS' %]<span>Acquisitions</span>[% UNLESS Koha.Preference('AcquisitionLog') %]<i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'SERIAL' %]Serials[% UNLESS Koha.Preference('SubscriptionLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'SERIAL' %]<span>Serials</span>[% UNLESS Koha.Preference('SubscriptionLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'HOLDS' %]Holds[% UNLESS Koha.Preference('HoldsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'HOLDS' %]<span>Holds</span>[% UNLESS Koha.Preference('HoldsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'ILL' %]Interlibrary loans[% UNLESS Koha.Preference('IllLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'ILL' %]<span>Interlibrary loans</span>[% UNLESS Koha.Preference('IllLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'CIRCULATION' %]Circulation[% UNLESS Koha.Preference('IssueLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'CIRCULATION' %]<span>Circulation</span>[% UNLESS Koha.Preference('IssueLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'CLAIMS' %]Claims[% UNLESS Koha.Preference('ClaimsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'CLAIMS' %]<span>Claims</span>[% UNLESS Koha.Preference('ClaimsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'FINES' %]Fines[% UNLESS Koha.Preference('FinesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'FINES' %]<span>Fines</span>[% UNLESS Koha.Preference('FinesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'SYSTEMPREFERENCE' %]System prefs >+[% CASE 'SYSTEMPREFERENCE' %]<span>System prefs</span> > >-[% CASE 'CRONJOBS' %]Cron jobs[% UNLESS Koha.Preference('CronjobLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'CRONJOBS' %]<span>Cron jobs</span>[% UNLESS Koha.Preference('CronjobLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'REPORTS' %]Reports[% UNLESS Koha.Preference('ReportsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'REPORTS' %]<span>Reports</span>[% UNLESS Koha.Preference('ReportsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > >-[% CASE 'SEARCHENGINE' %]Search engine >+[% CASE 'SEARCHENGINE' %]<span>Search engine</span> > >-[% CASE 'NOTICES' %]Notices[% UNLESS Koha.Preference('NoticesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >-[% CASE 'NEWS' %]News[% UNLESS Koha.Preference('NewsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >-[% CASE 'RECALLS' %]Recalls[% UNLESS Koha.Preference('RecallsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'NOTICES' %]<span>Notices</span>[% UNLESS Koha.Preference('NoticesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'NEWS' %]<span>News</span>[% UNLESS Koha.Preference('NewsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] >+[% CASE 'RECALLS' %]<span>Recalls</span>[% UNLESS Koha.Preference('RecallsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %] > > [% CASE %][% module | html %] > [% END %] >@@ -104,64 +104,64 @@ > > [% BLOCK translate_log_action %] > [% SWITCH action %] >-[% CASE 'ADD' %]Add >-[% CASE 'DELETE' %]Delete >-[% CASE 'MODIFY' %]Modify >-[% CASE 'ISSUE' %]Checkout >-[% CASE 'RETURN' %]Return >-[% CASE 'CREATE' %]Create >-[% CASE 'CANCEL' %]Cancel >-[% CASE 'FILL' %]Fill >-[% CASE 'RESUME' %]Resume >-[% CASE 'SUSPEND' %]Suspend >-[% CASE 'RENEW' %]Renew >-[% CASE 'RENEWAL' %]Renew >-[% CASE 'CHANGE PASS' %]Change password >-[% CASE 'ADDCIRCMESSAGE' %]Add circulation message >-[% CASE 'DELCIRCMESSAGE' %]Delete circulation message >-[% CASE 'STATUS_CHANGE' %]Change ILL request status >-[% CASE 'PATRON_NOTICE' %]ILL notice sent to patron >-[% CASE 'ADD_BASKET' %]Create an acquisitions basket >-[% CASE 'MODIFY_BASKET' %]Modify an acquisitions basket >-[% CASE 'MODIFY_BASKET_HEADER' %]Modify an acquisitions basket header >-[% CASE 'MODIFY_BASKET_USERS' %]Modify an acquisitions basket's users >-[% CASE 'CLOSE_BASKET' %]Close an acquisitions basket >-[% CASE 'APPROVE_BASKET' %]Approve an acquisitions basket >-[% CASE 'REOPEN_BASKET' %]Reopen an acquisitions basket >-[% CASE 'CANCEL_ORDER' %]Cancel an order >-[% CASE 'CREATE_ORDER' %]Create an order >-[% CASE 'MODIFY_ORDER' %]Modify an order >-[% CASE 'CREATE_INVOICE_ADJUSTMENT' %]Create an invoice adjustment >-[% CASE 'UPDATE_INVOICE_ADJUSTMENT' %]Modify an invoice adjustment >-[% CASE 'DELETE_INVOICE_ADJUSTMENT' %]Delete an invoice adjustment >-[% CASE 'RECEIVE_ORDER' %]Receive an order >-[% CASE 'MODIFY_BUDGET' %]Modify a budget >-[% CASE 'CREATE_FUND' %]Create a fund >-[% CASE 'MODIFY_FUND' %]Modify a fund >-[% CASE 'DELETE_FUND' %]Delete a fund >-[% CASE 'Run' %]Run >-[% CASE 'EDIT_MAPPINGS' %]Edit mappings >-[% CASE 'RESET_MAPPINGS' %]Reset mappings >-[% CASE 'SERIAL CLAIM' %]Serial claim >-[% CASE 'ACQUISITION CLAIM' %]Acquisition claim >-[% CASE 'ACQUISITION ORDER' %]Acquisition order >-[% CASE 'FULFILL' %]Fulfill >-[% CASE 'OVERDUE' %]Overdue >-[% CASE 'EXPIRE' %]Expire >+[% CASE 'ADD' %]<span>Add</span> >+[% CASE 'DELETE' %]<span>Delete</span> >+[% CASE 'MODIFY' %]<span>Modify</span> >+[% CASE 'ISSUE' %]<span>Checkout</span> >+[% CASE 'RETURN' %]<span>Return</span> >+[% CASE 'CREATE' %]<span>Create</span> >+[% CASE 'CANCEL' %]<span>Cancel</span> >+[% CASE 'FILL' %]<span>Fill</span> >+[% CASE 'RESUME' %]<span>Resume</span> >+[% CASE 'SUSPEND' %]<span>Suspend</span> >+[% CASE 'RENEW' %]<span>Renew</span> >+[% CASE 'RENEWAL' %]<span>Renew</span> >+[% CASE 'CHANGE PASS' %]<span>Change password</span> >+[% CASE 'ADDCIRCMESSAGE' %]<span>Add circulation message</span> >+[% CASE 'DELCIRCMESSAGE' %]<span>Delete circulation message</span> >+[% CASE 'STATUS_CHANGE' %]<span>Change ILL request status</span> >+[% CASE 'PATRON_NOTICE' %]<span>ILL notice sent to patron</span> >+[% CASE 'ADD_BASKET' %]<span>Create an acquisitions basket</span> >+[% CASE 'MODIFY_BASKET' %]<span>Modify an acquisitions basket</span> >+[% CASE 'MODIFY_BASKET_HEADER' %]<span>Modify an acquisitions basket header</span> >+[% CASE 'MODIFY_BASKET_USERS' %]<span>Modify an acquisitions basket's users</span> >+[% CASE 'CLOSE_BASKET' %]<span>Close an acquisitions basket</span> >+[% CASE 'APPROVE_BASKET' %]<span>Approve an acquisitions basket</span> >+[% CASE 'REOPEN_BASKET' %]<span>Reopen an acquisitions basket</span> >+[% CASE 'CANCEL_ORDER' %]<span>Cancel an order</span> >+[% CASE 'CREATE_ORDER' %]<span>Create an order</span> >+[% CASE 'MODIFY_ORDER' %]<span>Modify an order</span> >+[% CASE 'CREATE_INVOICE_ADJUSTMENT' %]<span>Create an invoice adjustment</span> >+[% CASE 'UPDATE_INVOICE_ADJUSTMENT' %]<span>Modify an invoice adjustment</span> >+[% CASE 'DELETE_INVOICE_ADJUSTMENT' %]<span>Delete an invoice adjustment</span> >+[% CASE 'RECEIVE_ORDER' %]<span>Receive an order</span> >+[% CASE 'MODIFY_BUDGET' %]<span>Modify a budget</span> >+[% CASE 'CREATE_FUND' %]<span>Create a fund</span> >+[% CASE 'MODIFY_FUND' %]<span>Modify a fund</span> >+[% CASE 'DELETE_FUND' %]<span>Delete a fund</span> >+[% CASE 'Run' %]<span>Run</span> >+[% CASE 'EDIT_MAPPINGS' %]<span>Edit mappings</span> >+[% CASE 'RESET_MAPPINGS' %]<span>Reset mappings</span> >+[% CASE 'SERIAL CLAIM' %]<span>Serial claim</span> >+[% CASE 'ACQUISITION CLAIM' %]<span>Acquisition claim</span> >+[% CASE 'ACQUISITION ORDER' %]<span>Acquisition order</span> >+[% CASE 'FULFILL' %]<span>Fulfill</span> >+[% CASE 'OVERDUE' %]<span>Overdue</span> >+[% CASE 'EXPIRE' %]<span>Expire</span> > [% CASE %][% action | html %] > [% END %] > [% END %] > > [% BLOCK translate_log_interface %] > [% SWITCH log_interface.upper %] >-[% CASE 'INTRANET' %]Intranet >-[% CASE 'OPAC' %]OPAC >-[% CASE 'SIP' %]SIP >-[% CASE 'COMMANDLINE' %]Command-line >-[% CASE 'API' %]REST API >-[% CASE 'CRON' %]Cron job >-[% CASE 'UPGRADE' %]Upgrade >-[% CASE %][% log_interface | html %] >+[% CASE 'INTRANET' %]<span>Intranet</span> >+[% CASE 'OPAC' %]<span>OPAC</span> >+[% CASE 'SIP' %]<span>SIP</span> >+[% CASE 'COMMANDLINE' %]<span>Command-line</span> >+[% CASE 'API' %]<span>REST API</span> >+[% CASE 'CRON' %]<span>Cron job</span> >+[% CASE 'UPGRADE' %]<span>Upgrade</span> >+[% CASE %]<span>[% log_interface | html %]</span> > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt >index 41deaaf85e..f8b986547b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt >@@ -8,11 +8,11 @@ > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'unauthorized' %] >- You do not have permission to view this list. >+ <span>You do not have permission to view this list.</span> > [% CASE 'does_not_exist' %] >- This list does not exist. >+ <span>This list does not exist.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >index 417411ab34..fa89225653 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >@@ -1,6 +1,7 @@ > [% USE raw %] > [% USE KohaDates %] > [% USE To %] >+[% PROCESS 'i18n.inc' %] > { > "sEcho": [% sEcho | html %], > "iTotalRecords": [% iTotalRecords | html %], >@@ -13,13 +14,13 @@ > "dt_shelfname": > "<a href='/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% data.shelfnumber | html %]'>[% data.shelfname | html | $To %]</a>", > "dt_count": >- "[% data.count | html %] item(s)", >+ "[% tnx('{count} item', '{count} items', count, { count = data.count }) | $raw %]", > "dt_is_shared": >- "[% IF data.public %]Public[% ELSIF data.is_shared %]Shared[% ELSE %]Private[% END %]", >+ "[% IF data.public %]<span>Public</span>[% ELSIF data.is_shared %]<span>Shared</span>[% ELSE %]<span>Private</span>[% END %]", > "dt_owner": > "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.owner | html %]'>[% data.firstname | html | $To %] [% data.surname | html | $To %]</a>", > "dt_sortby": >- [% IF data.sortby == "author" %]"Author"[% ELSIF data.sortby == "copyrightdate" %]"Year"[% ELSIF data.sortby == "itemcallnumber" %]"Call number"[% ELSIF data.sortby == "dateadded" %]"Date added"[% ELSE %]"Title"[% END %], >+ [% IF data.sortby == "author" %]"<span>Author</span>"[% ELSIF data.sortby == "copyrightdate" %]"<span>Year</span>"[% ELSIF data.sortby == "itemcallnumber" %]"<span>Call number</span>"[% ELSIF data.sortby == "dateadded" %]"<span>Date added</span>"[% ELSE %]"<span>Title</span>"[% END %], > "dt_created_on": > "[% data.created_on | $KohaDates %]", > "dt_modification_time": >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc >index e4b650fddc..01e3df116e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc >@@ -11,36 +11,36 @@ > > [%- BLOCK debit_type_description -%] > [%- SWITCH debit_type_code -%] >- [%- CASE 'ACCOUNT' -%]Account creation fee >- [%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee >- [%- CASE 'ARTICLE_REQUEST' -%]Article request fee >- [%- CASE 'LOST' -%]Lost item >- [%- CASE 'MANUAL' -%]Manual fee >- [%- CASE 'NEW_CARD' -%]New card >- [%- CASE 'OVERDUE' -%]Fine >- [%- CASE 'PROCESSING' -%]Lost item processing fee >- [%- CASE 'RENT' -%]Rental fee >- [%- CASE 'RENT_DAILY' -%]Daily rental fee >- [%- CASE 'RENT_RENEW' -%]Renewal of rental item >- [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item >- [%- CASE 'RESERVE' -%]Hold fee >- [%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long >- [%- CASE 'Payout' -%]Payout >- [%- CASE -%][% debit_type.description | html %] >+ [%- CASE 'ACCOUNT' -]<span>Account creation fee</span> >+ [%- CASE 'ACCOUNT_RENEW' -]<span>Account renewal fee</span> >+ [%- CASE 'ARTICLE_REQUEST' -]<span>Article request fee</span> >+ [%- CASE 'LOST' -]<span>Lost item</span> >+ [%- CASE 'MANUAL' -]<span>Manual fee</span> >+ [%- CASE 'NEW_CARD' -]<span>New card</span> >+ [%- CASE 'OVERDUE' -]<span>Fine</span> >+ [%- CASE 'PROCESSING' -]<span>Lost item processing fee</span> >+ [%- CASE 'RENT' -]<span>Rental fee</span> >+ [%- CASE 'RENT_DAILY' -]<span>Daily rental fee</span> >+ [%- CASE 'RENT_RENEW' -]<span>Renewal of rental item</span> >+ [%- CASE 'RENT_DAILY_RENEW' -]<span>Renewal of daily rental item</span> >+ [%- CASE 'RESERVE' -]<span>Hold fee</span> >+ [%- CASE 'RESERVE_EXPIRED' -]<span>Hold waiting too long</span> >+ [%- CASE 'Payout' -]<span>Payout</span> >+ [%- CASE -]<span>[% debit_type.description | html %]</span> > [%- END -%] > [%- END -%] > > [%- BLOCK credit_type_description -%] > [%- SWITCH credit_type_code -%] >- [%- CASE 'PAYMENT' -%]Payment >- [%- CASE 'WRITEOFF' -%]Writeoff >- [%- CASE 'FORGIVEN' -%]Forgiven >- [%- CASE 'CREDIT' -%]Credit >- [%- CASE 'LOST_FOUND' -%]Lost item fee refund >- [%- CASE 'OVERPAYMENT' -%]Overpayment refund >- [%- CASE 'REFUND' -%]Refund >- [%- CASE 'CANCELLATION' -%]Cancelled charge >- [%- CASE -%][% credit_type.description | html %] >+ [%- CASE 'PAYMENT' -]<span>Payment</span> >+ [%- CASE 'WRITEOFF' -]<span>Writeoff</span> >+ [%- CASE 'FORGIVEN' -]<span>Forgiven</span> >+ [%- CASE 'CREDIT' -]<span>Credit</span> >+ [%- CASE 'LOST_FOUND' -]<span>Lost item fee refund</span> >+ [%- CASE 'OVERPAYMENT' -]<span>Overpayment refund</span> >+ [%- CASE 'REFUND' -]<span>Refund</span> >+ [%- CASE 'CANCELLATION' -]<span>Cancelled charge</span> >+ [%- CASE -]<span>[% credit_type.description | html %]</span> > [%- END -%] > [%- END -%] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >index 5cf2e6044b..82acd785e4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >@@ -33,13 +33,13 @@ > [% UNLESS ( type=='seefrom' || type=='seealso' ) %] > <span class="type"> > [% SWITCH type %] >- [% CASE 'earlier' %](Earlier heading) >- [% CASE 'later' %](Later heading) >- [% CASE 'acronym' %](Acronym) >- [% CASE 'musical' %](Musical composition) >- [% CASE 'broader' %](Broader heading) >- [% CASE 'narrower' %](Narrower heading) >- [% CASE 'parent' %](Immediate parent body) >+ [% CASE 'earlier' ]<span>(Earlier heading)</span> >+ [% CASE 'later' ]<span>(Later heading)</span> >+ [% CASE 'acronym' ]<span>(Acronym)</span> >+ [% CASE 'musical' ]<span>(Musical composition)</span> >+ [% CASE 'broader' ]<span>(Broader heading)</span> >+ [% CASE 'narrower' ]<span>(Narrower heading)</span> >+ [% CASE 'parent' ]<span>(Immediate parent body)</span> > [% CASE %] > [% IF type %]([% type | html %])[% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >index 1b354fb3b2..b2f08a952e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >@@ -24,13 +24,13 @@ > [% BLOCK authtypelabel %] > [% UNLESS ( type=='seefrom' || type=='seealso' || type=='' ) %] > <span class="type">[% FILTER trim %][% SWITCH type %] >- [% CASE 'earlier' %]Earlier heading >- [% CASE 'later' %]Later heading >- [% CASE 'acronym' %]Acronym >- [% CASE 'musical' %]Musical composition >- [% CASE 'broader' %]Broader heading >- [% CASE 'narrower' %]Narrower heading >- [% CASE %][% type | html %] >+ [% CASE 'earlier' ]<span>Earlier heading</span> >+ [% CASE 'later' ]<span>Later heading</span> >+ [% CASE 'acronym' ]<span>Acronym</span> >+ [% CASE 'musical' ]<span>Musical composition</span> >+ [% CASE 'broader' ]<span>Broader heading</span> >+ [% CASE 'narrower' ]<span>Narrower heading</span> >+ [% CASE ]<span>[% type | html %]</span> > [% END %][% END %]</span> > [% END %] > [% END %] >@@ -60,11 +60,11 @@ > > [% BLOCK language %] > [% SWITCH lang %] >- [% CASE ['en', 'eng'] %]English >- [% CASE ['fr', 'fre'] %]French >- [% CASE ['it', 'ita'] %]Italian >- [% CASE ['de', 'ger', 'deu'] %]German >- [% CASE ['es', 'spa'] %]Spanish >- [% CASE %][% lang | html %] >+ [% CASE ['en', 'eng'] ]<span>English</span> >+ [% CASE ['fr', 'fre'] ]<span>French</span> >+ [% CASE ['it', 'ita'] ]<span>Italian</span> >+ [% CASE ['de', 'ger', 'deu'] ]<span>German</span> >+ [% CASE ['es', 'spa'] ]<span>Spanish</span> >+ [% CASE ]<span>[% lang | html %]</span> > [% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc >index a76406b254..a3cbb23590 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc >@@ -70,15 +70,15 @@ > [% ELSE %] > <a class="dropdown-item" href="/cgi-bin/koha/opac-export.pl?op=export&bib=[% biblio.biblionumber | html %]&format=[% option | html %]"> > [% SWITCH option %] >- [% CASE 'bibtex' %]BIBTEX >- [% CASE 'endnote' %]EndNote >- [% CASE 'marcxml' %]MARCXML >- [% CASE 'marc8' %]MARC (non-Unicode/MARC-8) >- [% CASE 'utf8' %]MARC (Unicode/UTF-8) >- [% CASE 'marcstd' %]MARC (Unicode/UTF-8, Standard) >- [% CASE 'mods' %]MODS (XML) >- [% CASE 'ris' %]RIS >- [% CASE 'isbd' %]ISBD >+ [% CASE 'bibtex' %]<span>BIBTEX</span> >+ [% CASE 'endnote' %]<span>EndNote</span> >+ [% CASE 'marcxml' %]<span>MARCXML</span> >+ [% CASE 'marc8' %]<span>MARC (non-Unicode/MARC-8)</span> >+ [% CASE 'utf8' %]<span>MARC (Unicode/UTF-8)</span> >+ [% CASE 'marcstd' %]<span>MARC (Unicode/UTF-8, Standard)</span> >+ [% CASE 'mods' %]<span>MODS (XML)</span> >+ [% CASE 'ris' %]<span>RIS</span> >+ [% CASE 'isbd' %]<span>ISBD</span> > [% END %] > </a> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc >index b3e93f35ff..42862057e9 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc >@@ -1,16 +1,16 @@ > [% SWITCH code %] > [% CASE 'XSLTH_ERR_NO_FILE' %] >- No XSLT file passed. >+ <span>No XSLT file passed.</span> > [% CASE 'XSLTH_ERR_FILE_NOT_FOUND' %] >- XSLT file not found. >+ <span>XSLT file not found.</span></span> > [% CASE 'XSLTH_ERR_LOADING' %] >- Error while loading stylesheet. >+ <span>Error while loading stylesheet.</span> > [% CASE 'XSLTH_ERR_PARSING_CODE' %] >- Error while parsing stylesheet. >+ <span>Error while parsing stylesheet.</span> > [% CASE 'XSLTH_ERR_PARSING_DATA' %] >- Error while parsing input. >+ <span>Error while parsing input.</span> > [% CASE 'XSLTH_ERR_TRANSFORMING' %] >- Error while transforming input. >+ <span>Error while transforming input.</span> > [% CASE 'XSLTH_NO_STRING_PASSED' %] >- No string to transform. >+ <span>No string to transform.</span> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >index 7341fc520f..6367abd469 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >@@ -42,12 +42,12 @@ > [% SWITCH m.code %] > [% CASE 'success_on_send' %] > [% IF recipient == 'admin' %] >- Your problem report has been sent to the Koha administrator. >+ <span>Your problem report has been sent to the Koha administrator.</span> > [% ELSE %] >- Your problem report has been sent to the library. >+ <span>Your problem report has been sent to the library.</span> > [% END %] > [% CASE 'error_on_send' #We really should avoid reaching this! %] >- Something wrong happened when sending the report. Please contact your library. >+ <span>Something wrong happened when sending the report. Please contact your library.</span> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt >index b29ad7cb37..d11bec9609 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt >@@ -38,8 +38,8 @@ > <h1 class="title">[% biblio.title | html %]</h1> > <div class="alert alert-info"> > [% SWITCH error_message %] >- [% CASE 'article_request_limit_reached' %]You reached your open article requests limit. >- [% CASE 'article_request_unhandled_exception' %]An error has occurred. >+ [% CASE 'article_request_limit_reached' %]<span>You reached your open article requests limit.</span> >+ [% CASE 'article_request_unhandled_exception' %]<span>An error has occurred.</span> > [% END %] > </div> > [% ELSIF biblio.can_article_request( patron ) %] >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 35e0ba94d6..0eb939e176 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >@@ -65,9 +65,9 @@ > <div class="alert alert-[% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'biblio_exists' %] >- A similar document already exists: <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message. >+ <span>A similar document already exists: <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% m.id | uri %]">[% m.title | html %]</a>. Click on "Confirm your suggestion" to ignore this message.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >@@ -287,15 +287,15 @@ > <div class="alert alert-[% m.type | html %]"> > [% SWITCH m.code %] > [% CASE 'total_suggestions' %] >- The suggestion has not been added. You have reached your limit for suggestions you can place at this time ([% Koha.Preference('MaxTotalSuggestions') | html %] in [% Koha.Preference('NumberOfSuggestionDays') | html %] days). >+ <span>The suggestion has not been added. You have reached your limit for suggestions you can place at this time ([% Koha.Preference('MaxTotalSuggestions') | html %] in [% Koha.Preference('NumberOfSuggestionDays') | html %] days).</span> > [% CASE 'too_many' %] >- The suggestion has not been added. You have reached your limit for suggestions you can place at this time ([% Koha.Preference('MaxOpenSuggestions') | html %]). Once the library has processed those suggestions you will be able to place more. >+ <span>The suggestion has not been added. You have reached your limit for suggestions you can place at this time ([% Koha.Preference('MaxOpenSuggestions') | html %]). Once the library has processed those suggestions you will be able to place more.</span> > [% CASE 'already_exists' %] >- The suggestion has not been added. A suggestion with this title already exists. >+ <span>The suggestion has not been added. A suggestion with this title already exists.</span> > [% CASE 'success_on_inserted' %] >- Your suggestion has been submitted. >+ <span>Your suggestion has been submitted.</span> > [% CASE %] >- [% m.code | html %] >+ <span>[% m.code | html %]</span> > [% END %] > </div> > [% END %] >-- >2.35.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 29602
:
128108
|
128109
|
128534
|
128535
|
128542
|
128543
|
130196
|
130197
|
130198
|
130199
|
130200
|
131421
|
131422
|
131423
|
131424
|
131425
|
131934
|
131935
|
131936
|
131937
|
131938
|
133129
|
133130
|
133131
|
133132
|
133133
|
133370
|
133371
|
133372
|
133373
|
133374
|
133381
|
133382
|
133383
|
133384
|
133385
|
133495
|
133521