Attachment 96316 Details for Bug 22381 – Bug 22381: Change wording on Calendar-related system

[patch] Bug 22381: Change wording on Calendar-related system

Bug-22381-Change-wording-on-Calendar-related-syste.patch (text/plain), 3.99 KB, created by Jonathan Druart on 2019-12-16 11:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2019-12-16 11:30:09 UTC

Size: 3.99 KB

patch

obsolete

>From 176ee1e578259044cf43e4d0dab055348f19aa19 Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Wed, 4 Dec 2019 23:49:31 +0000
>Subject: [PATCH] Bug 22381: Change wording on Calendar-related system
>
>TEST PLAN:
>1. Apply Patch
>2. Look at the 5 sysprefs (useDaysMode, OverdueNoticeCalendar, finesCalendar, ExcludeHolidaysFromMaxPickUpDelay, SuspensionsCalendar)
>3. Make sure the wording and options all make sense
>4. Make sure the options are properly ignoring or using the calendar.
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Fixed double 'when' on line 740
>No errors
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../en/modules/admin/preferences/circulation.pref  | 28 +++++++++++-----------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>index e949eac982..801c2c7614 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>@@ -280,13 +280,13 @@ Circulation:
>                   homebranch: the library the item is from.
>                   holdingbranch: the library the item is held by.
>         -
>-            - Calculate the due date using 
>             - pref: useDaysMode
>               choices:
>-                  Days: circulation rules only.
>-                  Calendar: the calendar to skip all days the library is closed.
>-                  Datedue: the calendar to push the due date to the next open day
>-                  Dayweek: the calendar to push the due date to the next open matching weekday for weekly loan periods, or the next open day otherwise
>+                  Days: Ignore the calendar
>+                  Calendar: Use the calendar to skip days the library is closed
>+                  Datedue: Use the calendar to push the due date to the next open day
>+                  Dayweek: Use the calendar to push the due date to the next open matching weekday for weekly loan periods, or the next open day otherwise
>+            - when calculating the date due.
>         -
>             - Calculate "No renewal before" based on
>             - pref: NoRenewalBeforePrecision
>@@ -735,9 +735,9 @@ Circulation:
>         -
>             - pref: ExcludeHolidaysFromMaxPickUpDelay
>               choices:
>-                  yes: Allow
>-                  no: "Don't allow"
>-            - Closed days to be taken into account in reserves max pickup delay.
>+                  yes: Ignore the calendar
>+                  no: Use the calendar
>+            - when calculating the period for reserves max pickup delay.
>         -
>             - pref: decreaseLoanHighHolds
>               choices:
>@@ -834,19 +834,19 @@ Circulation:
>             - unmediated Interlibrary loan requests. If enabled and the ILL backend supports it, the newly created requests are immediately requested by backend.
>     Fines Policy:
>         -
>-            - Calculate fines based on days overdue
>             - pref: finesCalendar
>               type: choice
>               choices:
>-                  ignoreCalendar: directly.
>-                  noFinesWhenClosed: not including days the library is closed.
>+                  ignoreCalendar: Ignore the calendar
>+                  noFinesWhenClosed: Use the calendar
>+            - when calculating the period for fines.
>         -
>-            - Calculate suspension expiration based on days overdue
>             - pref: SuspensionsCalendar
>               type: choice
>               choices:
>-                  ignoreCalendar: directly.
>-                  noSuspensionsWhenClosed: not including days the library is closed.
>+                  ignoreCalendar: Ignore the calendar
>+                  noSuspensionsWhenClosed: Use the calendar
>+            - when calculating the period for suspension expiration.
>         -
>             - pref: finesMode
>               type: choice
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 22381: 94791 | 94925 | 95127 | 95241 | 96002 | 96262 | 96316