@@ -, +, @@ - ensuring modifying tests still pass: --- C4/Auth.pm | 2 +- C4/Circulation.pm | 4 ++-- C4/SIP/t/06patron_enable.t | 4 ++-- C4/Suggestions.pm | 4 ++-- acqui/addorderiso2709.pl | 2 +- acqui/neworderempty.pl | 8 ++++---- acqui/parcel.pl | 2 +- acqui/parcels.pl | 2 +- cataloguing/additem.pl | 2 +- installer/install.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/basketgroup.js | 3 ++- mainpage.pl | 2 +- misc/export_borrowers.pl | 2 +- misc/migration_tools/bulkmarcimport.pl | 2 +- opac/opac-discharge.pl | 2 +- opac/opac-user.pl | 2 +- reserve/request.pl | 2 +- t/db_dependent/Circulation.t | 6 +++--- t/db_dependent/Koha/Patrons.t | 2 +- t/db_dependent/Reserves.t | 4 ++-- 21 files changed, 31 insertions(+), 30 deletions(-) --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -182,7 +182,7 @@ sub get_template_and_user { } - # If the user logged in is the SCO user and he tries to go out the SCO module, log the user out removing the CGISESSID cookie + # If the user logged in is the SCO user and he or she tries to go out the SCO module, log the user out removing the CGISESSID cookie if ( $in->{type} eq 'opac' and $in->{template_name} !~ m|sco/| ) { if ( C4::Context->preference('AutoSelfCheckID') && $user eq C4::Context->preference('AutoSelfCheckID') ) { $template = C4::Templates::gettemplate( 'opac-auth.tt', 'opac', $in->{query} ); --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -2220,7 +2220,7 @@ C<$datedue> date due DateTime object C<$return_date> DateTime object representing the return time Internal function, called only by AddReturn that calculates and updates - the user fine days, and debars him if necessary. + the user fine days, and debars him or her if necessary. Should only be called for overdue returns @@ -3853,7 +3853,7 @@ sub IsItemIssued { my ($ageRestriction, $daysToAgeRestriction) = GetAgeRestriction($record_restrictions, $borrower); my ($ageRestriction, $daysToAgeRestriction) = GetAgeRestriction($record_restrictions); - if($daysToAgeRestriction <= 0) { #Borrower is allowed to access this material, as he is older or as old as the agerestriction } + if($daysToAgeRestriction <= 0) { #Borrower is allowed to access this material, as he or she is older or as old as the agerestriction } if($daysToAgeRestriction > 0) { #Borrower is this many days from meeting the agerestriction } @PARAM1 the koha.biblioitems.agerestriction value, like K18, PEGI 13, ... --- a/C4/SIP/t/06patron_enable.t +++ a/C4/SIP/t/06patron_enable.t @@ -31,8 +31,8 @@ my $patron_enable_test_template = { required => 1, }, ], }; -# We need to disable the valid patron before we can -# ensure that he was properly enabled. +# We need to disable the valid patron before we can +# ensure that he or she was properly enabled. my $patron_disable_test_template = { id => 'Patron Enable: block patron (prep to test enabling)', msg => "01N20060102 084238AO$instid|ALBlocked patron for SIP test.|AA$user_barcode|", --- a/C4/Suggestions.pm +++ a/C4/Suggestions.pm @@ -63,7 +63,7 @@ The functions in this module deal with the aqorders in OPAC and in librarian int A suggestion is done in the OPAC. It has the status "ASKED" -When a librarian manages the suggestion, he can set the status to "REJECTED" or "ACCEPTED". +When a librarian manages the suggestion, he or she can set the status to "REJECTED" or "ACCEPTED". When the book is ordered, the suggestion status becomes "ORDERED" @@ -554,7 +554,7 @@ sub ConnectSuggestionAndBiblio { &DelSuggestion($borrowernumber,$ordernumber) -Delete a suggestion. A borrower can delete a suggestion only if he is its owner. +Delete a suggestion. A borrower can delete a suggestion only if he or she is its owner. =cut --- a/acqui/addorderiso2709.pl +++ a/acqui/addorderiso2709.pl @@ -2,7 +2,7 @@ #A script that lets the user populate a basket from an iso2709 file #the script first displays a list of import batches, then when a batch is selected displays all the biblios in it. -#The user can then pick which biblios he wants to order +#The user can then pick which biblios he or she wants to order # Copyright 2008 - 2011 BibLibre SARL # --- a/acqui/neworderempty.pl +++ a/acqui/neworderempty.pl @@ -153,10 +153,10 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){ #look for duplicates ($biblionumber,$duplicatetitle) = FindDuplicate($marcrecord); if($biblionumber && !$input->param('use_external_source')) { - #if duplicate record found and user did not decide yet, first warn user - #and let him choose between using new record or existing record - Load_Duplicate($duplicatetitle); - exit; + #if duplicate record found and user did not decide yet, first warn user + #and let him or her choose between using new record or existing record + Load_Duplicate($duplicatetitle); + exit; } #from this point: add a new record if (C4::Context->preference("BiblioAddsAuthorities")){ --- a/acqui/parcel.pl +++ a/acqui/parcel.pl @@ -28,7 +28,7 @@ parcel.pl =head1 DESCRIPTION This script shows all orders receipt or pending for a given supplier. -It allows to write an order as 'received' when he arrives. +It allows to write an order as 'received' when it arrives. =head1 CGI PARAMETERS --- a/acqui/parcels.pl +++ a/acqui/parcels.pl @@ -29,7 +29,7 @@ parcels.pl =head1 DESCRIPTION This script shows all orders/parcels receipt or pending for a given supplier. -It allows to write an order/parcels as 'received' when he arrives. +It allows to write an order/parcels as 'received' when it arrives. =head1 CGI PARAMETERS --- a/cataloguing/additem.pl +++ a/cataloguing/additem.pl @@ -527,7 +527,7 @@ if ($op eq "additem") { my $oldbarcode = $addedolditem->{'barcode'}; my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode); - # If there is a barcode and we can't find him new values, we can't add multiple copies + # If there is a barcode and we can't find him or her new values, we can't add multiple copies my $testbarcode; $testbarcode = $barcodeobj->next_value($oldbarcode) if $barcodeobj; if ($oldbarcode && !$testbarcode) { --- a/installer/install.pl +++ a/installer/install.pl @@ -226,7 +226,7 @@ elsif ( $step && $step == 3 ) { elsif ( $op && $op eq 'selectframeworks' ) { # # - # 1ST install, 2nd sub-step : show the user the sql datas he can insert in the database. + # 1ST install, 2nd sub-step : show the user the sql datas he or she can insert in the database. # # # (note that the term "selectframeworks is not correct. The user can select various files, not only frameworks) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -316,7 +316,7 @@ function confirm_deletion() {