From 63b62dd2aba3a5a314f5cd22085181a3ea970ed1 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 29 Sep 2020 10:15:11 +0100 Subject: [PATCH] Bug 24975: Use translation_key in preference to description --- .../intranet-tmpl/prog/en/includes/html_helpers.inc | 2 +- .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/admin/smart-rules.tt | 12 ++++++------ .../prog/en/modules/catalogue/advsearch.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 4 ++-- .../en/modules/course_reserves/add_items-step2.tt | 4 ++-- .../en/modules/course_reserves/batch_add_items.tt | 2 +- .../prog/en/modules/reports/acquisitions_stats.tt | 2 +- .../prog/en/modules/reports/bor_issues_top.tt | 2 +- .../prog/en/modules/reports/cat_issues_top.tt | 2 +- .../prog/en/modules/reports/catalogue_out.tt | 2 +- .../prog/en/modules/reports/catalogue_stats.tt | 2 +- .../prog/en/modules/reports/issues_avg_stats.tt | 2 +- .../prog/en/modules/reports/issues_stats.tt | 2 +- .../prog/en/modules/reports/itemslost.tt | 2 +- .../prog/en/modules/reports/reserves_stats.tt | 2 +- .../en/modules/serials/subscription-batchedit.tt | 2 +- .../en/modules/serials/subscription-bib-search.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/export.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- .../bootstrap/en/includes/opac-topissues.inc | 2 +- .../bootstrap/en/modules/opac-readingrecord.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 ++-- 24 files changed, 33 insertions(+), 33 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc index df3b1f7aed..b5fc272eb5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -65,7 +65,7 @@ [% ELSE %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 34b1a0143a..11e06f5ad9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -441,7 +441,7 @@ Item types › Administration › Koha Item type [% itemtype.itemtype | html %] - Description[% ItemTypes.t(itemtype.description) | html %] + Description[% ItemTypes.t(itemtype.translation_key) | html %] [% UNLESS Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') %] Image diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 81dc9a018f..ded3b239a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -398,14 +398,14 @@ [% NEXT IF itemtypeloo.parent_type %] [% SET children = itemtypeloo.children %] [% IF children.count %] - - + + [% FOREACH child IN children %] - + [% END %] [% ELSE %] - + [% END %] [% END %] @@ -1094,7 +1094,7 @@ [% IF holdallowed || hold_fulfillment_policy || returnbranch %] - [% ItemTypes.t(i.description) | html %] + [% ItemTypes.t(i.translation_key) | html %] [% IF holdallowed == 'from_any_library' %] @@ -1139,7 +1139,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 4d9eb1c611..6a53f9c4d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -199,7 +199,7 @@ [% END %]   [% END %] - [% ItemTypes.t(itemtypeloo.description) | html %] + [% ItemTypes.t(itemtypeloo.translation_key) | html %] [% IF ( loop.last ) %] 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 b645229d77..b397221514 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -371,9 +371,9 @@ [% IF ( item_level_itypes ) %] [% IF !noItemTypeImages && item.imageurl %] - [% ItemTypes.t(item.description) | html %] + [% ItemTypes.t(item.translation_key) | html %] [% END %] - [% ItemTypes.t(item.description) | html %] + [% ItemTypes.t(item.translation_key) | html %] [% END %] [% UNLESS ( singlebranchmode ) %][% Branches.GetName( item.branchcode ) | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index 47cc059c7d..0f72f2558a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -80,9 +80,9 @@ [% FOREACH it IN itypes %] [% IF it.itemtype == course_item.itype %] - + [% ELSE %] - + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt index e191546345..bb35096a3e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt @@ -56,7 +56,7 @@ [% FOREACH it IN ItemTypes.Get() %] - + [% END %] 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 f1f19ced81..ec24acb987 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 @@ -219,7 +219,7 @@ 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 fee3a79844..a234cef95f 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 @@ -144,7 +144,7 @@
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt index 4676aeb40d..a1a508e3c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt @@ -121,7 +121,7 @@
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt index 75a83cc0bc..c0e4d27bd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt @@ -113,7 +113,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt index cdcb8afea9..e1f466b376 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt @@ -135,7 +135,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt index e91b63111c..1cdbcaa0dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt @@ -171,7 +171,7 @@ 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 bac52ce40c..eaacb53b14 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 @@ -197,7 +197,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt index a7f69a5dac..a2c8cc56f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt @@ -155,7 +155,7 @@
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt index 2201938e7e..e47fdee52d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt @@ -199,7 +199,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt index 10394c30cc..70ccd25850 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt @@ -119,7 +119,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt index 9288f93cde..53360d29e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt @@ -26,7 +26,7 @@ [%- FOREACH itemtypeloo IN itemtypeloop %] [%- 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 503bdff815..cbfad7f3ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -81,7 +81,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index cfb9a45b34..88dd481cd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -260,7 +260,7 @@ [% END %] [% UNLESS ( item_level_itypes ) %] - [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% ItemTypes.t(itemsloo.description) | html %][% END %][% ItemTypes.t(itemsloo.description) | html %] + [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %][% ItemTypes.t(itemsloo.translation_key) | html %][% END %][% ItemTypes.t(itemsloo.translation_key) | html %] [% END %] [% IF ( itemsloo.XSLTBloc ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc index 26db63fc68..a9678aa316 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc @@ -38,7 +38,7 @@ [% ELSE %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index 39b92c5b18..ff6c09fc19 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -161,7 +161,7 @@ [% END %] [% END %] Item type: - [% ItemTypes.t(issue.description) | html %] + [% ItemTypes.t(issue.translation_key) | html %] Call number: [% issue.itemcallnumber | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 2adb4cce14..06522c4da4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -224,7 +224,7 @@
  • Item type: [% IF ( bibitemloo.imageurl ) %][% END %] - [% ItemTypes.t(bibitemloo.description) | html %] + [% ItemTypes.t(bibitemloo.translation_key) | html %]
    • [% END %] @@ -406,7 +406,7 @@ [% END %] [% END %] - [% ItemTypes.t(itemLoo.description) | html %] + [% ItemTypes.t(itemLoo.translation_key) | html %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 369efc157e..7053266f8e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -384,9 +384,9 @@ [% UNLESS ( item_level_itypes ) %] [% UNLESS ( Koha.Preference('OpacNoItemTypeImages') ) %] - [% ItemTypes.t(itemsloo.description) | html %] + [% ItemTypes.t(itemsloo.translation_key) | html %] [% END %] - [% ItemTypes.t(itemsloo.description) | html %] + [% ItemTypes.t(itemsloo.translation_key) | html %] [% END %] -- 2.20.1