From f48c2578e87641aaab2826c84ba396ae83bf64ad Mon Sep 17 00:00:00 2001 From: Andrew Fuerste-Henry Date: Wed, 30 Sep 2020 13:14:12 +0000 Subject: [PATCH] Bug 26569: Use gender neutral pronouns in system prefernece explanations To test: 1 - perform query "select variable,explanation from systempreferences where explanation like '% his %';" 2 - find 6 sysprefs with gendered pronouns used in explanations 3 - apply patch, reset_all 4 - repeat query 5 - no more gendered pronouns! Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit a96f5deef04bb74fbd826449b4d82f651a67512c) Signed-off-by: Lucas Gass (cherry picked from commit 9de5ceeaec33f6f26fb2dfefbfd1fb6414ed9b90) Signed-off-by: Aleisha Amohia --- installer/data/mysql/.updatedatabase.pl.swp | Bin 0 -> 28672 bytes .../data/mysql/atomicupdate/bug_26569.perl | 12 ++++++++++++ installer/data/mysql/sysprefs.sql | 12 ++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 installer/data/mysql/.updatedatabase.pl.swp create mode 100644 installer/data/mysql/atomicupdate/bug_26569.perl diff --git a/installer/data/mysql/.updatedatabase.pl.swp b/installer/data/mysql/.updatedatabase.pl.swp new file mode 100644 index 0000000000000000000000000000000000000000..57d6f2fd52fd9d7d589e9a38fa33a672675d69db GIT binary patch literal 28672 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 TwGI7V8qwi*_4i#(q5A(D5(Sy` literal 0 HcmV?d00001 diff --git a/installer/data/mysql/atomicupdate/bug_26569.perl b/installer/data/mysql/atomicupdate/bug_26569.perl new file mode 100644 index 0000000000..14441c3225 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_26569.perl @@ -0,0 +1,12 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( "UPDATE systempreferences SET explanation='Define which baskets a user is allowed to view: their own only, any within their branch, or all' WHERE variable='AcqViewBaskets'" ); + $dbh->do( "UPDATE systempreferences SET explanation='If enabled, the patron can set checkouts to be visible to their guarantor' WHERE variable='AllowPatronToSetCheckoutsVisibilityForGuarantor'" ); + $dbh->do( "UPDATE systempreferences SET explanation='If enabled, the patron can set fines to be visible to their guarantor' WHERE variable='AllowPatronToSetFinesVisibilityForGuarantor'" ); + $dbh->do( "UPDATE systempreferences SET explanation='If on, and a patron is logged into the OPAC, items from their home library will be emphasized and shown first in search results and item details.' WHERE variable='HighlightOwnItemsOnOPAC'" ); + $dbh->do( "UPDATE systempreferences SET explanation='If ON, the next user will automatically get the last searches in their history' WHERE variable='LoadSearchHistoryToTheFirstLoggedUser'" ); + $dbh->do( "UPDATE systempreferences SET explanation='If enabled, any patron attempting to register themselves via the OPAC will be required to verify themselves via email to activate their account.' WHERE variable='PatronSelfRegistrationVerifyByEmail'" ); + + print "Upgrade to $DBversion done (Bug 26569 - Use gender neutral pronouns in system preference explanations)\n"; + SetVersion( $DBversion ); +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 1bbc5ea59b..3ade9cedd1 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -5,7 +5,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AcqItemSetSubfieldsWhenReceiptIsCancelled','', '','Upon cancelling a receipt, update the items subfields if they were created when placing an order (e.g. o=5|a="bar foo")', 'Free'), ('AcqItemSetSubfieldsWhenReceived','','','Upon receiving items, update their subfields if they were created when placing an order (e.g. o=5|a="foo bar")','Free'), ('AcquisitionDetails', '1', '', 'Hide/Show acquisition details on the biblio detail page.', 'YesNo'), -('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'), +('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: their own only, any within their branch, or all','Choice'), ('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'), ('AdditionalFieldsInZ3950ResultSearch', '', NULL, 'Determines which MARC field/subfields are displayed in -Additional field- column in the result of a search Z3950', 'Free'), ('AddressFormat','us','us|de|fr','Choose format to display postal addresses', 'Choice'), @@ -33,8 +33,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AllowMultipleIssuesOnABiblio',1,'Allow/Don\'t allow patrons to check out multiple items from one biblio','','YesNo'), ('AllowNotForLoanOverride','0','','If ON, Koha will allow the librarian to loan a not for loan item.','YesNo'), ('AllowOfflineCirculation','0','','If on, enables HTML5 offline circulation functionality.','YesNo'), -('AllowPatronToSetCheckoutsVisibilityForGuarantor', '0', NULL, 'If enabled, the patron can set checkouts to be visible to his or her guarantor', 'YesNo'), -('AllowPatronToSetFinesVisibilityForGuarantor', '0', NULL, 'If enabled, the patron can set fines to be visible to his or her guarantor', 'YesNo'), +('AllowPatronToSetCheckoutsVisibilityForGuarantor', '0', NULL, 'If enabled, the patron can set checkouts to be visible to their guarantor', 'YesNo'), +('AllowPatronToSetFinesVisibilityForGuarantor', '0', NULL, 'If enabled, the patron can set fines to be visible to their guarantor', 'YesNo'), ('AllowPKIAuth','None','None|Common Name|emailAddress','Use the field from a client-side SSL certificate to look a user in the Koha database','Choice'), ('AllowPurchaseSuggestionBranchChoice','0','1','Allow user to choose branch when making a purchase suggestion','YesNo'), ('AllowRenewalIfOtherItemsAvailable','0',NULL,'If enabled, allow a patron to renew an item with unfilled holds if other available items can fill that hold.','YesNo'), @@ -211,7 +211,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('hidelostitems','0','','If ON, disables display of\"lost\" items in OPAC.','YesNo'), ('HidePatronName','0','','If this is switched on, patron\'s cardnumber will be shown instead of their name on the holds and catalog screens','YesNo'), ('hide_marc','0',NULL,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)','YesNo'), -('HighlightOwnItemsOnOPAC','0','','If on, and a patron is logged into the OPAC, items from his or her home library will be emphasized and shown first in search results and item details.','YesNo'), +('HighlightOwnItemsOnOPAC','0','','If on, and a patron is logged into the OPAC, items from their home library will be emphasized and shown first in search results and item details.','YesNo'), ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch|OpacURLBranch','Decides which branch\'s items to emphasize. If PatronBranch, emphasize the logged in user\'s library\'s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha\'s Apache configuration file.','Choice'), ('HoldFeeMode','not_always','any_time_is_placed|not_always|any_time_is_collected','Set the hold fee mode','Choice'), ('HoldsAutoFill','0',NULL,'If on, librarian will not be asked if hold should be filled, it will be filled automatically','YesNo'), @@ -290,7 +290,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('LinkerModule','Default','Default|FirstMatch|LastMatch','Chooses which linker module to use (see documentation).','Choice'), ('LinkerOptions','','','A pipe-separated list of options for the linker.','free'), ('LinkerRelink','1',NULL,'If ON the authority linker will relink headings that have previously been linked every time it runs.','YesNo'), -('LoadSearchHistoryToTheFirstLoggedUser', '1', NULL, 'If ON, the next user will automatically get the last searches in his history', 'YesNo'), +('LoadSearchHistoryToTheFirstLoggedUser', '1', NULL, 'If ON, the next user will automatically get the last searches in their history', 'YesNo'), ('LocalCoverImages','0','1','Display local cover images on intranet details pages.','YesNo'), ('LocalHoldsPriority', '0', NULL, 'Enables the LocalHoldsPriority feature', 'YesNo'), ('LocalHoldsPriorityItemControl', 'holdingbranch', 'holdingbranch|homebranch', 'decides if the feature operates using the item''s home or holding library.', 'Choice'), @@ -486,7 +486,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('PatronSelfRegistrationExpireTemporaryAccountsDelay','0',NULL,'If PatronSelfRegistrationDefaultCategory is enabled, this system preference controls how long a patron can have a temporary status before the account is deleted automatically. It is an integer value representing a number of days to wait before deleting a temporary patron account. Setting it to 0 disables the deleting of temporary accounts.','Integer'), ('PatronSelfRegistrationLibraryList','',NULL,'Only display libraries listed. If empty, all libraries are displayed.','Free'), ('PatronSelfRegistrationPrefillForm','1',NULL,'Display password and prefill login form after a patron has self registered','YesNo'), -('PatronSelfRegistrationVerifyByEmail','0',NULL,'If enabled, any patron attempting to register themselves via the OPAC will be required to verify themselves via email to activate his or her account.','YesNo'), +('PatronSelfRegistrationVerifyByEmail','0',NULL,'If enabled, any patron attempting to register themselves via the OPAC will be required to verify themselves via email to activate their account.','YesNo'), ('PatronsPerPage','20','20','Number of Patrons Per Page displayed by default','Integer'), ('EnablePayPalOpacPayments', '0', NULL , 'Enables the ability to pay fees and fines from the OPAC via PayPal', 'YesNo' ), ('PatronQuickAddFields', '', NULL , 'A list of fields separated by "|" to be displayed along with mandatory fields in the patron quick add form if chosen at patron entry', 'Free' ), -- 2.39.5