Attachment 106901 Details for Bug 16371 – Bug 16371: Fix QA issues, change terminology

[patch] Bug 16371: Fix QA issues, change terminology

Bug-16371-Fix-QA-issues-change-terminology.patch (text/plain), 3.26 KB, created by Katrin Fischer on 2020-07-15 06:35:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-07-15 06:35:15 UTC

Size: 3.26 KB

patch

obsolete

>From c02ee9d767c73018b54b6b2708a53284340a376e Mon Sep 17 00:00:00 2001
>From: Emmi Takkinen <emmi.takkinen@outlook.com>
>Date: Thu, 9 Jul 2020 11:55:03 +0300
>Subject: [PATCH] Bug 16371: Fix QA issues, change terminology
>
>Sponsored-by: Koha-Suomi Oy
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> Koha/Quote.pm                                                       | 4 ++--
> Koha/Quotes.pm                                                      | 4 ++++
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt            | 2 +-
> 4 files changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/Koha/Quote.pm b/Koha/Quote.pm
>index f79cf79c3f..244aea0673 100644
>--- a/Koha/Quote.pm
>+++ b/Koha/Quote.pm
>@@ -113,7 +113,7 @@ sub get_daily_quote {
> 
> Is a wrapper for get_daily_quote(), with an extra check for using the correct
> interface defined in the syspref 'QuoteOfTheDay'.
>-If the current interface is not allowed to display quotes, then returns undef.
>+If the current interface is not allowed to display quotes, then returns nothing.
> 
> =cut
> 
>@@ -126,7 +126,7 @@ sub get_daily_quote_for_interface {
>         Koha::Exceptions::UnknownProgramState->throw(error => $cc[3]."()> C4::Context->interface() is not set! Don't know are you in OPAC or staff client?");
>     }
>     unless ($qotdPref =~ /$interface/) {
>-        return undef;
>+        return;
>     }
> 
>     return $self->get_daily_quote(%opts);
>diff --git a/Koha/Quotes.pm b/Koha/Quotes.pm
>index 0fe2e167f5..6a9d83af58 100644
>--- a/Koha/Quotes.pm
>+++ b/Koha/Quotes.pm
>@@ -41,6 +41,10 @@ sub _type {
>     return 'Quote';
> }
> 
>+=head3 object_class
>+
>+=cut
>+
> sub object_class {
>     return 'Koha::Quote';
> }
>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 6f1b28aadd..dd2faa4c92 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -518,7 +518,7 @@ OPAC:
>             - Show quote of the day in the
>             - pref: QuoteOfTheDay
>               multiple:
>-                intranet: staff client
>+                intranet: staff interface
>                 opac: OPAC
>             - main page.
>         -
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>index 24d8aa499c..882a446ff1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>@@ -38,7 +38,7 @@
>                     <div id="area-news">
>                         <h3>Quote of the Day</h3>
>                         <div class="newsitem">
>-                            <span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span>
>+                            <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
>                         </div>
>                     </div>
>                 [% END %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 16371: 102515 | 102516 | 102517 | 102969 | 103019 | 103329 | 103330 | 103331 | 103332 | 103333 | 103334 | 103732 | 103973 | 103974 | 103975 | 103976 | 103977 | 103978 | 103979 | 106818 | 106819 | 106820 | 106858 | 106859 | 106860 | 106861 | 106862 | 106863 | 106864 | 106865 | 106866 | 106867 | 106868 | 106894 | 106895 | 106896 | 106897 | 106898 | 106899 | 106900 | 106901 | 106902 | 106903 | 108097 | 108098 | 108160 | 108163