@@ -, +, @@ 1 - Set UseICU to 'Using' 2 - Go to the details page of a record in the staff interface 3 - Hover over a subject heading that has subfields 4 - Note the link has curly brackets around the subject, like: http://localhost:8081/cgi-bin/koha/catalogue/search.pl?q=su:{Winnie-the-Pooh Fictitious character} 5 - Change UseICU to 'Not using' 6 - Note the link is now: http://localhost:8081/cgi-bin/koha/catalogue/search.pl?q=su:"Winnie-the-Pooh Fictitious character" 7 - Repeat on OPAC 8 - Apply patch 9 - Restart all --- C4/UsageStats.pm | 2 +- C4/XSLT.pm | 2 +- .../Bug_27581-rename-UseICU-to-UseICUStyleQuotes.perl | 5 +++++ installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/searching.pref | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 5 +++++ .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 4 ++-- .../intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 4 ++-- 10 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/Bug_27581-rename-UseICU-to-UseICUStyleQuotes.perl --- a/C4/UsageStats.pm +++ a/C4/UsageStats.pm @@ -298,7 +298,7 @@ sub BuildReport { QueryWeightFields TraceCompleteSubfields TraceSubjectSubdivisions - UseICU + UseICUStyleQuotes defaultSortField displayFacetCount OPACdefaultSortField --- a/C4/XSLT.pm +++ a/C4/XSLT.pm @@ -164,7 +164,7 @@ sub get_xslt_sysprefs { my $sysxml = "\n"; foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText viewISBD - OPACBaseURL TraceCompleteSubfields UseICU + OPACBaseURL TraceCompleteSubfields UseICUStyleQuotes UseAuthoritiesForTracings TraceSubjectSubdivisions Display856uAsImage OPACDisplay856uAsImage UseControlNumber IntranetBiblioDefaultView BiblioDefaultView --- a/installer/data/mysql/atomicupdate/Bug_27581-rename-UseICU-to-UseICUStyleQuotes.perl +++ a/installer/data/mysql/atomicupdate/Bug_27581-rename-UseICU-to-UseICUStyleQuotes.perl @@ -0,0 +1,5 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "UPDATE systempreferences SET variable = 'UseICUStyleQUotes' WHERE variable = 'UseICU'" ); + NewVersion( $DBversion, 27581, "Rename UseICU to UseICUStyleQuotes"); +} --- a/installer/data/mysql/mandatory/sysprefs.sql +++ a/installer/data/mysql/mandatory/sysprefs.sql @@ -707,7 +707,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('useDefaultReplacementCost', '0', NULL, 'default replacement cost defined in item type', 'YesNo'), ('useDischarge','','','Allows librarians to discharge borrowers and borrowers to request a discharge','YesNo'), ('UseEmailReceipts','0','','Send email receipts for payments and write-offs','YesNo'), -('UseICU','0','1','Tell Koha if ICU indexing is in use for Zebra or not.','YesNo'), +('UseICUStyleQuotes','0','1','Tell Koha whether to use ICU style quotes ({) or default (") when tracing subjects .','YesNo'), ('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'), ('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'), ('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref @@ -59,12 +59,12 @@ Searching: no: "Don't include" - subdivisions for searches generated by clicking on subject tracings. - - - pref: UseICU + - pref: UseICUStyleQuotes 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.' + yes: Use + no: "Don't use" + - 'ICU style quotes ({}) when tracing subjects. The default is to use standard quotes ("").' - - pref: IncludeSeeFromInSearches default: 0 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -79,6 +79,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }   Status Term + Suggested by Weight Actions [% UNLESS ( filter_approved_pending ) %]Reviewer[% END %] @@ -113,6 +114,10 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% END %] [% tagloo.term | html %] + + + Suggested by: [% INCLUDE 'patron-title.inc' patron=tagloo.borrowernumber hide_patron_infos_if_needed=1 invert_name=1 %] + [% tagloo.weight_total | html %] --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -30,13 +30,13 @@ - { + { " - } + } " --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl +++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl @@ -25,13 +25,13 @@ - { + { " - } + } " --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -33,13 +33,13 @@ - { + { " - } + } " --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl +++ a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl @@ -23,13 +23,13 @@ - { + { " - } + } " --