Merge remote-tracking branch 'origin/new/bug_8408'

[srvgit] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / preferences / searching.pref

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 5ff267f..5176d52 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
@@ -5,9 +5,9 @@ Searching:
               choices:
                   yes: "Don't use"
                   no: Use
-            - the Zebra search engine. Searches are very slow on even modest sized collections when Zebra is off.
+            - the Zebra search engine.  It is recommended to use Zebra; the option to not use Zebra is deprecated and is not guaranteed to work.
         -
-            - When Zebra is not in use, translate the following MARC fields to the following indexes (each line should look something like <code>'indexname' =&gt; '100a,245a,500*',</code>):
+            - When Zebra is not in use, translate the following MARC fields to the following indexes (each line should look something like <code>'indexname' =&gt; '100a,245a,500*',</code>)
             - pref: NoZebraIndexes
               type: textarea
               class: list
@@ -62,14 +62,27 @@ Searching:
                   yes: Force
                   no: "Don't force"
             - subject tracings in the OPAC and Staff Client to search only for complete-subfield matches.
+        -
+            - pref: TraceSubjectSubdivisions
+              default: 0
+              choices:
+                  yes: Include
+                  no: "Don't include"
+            - subdivisions for searches generated by clicking on subject tracings.
+        -
+            - pref: UseICU
+              default: 0
+              choices:
+                  yes: Using
+                  no: "Not using"
+            - 'ICU Zebra indexing. Please note: This setting will not affect Zebra indexing, it should only be used to tell Koha that you have activated ICU indexing if you have actually done so, since there is no way for Koha to figure this out on its own.'
     Search Form:
         -
-            - Show checkboxes to search by
+            - Show tabs in OPAC and staff-side advanced search for limiting searches on the
             - pref: AdvancedSearchTypes
-              choices:
-                  itemtypes: itemtype
-                  ccode: collection code
-            - on the OPAC and staff advanced search pages.
+              class: long
+            - "fields (separate values with |). Tabs appear in the order listed.<br/>"
+            - "<em>Currently supported values</em>: Item types (<strong>itemtypes</strong>), Collection Codes (<strong>ccode</strong>) and Shelving Location (<strong>loc</strong>)."
         -
             - By default,
             - pref: expandedSearchOption
@@ -86,7 +99,7 @@ Searching:
               choices:
                   relevance: relevance
                   popularity: total number of checkouts
-                  callnumber: call number
+                  call_number: call number
                   pubdate: date of publication
                   acqdate: date added
                   title: title
@@ -99,6 +112,14 @@ Searching:
                   az: from A to Z.
                   za: from Z to A.
         -
+            - pref: displayFacetCount
+              type: boolean
+              default: no
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - facet counts. The relevance of these numbers highly depends on the value of the maxRecordsForFacets preference. Applies to OPAC and staff interface.
+        -
             - By default, show
             - pref: numSearchResults
               class: integer
@@ -110,7 +131,7 @@ Searching:
               choices:
                   relevance: relevance
                   popularity: total number of checkouts
-                  callnumber: call number
+                  call_number: call number
                   pubdate: date of publication
                   acqdate: date added
                   title: title
@@ -129,6 +150,12 @@ Searching:
               class: integer
             - items per biblio in the search results
         -
+            - Build facets based on
+            - pref: maxRecordsForFacets
+              class: integer
+              default: 20
+            - records from the search results.
+        -
             - By default, show
             - pref: OPACnumSearchResults
               class: integer
@@ -139,4 +166,9 @@ Searching:
               choices:
                   yes: Show
                   no: "Don't show"
-            - "an item's branch, location and call number in OPAC search results."
+            - "an item's library, location and call number in OPAC search results."
+        -
+            - Truncate facets length to
+            - pref: FacetLabelTruncationLength
+              class: integer
+            - characters, in OPAC/staff interface.