From e73a0abbc311de20f15d6bda1036c9c3b2ff52f5 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 17 Oct 2020 14:04:33 +0200 Subject: [PATCH] Bug 26718: Rename "reading history" to "checkout history" This changes all occurences of reading history to the more accurate term 'checokut history' as it was correctly pointed out that 'reading' doesn't apply to all kind of items available at the library (audio books, games, etc.) To test: - Verify that the term reding history has been replaced by checkout history in: - System preferences - OPAC tab "your checkout history" - OPAC tab "your privacy" (switch OpacPrivacy pref first) - Staff permission for patron batch anonymization --- api/v1/swagger/definitions/patron.json | 2 +- installer/data/mysql/kohastructure.sql | 4 ++-- installer/data/mysql/mandatory/sysprefs.sql | 8 ++++---- installer/data/mysql/mandatory/userpermissions.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 2 +- .../prog/en/modules/admin/preferences/opac.pref | 6 +++--- .../prog/en/modules/admin/preferences/patrons.pref | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 16 ++++++++-------- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/api/v1/swagger/definitions/patron.json b/api/v1/swagger/definitions/patron.json index 827702385b..60488f5a4b 100644 --- a/api/v1/swagger/definitions/patron.json +++ b/api/v1/swagger/definitions/patron.json @@ -241,7 +241,7 @@ }, "privacy": { "type": "integer", - "description": "patron's privacy settings related to their reading history" + "description": "patron's privacy settings related to their checkout history" }, "privacy_guarantor_checkouts": { "type": "integer", diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index fc9953bb2b..1aff944ea3 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -600,7 +600,7 @@ CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower `altcontactphone` MEDIUMTEXT default NULL, -- the phone number for the alternate contact for the patron/borrower `smsalertnumber` varchar(50) default NULL, -- the mobile phone number where the patron/borrower would like to receive notices (if SMS turned on) `sms_provider_id` int(11) DEFAULT NULL, -- the provider of the mobile phone number defined in smsalertnumber - `privacy` integer(11) DEFAULT '1' NOT NULL, -- patron/borrower's privacy settings related to their reading history KEY `borrowernumber` (`borrowernumber`), + `privacy` integer(11) DEFAULT '1' NOT NULL, -- patron/borrower's privacy settings related to their checkout history KEY `borrowernumber` (`borrowernumber`), `privacy_guarantor_fines` tinyint(1) NOT NULL DEFAULT '0', -- controls if relatives can see this patron's fines `privacy_guarantor_checkouts` tinyint(1) NOT NULL DEFAULT '0', -- controls if relatives can see this patron's checkouts `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron if this item has previously been checked out to this patron if 'yes', not if 'no', defer to category setting if 'inherit'. @@ -1526,7 +1526,7 @@ CREATE TABLE `borrowers` ( -- this table includes information about your patrons `altcontactphone` MEDIUMTEXT default NULL, -- the phone number for the alternate contact for the patron/borrower `smsalertnumber` varchar(50) default NULL, -- the mobile phone number where the patron/borrower would like to receive notices (if SMS turned on) `sms_provider_id` int(11) DEFAULT NULL, -- the provider of the mobile phone number defined in smsalertnumber - `privacy` integer(11) DEFAULT '1' NOT NULL, -- patron/borrower's privacy settings related to their reading history + `privacy` integer(11) DEFAULT '1' NOT NULL, -- patron/borrower's privacy settings related to their checkout history `privacy_guarantor_fines` tinyint(1) NOT NULL DEFAULT '0', -- controls if relatives can see this patron's fines `privacy_guarantor_checkouts` tinyint(1) NOT NULL DEFAULT '0', -- controls if relatives can see this patron's checkouts `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron if this item has previously been checked out to this patron if 'yes', not if 'no', defer to category setting if 'inherit'. diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 890dfcfe8f..3ca220cdf0 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -53,7 +53,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AmazonCoverImages','0','','Display Cover Images in staff interface from Amazon Web Services','YesNo'), ('AmazonLocale','US','US|CA|DE|FR|IN|JP|UK','Use to set the Locale of your Amazon.com Web Services','Choice'), ('AnonSuggestions','0',NULL,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber','YesNo'), -('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''), +('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for suggestion and checkout history privacy',''), ('ArticleRequests', '0', NULL, 'Enables the article request feature', 'YesNo'), ('ArticleRequestsLinkControl', 'calc', 'always|calc', 'Control display of article request link on search results', 'Choice'), ('ArticleRequestsMandatoryFields', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''yes''', 'multiple'), @@ -268,7 +268,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'), ('IntranetNav','','70|10','Use HTML tabs to add navigational links to the top-hand navigational bar in the staff interface','Textarea'), ('IntranetNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number staff interface searches','YesNo'), -('intranetreadinghistory','1','','If ON, Reading History is enabled for all patrons','YesNo'), +('intranetreadinghistory','1','','If ON, Checkout history is enabled for all patrons','YesNo'), ('IntranetReportsHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'), ('IntranetSlipPrinterJS','','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','Free'), ('intranetstylesheet','','50','Enter a complete URL to use an alternate layout stylesheet in Intranet','free'), @@ -419,7 +419,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OpacMaxItemsToDisplay','50','','Max items to display at the OPAC on a biblio detail','Integer'), ('OpacMetaDescription','','','This description will show in search engine results (160 characters).','Textarea'), ('OpacMoreSearches', '', NULL, 'Add additional elements to the OPAC more searches bar', 'Textarea'), -('OPACMySummaryHTML','','70|10','Enter the HTML that will appear in a column on the \'my summary\' and \'my reading history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','Textarea'), +('OPACMySummaryHTML','','70|10','Enter the HTML that will appear in a column on the \'my summary\' and \'my checkout history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','Textarea'), ('OPACMySummaryNote','','','Note to display on the patron summary page. This note only appears if the patron is connected.','Free'), ('OpacNav','Important links here.','70|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'), ('OpacNavBottom','Important links here.','70|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'), @@ -432,7 +432,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OpacPasswordChange','1',NULL,'If ON, enables patron-initiated password change in OPAC (disable it when using LDAP auth)','YesNo'), ('OPACPatronDetails','1','','If OFF the patron details tab in the OPAC is disabled.','YesNo'), ('OPACpatronimages','0',NULL,'Enable patron images in the OPAC','YesNo'), -('OpacPrivacy','0',NULL,'if ON, allows patrons to define their privacy rules (reading history)','YesNo'), +('OpacPrivacy','0',NULL,'if ON, allows patrons to define their privacy rules (checkout history)','YesNo'), ('OpacPublic','1',NULL,'Turn on/off public OPAC','YesNo'), ('opacreadinghistory','1','','If ON, enables display of Patron Circulation History in OPAC','YesNo'), ('OpacRenewalAllowed','0',NULL,'If ON, users can renew their issues directly from their OPAC account','YesNo'), diff --git a/installer/data/mysql/mandatory/userpermissions.sql b/installer/data/mysql/mandatory/userpermissions.sql index 08d6ffebf8..066e99daf7 100644 --- a/installer/data/mysql/mandatory/userpermissions.sql +++ b/installer/data/mysql/mandatory/userpermissions.sql @@ -87,7 +87,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (13, 'export_catalog', 'Export bibliographic and holdings data'), (13, 'import_patrons', 'Import patron data'), (13, 'edit_patrons', 'Perform batch modification of patrons'), - (13, 'delete_anonymize_patrons', 'Delete old borrowers and anonymize circulation history (deletes borrower reading history)'), + (13, 'delete_anonymize_patrons', 'Delete old borrowers and anonymize circulation history (deletes borrower checkout history)'), (13, 'batch_extend_due_dates', 'Perform batch extend due dates'), (13, 'batch_upload_patron_images', 'Upload patron images in a batch or one at a time'), (13, 'schedule_tasks', 'Schedule tasks to run'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index 83f4795613..eabe4d51ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -427,7 +427,7 @@ ([% name | html %]) [%- CASE 'delete_anonymize_patrons' -%] - Delete old borrowers and anonymize circulation history (deletes borrower reading history) + Delete old borrowers and anonymize circulation history (deletes borrower checkout history) ([% name | html %]) [%- CASE 'batch_extend_due_dates' -%] 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 7f601a2393..bb1c038ff2 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 @@ -261,7 +261,7 @@ OPAC: type: textarea class: code - - - 'Include a "Links" column on the "my summary" and "my reading history" tabs when a patron is logged in to the OPAC, with the following HTML (leave blank to disable):' + - 'Include a "Links" column on the "my summary" and "my checkout history" tabs when a patron is logged in to the OPAC, with the following HTML (leave blank to disable):' - '
Note: The placeholders {BIBLIONUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.' - pref: OPACMySummaryHTML type: textarea @@ -710,7 +710,7 @@ OPAC: choices: yes: Allow no: "Don't allow" - - "patrons to choose their own privacy settings for their reading history. This requires opacreadinghistory and AnonymousPatron system preferences." + - "patrons to choose their own privacy settings for their checkout history. This requires opacreadinghistory and AnonymousPatron system preferences." - - pref: AllowPatronToSetCheckoutsVisibilityForGuarantor default: 0 @@ -729,7 +729,7 @@ OPAC: - Use borrowernumber - pref: AnonymousPatron class: integer - - "as the anonymous patron (for anonymous suggestions and reading history)." + - "as the anonymous patron (for anonymous suggestions and checkout history)." - - pref: TrackClicks default: 0 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index fc8e8b6c7e..3ebcdef112 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -20,7 +20,7 @@ Patrons: choices: yes: "Allow" no: "Don't allow" - - "staff to access a patron's checkout and hold history (reading history is still stored, regardless of staff being allowed access or not)." + - "staff to access a patron's checkout and hold history (checkout history is still stored, regardless of staff being allowed access or not)." - - The late fine for all checkouts will only go up to - pref: MaxFine diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc index 80e626df83..021fe43a96 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc @@ -63,7 +63,7 @@ [% ELSE %]
  • [% END %] - your reading history
    • + your checkout history [% IF ( OPACPrivacy ) %] [% IF ( privacyview ) %]
  • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt index 43dd86972f..787adf978b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt @@ -35,11 +35,11 @@

    Your privacy management

    [% IF deleted %] -
    Your reading history has been deleted.
    +
    Your checkout history has been deleted.
    [% ELSIF history_not_deleted %] -
    The deletion of your reading history failed, because there is a problem with the configuration of this feature. Please help to fix the system by informing your library of this error
    +
    The deletion of your checkout history failed, because there is a problem with the configuration of this feature. Please help to fix the system by informing your library of this error
    [% ELSIF nothing_to_delete %] -
    No reading history to delete
    +
    No checkout history to delete
    [% END %] [% IF ( privacy_updated ) %] @@ -47,12 +47,12 @@ [% END %] [% IF ( Ask_data ) %] -

    We take great care in protecting your privacy. On this screen, you can define how long we keep your reading history.

    +

    We take great care in protecting your privacy. On this screen, you can define how long we keep your checkout history.

    Your options are:

    Please note that information on any book still checked-out must be kept by the library no matter which privacy option you choose.

    Please also note that the library staff can't update these values for you: it's your privacy!

    @@ -138,7 +138,7 @@
    -

    Whatever your privacy rule you choose, you can delete all your reading history immediately by clicking here. BE CAREFUL. Once you've confirmed the deletion, no one can retrieve the list!

    +

    Whatever your privacy rule you choose, you can delete all your checkout history immediately by clicking here. BE CAREFUL. Once you've confirmed the deletion, no one can retrieve the list!

    -- 2.11.0