From c5a246096ea992671dc1bf5504ab7842dd68ab61 Mon Sep 17 00:00:00 2001 From: Alexis Ripetti <alexis.ripetti@inLibro.com> Date: Wed, 2 Dec 2020 14:41:57 -0500 Subject: [PATCH] Bug 27136 - Add languages and avoid displaying nothing in facet Signed-off-by: Alexis Ripetti <alexis.ripetti@inLibro.com> --- .../bz27136-Add_languages_for_facet.pl | 35 +++++++++++++++++++ .../intranet-tmpl/prog/en/includes/facets.inc | 4 +-- .../bootstrap/en/includes/opac-facets.inc | 4 +-- 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bz27136-Add_languages_for_facet.pl diff --git a/installer/data/mysql/atomicupdate/bz27136-Add_languages_for_facet.pl b/installer/data/mysql/atomicupdate/bz27136-Add_languages_for_facet.pl new file mode 100644 index 0000000000..293b1d09c3 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bz27136-Add_languages_for_facet.pl @@ -0,0 +1,35 @@ +use Modern::Perl; + +return { + bug_number => "27136", + description => "Add missing language information for facets", + up => sub { + my ($args) = @_; + my ($dbh, $out) = @$args{qw(dbh out)}; + $dbh->do(q{ INSERT INTO language_subtag_registry (subtag, type, description, added) VALUES ('cr', 'language', 'Cree', now()) }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('cr', 'language', 'en', 'Cree') }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('cr', 'language', 'fr', 'Cree') }); + $dbh->do(q{ INSERT INTO language_rfc4646_to_iso639 (rfc4646_subtag, iso639_2_code) VALUES ('cr', 'cre') }); + + $dbh->do(q{ INSERT INTO language_subtag_registry (subtag, type, description, added) VALUES ('af', 'language', 'Afrikaans', now()) }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('af', 'language', 'en', 'Afrikaans') }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('af', 'language', 'fr', 'Afrikaans') }); + $dbh->do(q{ INSERT INTO language_rfc4646_to_iso639 (rfc4646_subtag, iso639_2_code) VALUES ('af', 'afr') }); + + $dbh->do(q{ INSERT INTO language_subtag_registry (subtag, type, description, added) VALUES ('mul', 'language', 'Multiple languages', now()) }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('mul', 'language', 'en', 'Multiple languages') }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('mul', 'language', 'fr', 'Multilingue') }); + $dbh->do(q{ INSERT INTO language_rfc4646_to_iso639 (rfc4646_subtag, iso639_2_code) VALUES ('mul', 'mul') }); + + $dbh->do(q{ INSERT INTO language_subtag_registry (subtag, type, description, added) VALUES ('und', 'language', 'Undetermined', now()) }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('und', 'language', 'en', 'Undetermined') }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('und', 'language', 'fr', 'Indéterminée') }); + $dbh->do(q{ INSERT INTO language_rfc4646_to_iso639 (rfc4646_subtag, iso639_2_code) VALUES ('und', 'und') }); + + $dbh->do(q{ INSERT INTO language_subtag_registry (subtag, type, description, added) VALUES ('zxx', 'language', 'No linguistic content', now()) }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('zxx', 'language', 'en', 'No linguistic content') }); + $dbh->do(q{ INSERT INTO language_descriptions (subtag, type, lang, description) VALUES ('zxx', 'language', 'fr', 'Pas de contenu linguistique') }); + $dbh->do(q{ INSERT INTO language_rfc4646_to_iso639 (rfc4646_subtag, iso639_2_code) VALUES ('zxx', 'zxx') }); + say $out "Added missing languages"; + }, +}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index d31ade3d23..ce20e77a3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -43,11 +43,11 @@ [% END %] [% IF facet.active %] [% local_url = BLOCK %][% url | $raw %][% "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %] - <span class="facet-label">[% facet.facet_label_value | html %]</span> + <span class="facet-label">[% IF (facet.facet_label_value) %][% facet.facet_label_value | html %][% ELSE %]No information provided[% END %]</span> [<a href="[% local_url | $raw %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>] [% ELSE %] [% local_url = BLOCK %][% url | $raw %][% "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %] - <span class="facet-label"><a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span> + <span class="facet-label"><a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% IF (facet.facet_label_value) %][% facet.facet_label_value | html %][% ELSE %]No information provided[% END %]</a></span> [% IF ( displayFacetCount ) %] <span class="facet-count"> ([% facet.facet_count | html %])</span> [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc index 5e6e638c0b..dbac676048 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc @@ -52,14 +52,14 @@ [% END %] [% IF facet.active %] [% local_url = BLOCK %][% url | $raw %][% "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %] - <span class="facet-label">[% facet.facet_label_value | html %]</span> + <span class="facet-label">[% IF (facet.facet_label_value) %][% facet.facet_label_value | html %][% ELSE %]No information provided[% END %]</span> [% IF ( displayFacetCount ) %] <span class="facet-count-selected">([% facet.facet_count | html %])</span> [% END %] [<a href="[% local_url | $raw %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>] [% ELSE %] [% local_url = BLOCK %][% url | $raw %][% "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %] - <span class="facet-label"><a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span> + <span class="facet-label"><a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% IF (facet.facet_label_value) %][% facet.facet_label_value | html %][% ELSE %]No information provided[% END %]</a></span> [% IF ( displayFacetCount ) %] <span class="facet-count"> ([% facet.facet_count | html %])</span> [% END %] -- 2.25.1