Bug 27519: Normalize Show/Don't show in system preferences

Replace Display/Don't display (and some other pairs) by Show/Don't show in system preferences.

Test plan:
1- Go to administration > system preferences
2- View any system preference with Display/Don't display pair of options
(e.g. OPACAcquisitionDetails)
3- Apply the patch
4- Refresh the page and notice it is now a Show/Don't show pair instead
5- Loop the steps with other system preferences until satisfied

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index 2eab55a..593c8c3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -35,12 +35,12 @@ Administration:
                   1: Some
                   2: All
         -
-            - "Show itemtype icons in the staff interface: "
             - pref: noItemTypeImages
               default: 0
               choices:
-                  1: "No"
-                  0: "Yes"
+                  1: "Don't show"
+                  0: "Show"
+            - "itemtype icons in the staff interface."
         -
             - "Default separator for columns in an exported CSV file: "
             - pref: CSVDelimiter

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
index 5be3a58..73e7f17 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
@@ -4,8 +4,8 @@ Authorities:
             - pref: AuthDisplayHierarchy
               default: no
               choices:
-                  1: Display
-                  0: "Don't display"
+                  1: Show
+                  0: "Don't show"
             - broader term/narrower term hierarchies when viewing authorities.
         -
             - Use the following text to edit how authority records control indicators of attached bibliographic fields (and possibly subfield $2).<br>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index 86840ef..41399d7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -9,14 +9,14 @@ Cataloging:
         -
             - pref: advancedMARCeditor
               choices:
-                  1: "Don't display"
-                  0: Display
+                  1: "Don't show"
+                  0: Show
             - descriptions of fields and subfields in the MARC editor.
         -
             - pref: EasyAnalyticalRecords
               choices:
-                  1: Display
-                  0: "Don't display"
+                  1: Show
+                  0: "Don't show"
             - "easy ways to create analytical record relationships."
         -
             - pref: EnableAdvancedCatalogingEditor
@@ -59,8 +59,8 @@ Cataloging:
         -
             - pref: SpineLabelShowPrintOnBibDetails
               choices:
-                  1: Display
-                  0:  "Don't display"
+                  1: Show
+                  0:  "Don't show"
             - buttons on the bibliographic details page to print item spine labels.
         -
     Record structure:
@@ -192,8 +192,8 @@ Cataloging:
         -
             - pref: hide_marc
               choices:
-                  1: "Don't display"
-                  0: Display
+                  1: "Don't show"
+                  0: Show
             - MARC tag numbers, subfield codes and indicators in MARC views.
         -
             - pref: LabelMARCView
@@ -255,8 +255,8 @@ Cataloging:
         -
             - pref: AcquisitionDetails
               choices:
-                  1: Display
-                  0: "Don't display"
+                  1: Show
+                  0: "Don't show"
             - acquisition details on the bibliographic record detail page.
         -
             - "Show the following fields for deleted records after a merge:"

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
index b35984c..c53b356 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
@@ -286,14 +286,14 @@ Enhanced content:
         -
             - pref: LocalCoverImages
               choices:
-                  1: Display
-                  0: "Don't display"
+                  1: Show
+                  0: "Don't show"
             - local cover images on staff interface search and details pages.
         -
             - pref: OPACLocalCoverImages
               choices:
-                  1: Display
-                  0: "Don't display"
+                  1: Show
+                  0: "Don't show"
             - local cover images on OPAC search and details pages.
         -
             - pref: AllowMultipleCovers
@@ -304,13 +304,13 @@ Enhanced content:
         -
             - pref: CustomCoverImages
               choices:
-                  1: Display
-                  0: "Don't display"
+                  1: Show
+                  0: "Don't show"
             - "custom remote URL images in the staff interface.<br/>"
             - pref: OPACCustomCoverImages
               choices:
-                  1: Display
-                  0: "Don't display"
+                  1: Show
+                  0: "Don't show"
             - "custom remote URL images at the OPAC.<br/>"
             - "Using the following URL:"
             - pref: CustomCoverImagesURL

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index c582908..ea9e864 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -102,12 +102,12 @@ OPAC:
               class: file
             - '<br />Options:<ul><li>Enter "<a href="#" class="set_syspref" data-syspref="OPACXSLTDetailsDisplay" data-value="default">default</a>" for the default stylesheet</li><li>Put a path to define an xslt file</li><li>Put a URL for an external specific stylesheet.</li><li>NOTE: The system preference <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=PassItemMarcToXSLT">PassItemMarcToXSLT</a> must be enabled if your custom stylesheet utilizes data in the item fields</li></ul>If you have multiple stylesheets for different languages the placeholder {langcode} will be replaced with current interface language.'
         -
-            - "Show itemtype icons in the OPAC: "
             - pref: OpacNoItemTypeImages
               default: 0
               choices:
-                  1: "No"
-                  0: "Yes"
+                  1: "Don't show"
+                  0: "Show"
+            - "itemtype icons in the OPAC."
         -
             - pref: DisplayOPACiconsXSLT
               choices:
@@ -449,7 +449,7 @@ OPAC:
             - pref: ShowReviewerPhoto
               choices:
                   1: Show
-                  0: Hide
+                  0: Don't show
             - reviewer's avatar beside comments in OPAC. The avatar will be searched on <a href="https://www.libravatar.org" target="_blank">Libravatar</a> using the patron's e-mail address.
         -
             - pref: OPACHoldRequests
@@ -490,8 +490,8 @@ OPAC:
             - pref: OPACPopupAuthorsSearch
               default: 0
               choices:
-                1: Display
-                0: Don't display
+                1: Show
+                0: Don't show
             - the list of authors/subjects in a popup for a combined search on OPAC detail pages.
         -
             - pref: OpacHoldNotes
@@ -504,15 +504,15 @@ OPAC:
             - pref: OPACAcquisitionDetails
               default: 0
               choices:
-                  1: Display
-                  0: Don't display
+                  1: Show
+                  0: Don't show
             - the acquisition details on OPAC detail pages.
         -
             - pref: OpacNewsLibrarySelect
               default: 0
               choices:
-                  1: Display
-                  0: Don't display
+                  1: Show
+                  0: Don't show
             - a library selection list for news items in the OPAC.
         -
             - pref: OPACSuggestionAutoFill
@@ -841,8 +841,8 @@ OPAC:
         -
             - pref: PatronSelfRegistrationPrefillForm
               choices:
-                  1: "Display and prefill"
-                  0: "Don't display and prefill"
+                  1: "Show and prefill"
+                  0: "Don't show and prefill"
             - "password and login form after a patron has self registered."
         -
             - pref: PatronSelfRegistrationConfirmEmail

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
index 5496b52..69619fd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
@@ -272,8 +272,8 @@ Searching:
         -
             - pref: BiblioItemtypeInfo
               choices:
-                  1: "Display"
-                  0: "Don't display"
+                  1: "Show"
+                  0: "Don't show"
             - ' Koha record level itemtype info on detail and result pages in the OPAC and staff interface. This info also displays if the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=item-level_itypes">item-level_itypes</a> system preference is set to bibliographic record.'
         -
             - pref: PassItemMarcToXSLT