From 37b5a9ed11dbc6dc79cc74d7724a3c464409278b Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Tue, 7 Jan 2020 22:56:26 +0000 Subject: [PATCH] Revert "Bug 22381: Change wording on Calendar-related system" This reverts commit 05bf4e974ddac1832fb6af02fcbcfb17ff43933b. Signed-off-by: Lucas Gass --- .../admin/preferences/circulation.pref | 27 +++++++++---------- 1 file changed, 13 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 16bbcef95e..604623dca5 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 @@ -282,13 +282,12 @@ 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: 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. + 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 - - Calculate "No renewal before" based on - pref: NoRenewalBeforePrecision @@ -731,9 +730,9 @@ Circulation: - - pref: ExcludeHolidaysFromMaxPickUpDelay choices: - yes: Ignore the calendar - no: Use the calendar - - when calculating the period for reserves max pickup delay. + yes: Allow + no: "Don't allow" + - Closed days to be taken into account in reserves max pickup delay. - - pref: decreaseLoanHighHolds choices: @@ -830,19 +829,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: Ignore the calendar - noFinesWhenClosed: Use the calendar - - when calculating the period for fines. + ignoreCalendar: directly. + noFinesWhenClosed: not including days the library is closed. - + - Calculate suspension expiration based on days overdue - pref: SuspensionsCalendar type: choice choices: - ignoreCalendar: Ignore the calendar - noSuspensionsWhenClosed: Use the calendar - - when calculating the period for suspension expiration. + ignoreCalendar: directly. + noSuspensionsWhenClosed: not including days the library is closed. - - pref: finesMode type: choice -- 2.39.2