From 5489e1c6e76d1fd519b1c1f3341750f3b49d2c8f 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 | 4 ++-- .../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, 34 insertions(+), 34 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 c8d655b03ce..217a38e3327 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 224a9d98c41..6722570bfd1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -424,7 +424,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 fdda51e14bc..3e1eba4ca21 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 @@ -416,14 +416,14 @@ [% NEXT IF itemtypeloo.parent_type %] [% SET children = itemtypeloo.children %] [% IF children.count %] - - + + [% FOREACH child IN children %] - + [% END %] [% ELSE %] - + [% END %] [% END %] @@ -1285,7 +1285,7 @@ [% IF holdallowed || hold_fulfillment_policy || returnbranch %] - [% ItemTypes.t(i.description) | html %] + [% ItemTypes.t(i.translation_key) | html %] [% IF holdallowed == 'from_any_library' %] @@ -1330,7 +1330,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 14bdfe7a184..1492068efed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -240,7 +240,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 31c819abaf5..e8c92075631 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -403,9 +403,9 @@ [% SET itemtype = item.itemtype %] [% IF !noItemTypeImages && itemtype.image_location('intranet') %] - [% ItemTypes.t(itemtype.description) | html %] + [% ItemTypes.t(itemtype.translation_key) | html %] [% END %] - [% ItemTypes.t(item.description) | html %] + [% ItemTypes.t(item.translation_key) | html %] [% END %] [% UNLESS ( singlebranchmode ) %][% Branches.GetName( item.holdingbranch ) | 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 3ada0cc7d61..6edf537fe0a 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 @@ -89,9 +89,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 5b213a3c110..d18c13002ed 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 @@ -57,7 +57,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 cc103edfb72..56b5437f36d 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 @@ -214,7 +214,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 b4990889075..e365903c925 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 @@ -139,7 +139,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 16014bf81ed..8e8a6e93e58 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 @@ -118,7 +118,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 c13c5330506..ca9c9db0d38 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 @@ -169,7 +169,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 32dbffa5491..368a01cfb47 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 @@ -138,7 +138,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 5f2447887b5..a852db945cc 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 @@ -174,7 +174,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 c6b7095a0e4..2ed05bdd202 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 @@ -199,7 +199,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 0c34d76114f..042cdf83e97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt @@ -158,7 +158,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 52ebc49495c..9f3262f8c10 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 @@ -202,7 +202,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 f3868da1856..9baec3af2cc 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 @@ -122,7 +122,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 7b87cc75d2c..de2af58d03a 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 0b832bd2502..2bc73dd7bb6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -88,7 +88,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 0c679e3ce9c..69b8294622d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -332,9 +332,9 @@ [% UNLESS ( item_level_itypes ) %] [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %] - [% ItemTypes.t(itemsloo.description) | html %] + [% ItemTypes.t(itemsloo.translation_key) | html %] [% END %] - [% ItemTypes.t(itemsloo.description) | html %] + [% ItemTypes.t(itemsloo.translation_key) | html %] [% END %] 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 d6a52e51b2c..ce5ff97d102 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 66d9c7c1c9a..b2a7942aa23 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -169,7 +169,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 031f7bf4bbb..e486da3e249 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -232,7 +232,7 @@
  • Item type: [% IF ( bibitemloo.imageurl ) %][% END %] - [% ItemTypes.t(bibitemloo.description) | html %] + [% ItemTypes.t(bibitemloo.translation_key) | html %]
  • [% END %] @@ -421,7 +421,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 16b2b52d2d6..fe41b1e1bf8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -398,9 +398,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.25.1