Attachment 112423 Details for Bug 24083 – Bug 24083: (follow-up) Fix QA issues

[patch] Bug 24083: (follow-up) Fix QA issues

Bug-24083-follow-up-Fix-QA-issues.patch (text/plain), 8.18 KB, created by Katrin Fischer on 2020-10-24 23:53:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-10-24 23:53:23 UTC

Size: 8.18 KB

patch

obsolete

>From 71d2e2d34fee906509f8d4e1a14b8a086298d927 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Fri, 23 Oct 2020 11:01:27 +0100
>Subject: [PATCH] Bug 24083: (follow-up) Fix QA issues
>
>This commit fixes items 1 & 2 descibed by Katrin in comment #74 ->
>comment #76.
>
>- Fixed missing check for too_unseen in opac-user.tt, this test did used
>to exist but got lost during sizeable rebase a few weeks ago :-(
>- Added test for too_unseen to all AUTO_RENEWAL notice templates apart
>from de-DE (as previously requested by Katrin)
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> installer/data/mysql/en/mandatory/sample_notices.yml         | 2 ++
> installer/data/mysql/fr-CA/obligatoire/sample_notices.sql    | 2 ++
> installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql  | 2 ++
> installer/data/mysql/it-IT/necessari/notices.sql             | 2 ++
> installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 ++
> installer/data/mysql/pl-PL/mandatory/sample_notices.sql      | 2 ++
> installer/data/mysql/ru-RU/mandatory/sample_notices.sql      | 2 ++
> installer/data/mysql/uk-UA/mandatory/sample_notices.sql      | 2 ++
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt        | 2 ++
> 9 files changed, 18 insertions(+)
>
>diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
>index 50bb421386..547f7cba09 100644
>--- a/installer/data/mysql/en/mandatory/sample_notices.yml
>+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
>@@ -1204,6 +1204,8 @@ tables:
>             - "It's too late to renew this item."
>             - "[% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]"
>             - "Your total unpaid fines are too high."
>+            - "[% ELSIF checkout.auto_renew_error == 'too_unseen' %]"
>+            - "This item must be renewed at the library."
>             - "[% END %]"
>             - "[% ELSE %]"
>             - "The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]"
>diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>index 1a231dd12e..45930e1d82 100644
>--- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>+++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>@@ -285,6 +285,8 @@ You have overdue items.
> It\'s too late to renew this item.
> [% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]
> Your total unpaid fines are too high.
>+[% ELSIF checkout.auto_renew_error == 'too_unseen' %]
>+This item must be renewed at the library.
> [% END %]
> [% ELSE %]
> The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]
>diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>index f844c90b2a..e03e90bbb6 100644
>--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>@@ -396,6 +396,8 @@ You have overdue items.
> It\'s too late to renew this item.
> [% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]
> Your total unpaid fines are too high.
>+[% ELSIF checkout.auto_renew_error == 'too_unseen' %]
>+This item must be renewed at the library.
> [% END %]
> [% ELSE %]
> The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]
>diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql
>index 9be907b0b5..f840c8bd91 100644
>--- a/installer/data/mysql/it-IT/necessari/notices.sql
>+++ b/installer/data/mysql/it-IT/necessari/notices.sql
>@@ -399,6 +399,8 @@ You have overdue items.
> It\'s too late to renew this item.
> [% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]
> Your total unpaid fines are too high.
>+[% ELSIF checkout.auto_renew_error == 'too_unseen' %]
>+This item must be renewed at the library.
> [% END %]
> [% ELSE %]
> The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]
>diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>index e3564ffb1d..a24c56b225 100644
>--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>@@ -414,6 +414,8 @@ You have overdue items.
> It\'s too late to renew this item.
> [% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]
> Your total unpaid fines are too high.
>+[% ELSIF checkout.auto_renew_error == 'too_unseen' %]
>+This item must be renewed at the library.
> [% END %]
> [% ELSE %]
> The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]
>diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>index f228b5c68d..22d00e5a1c 100644
>--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>@@ -393,6 +393,8 @@ You have overdue items.
> It\'s too late to renew this item.
> [% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]
> Your total unpaid fines are too high.
>+[% ELSIF checkout.auto_renew_error == 'too_unseen' %]
>+This item must be renewed at the library.
> [% END %]
> [% ELSE %]
> The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]
>diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>index 27f002b195..1058414e2c 100644
>--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>@@ -395,6 +395,8 @@ You have overdue items.
> It\'s too late to renew this item.
> [% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]
> Your total unpaid fines are too high.
>+[% ELSIF checkout.auto_renew_error == 'too_unseen' %]
>+This item must be renewed at the library.
> [% END %]
> [% ELSE %]
> The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]
>diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>index 17bd9f7606..3c275d3ffb 100644
>--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>@@ -486,6 +486,8 @@ You have overdue items.
> It\'s too late to renew this item.
> [% ELSIF checkout.auto_renew_error == 'auto_too_much_oweing' %]
> Your total unpaid fines are too high.
>+[% ELSIF checkout.auto_renew_error == 'too_unseen' %]
>+This item must be renewed at the library.
> [% END %]
> [% ELSE %]
> The following item, [% biblio.title %], has correctly been renewed and is now due on [% checkout.date_due | $KohaDates as_due_date => 1 %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index 81883c336e..879182ed27 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -378,6 +378,8 @@
>                                                             Not renewable <span class="renewals">(on hold)</span>
>                                                         [% ELSIF ( ISSUE.too_many ) %]
>                                                             Not renewable
>+                                                        [% ELSIF ( ISSUE.too_unseen ) %]
>+                                                            Item must be renewed at the library. [% ISSUE.renewsleft | html %] renewals remaining
>                                                         [% ELSIF ( ISSUE.norenew_overdue ) %]
>                                                             Not allowed <span class="renewals">(overdue)</span>
>                                                         [% ELSIF ( ISSUE.auto_too_late ) %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24083: 95861 | 95862 | 95863 | 95864 | 95865 | 95866 | 95867 | 95868 | 98749 | 98750 | 98751 | 98752 | 98765 | 98766 | 98767 | 98768 | 100244 | 100245 | 100246 | 100247 | 100380 | 100381 | 100382 | 100383 | 100392 | 110607 | 110608 | 110609 | 110610 | 110611 | 111147 | 111148 | 111149 | 111150 | 111151 | 111152 | 111283 | 111284 | 111285 | 111286 | 111287 | 111288 | 111289 | 111290 | 111291 | 111292 | 111293 | 111849 | 111850 | 111851 | 111852 | 111853 | 111854 | 111855 | 111856 | 111857 | 111858 | 111859 | 111860 | 112230 | 112231 | 112232 | 112233 | 112234 | 112235 | 112236 | 112237 | 112238 | 112239 | 112240 | 112241 | 112242 | 112243 | 112410 | 112411 | 112412 | 112413 | 112414 | 112415 | 112416 | 112417 | 112418 | 112419 | 112420 | 112421 | 112422 | 112423 | 113073 | 113074 | 113075 | 113076 | 113077 | 113078 | 113079 | 113080 | 113314 | 113315 | 113484 | 113485 | 113486 | 113487 | 113488 | 113489 | 113490 | 113491 | 113492 | 113493 | 113494 | 113546 | 113556 | 113557 | 113814