diff --git a/C4/Auth.pm b/C4/Auth.pm index c817ffb34e..b5b75544fe 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -182,7 +182,7 @@ sub get_template_and_user { } - # 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 the user logged in is the SCO user and they try to go out of 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} ); diff --git a/C4/Circulation.pm b/C4/Circulation.pm index c573158623..ef263c9bae 100644 --- a/C4/Circulation.pm +++ b/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 or her if necessary. + the user fine days, and debars them if necessary. Should only be called for overdue returns @@ -3860,7 +3860,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 or she is older or as old as the agerestriction } + if($daysToAgeRestriction <= 0) { #Borrower is allowed to access this material, as they are 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, ... diff --git a/C4/SIP/t/06patron_enable.t b/C4/SIP/t/06patron_enable.t index 4ed174c326..8b95f6ef18 100644 --- a/C4/SIP/t/06patron_enable.t +++ b/C4/SIP/t/06patron_enable.t @@ -32,7 +32,7 @@ my $patron_enable_test_template = { ], }; # We need to disable the valid patron before we can -# ensure that he or she was properly enabled. +# ensure that they were 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|", diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index fe0fe36102..4fdd378654 100644 --- a/C4/Suggestions.pm +++ b/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 or she can set the status to "REJECTED" or "ACCEPTED". +When a librarian manages the suggestion, they 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 or she is its owner. +Delete a suggestion. A borrower can delete a suggestion only if they are its owner. =cut diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index bd0f4ebd4b..de32805d2e 100755 --- a/acqui/addorderiso2709.pl +++ b/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 or she wants to order +#The user can then pick which biblios they want to order # Copyright 2008 - 2011 BibLibre SARL # diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 19a2aefaaa..c2a5e6fe49 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -154,7 +154,7 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){ ($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 or her choose between using new record or existing record + #and let them choose between using a new record or an existing record Load_Duplicate($duplicatetitle); exit; } diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 048d89b445..1ee8d825b5 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -528,7 +528,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 or her new values, we can't add multiple copies + # If there is a barcode and we can't find their new values, we can't add multiple copies my $testbarcode; $testbarcode = $barcodeobj->next_value($oldbarcode) if $barcodeobj; if ($oldbarcode && !$testbarcode) { diff --git a/installer/install.pl b/installer/install.pl index 8e44dea8c5..6f0ffda235 100755 --- a/installer/install.pl +++ b/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 or she can insert in the database. + # 1ST install, 2nd sub-step : show the user the sql data they can insert in the database. # # # (note that the term "selectframeworks is not correct. The user can select various files, not only frameworks) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 6501b8d0c2..26ecf45d14 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -316,7 +316,7 @@ function confirm_deletion() {
[% IF ( opisadd ) %] - diff --git a/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js b/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js index c099258052..0d8a525a46 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js +++ b/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js @@ -242,7 +242,7 @@ function closeandprint(bg){ } //function that lets the user unclose a basketgroup -//as long as he or she hasn't submitted the changes to the page. +//as long as they haven't submitted the changes to the page. function unclosegroup(bgid){ var div = document.getElementById('basketgroup-'+bgid+'-closed').parentNode; var divtodel = document.getElementById('unclose-' + bgid); diff --git a/mainpage.pl b/mainpage.pl index 39915e5911..c1df82b442 100755 --- a/mainpage.pl +++ b/mainpage.pl @@ -85,7 +85,7 @@ $template->param( ); # -# warn user if he or she is using mysql/admin login +# warn user if they are using mysql/admin login # unless ($loggedinuser) { $template->param(adminWarning => 1); diff --git a/misc/export_borrowers.pl b/misc/export_borrowers.pl index d980cc56ef..5a2b92023f 100755 --- a/misc/export_borrowers.pl +++ b/misc/export_borrowers.pl @@ -96,7 +96,7 @@ unless ( $separator ) { my $csv = Text::CSV->new( { sep_char => $separator, binary => 1 } ); -# If the user did not specify any field to export, we assume he or she wants them all +# If the user did not specify any field to export, we assume they want them all # We retrieve the first borrower informations to get field names my ($borrowernumber) = $sth->fetchrow_array or die "No borrower to export"; my $member = GetMember($borrowernumber); # FIXME Now is_expired is no longer available diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl index 6848f8efd2..e5fc49b27e 100755 --- a/opac/opac-discharge.pl +++ b/opac/opac-discharge.pl @@ -92,7 +92,7 @@ else { pending => 1, }); # FIXME looks like $available is not needed - # If a patron is discharged he or she has a validated discharge available + # If a user is discharged they have a validated discharge available my $available = Koha::Patron::Discharge::count({ borrowernumber => $loggedinuser, validated => 1, diff --git a/opac/opac-user.pl b/opac/opac-user.pl index f4d2daf622..3dc39bf7b0 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -102,7 +102,7 @@ if ($debar) { $borr->{'userdebarreddate'} = $debar; } # FIXME looks like $available is not needed - # If a patron is discharged he or she has a validated discharge available + # If a user is discharged they have a validated discharge available my $available = Koha::Patron::Discharge::count({ borrowernumber => $borrowernumber, validated => 1, diff --git a/reserve/request.pl b/reserve/request.pl index 69e163cae8..f8122c7201 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -136,7 +136,7 @@ if ($borrowernumber_hold && !$action) { my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold ); my $diffbranch; - # we check the reserves of the borrower, and if he or she can reserve a document + # we check the reserves of the user, and if they can reserve a document # FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ... my $reserves_count = diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 9a313e11c5..2d31db9473 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -1235,7 +1235,7 @@ subtest 'CanBookBeIssued + Koha::Patron->is_debarred|has_overdues' => sub { my ( $error, $question, $alerts ); - # Patron cannot issue item_1, he or she has overdues + # Patron cannot issue item_1, they have overdues my $yesterday = DateTime->today( time_zone => C4::Context->tz() )->add( days => -1 ); my $issue = AddIssue( $patron, $item_1->{barcode}, $yesterday ); # Add an overdue @@ -1249,7 +1249,7 @@ subtest 'CanBookBeIssued + Koha::Patron->is_debarred|has_overdues' => sub { is( keys(%$question) + keys(%$alerts), 0 ); is( $error->{USERBLOCKEDOVERDUE}, 1 ); - # Patron cannot issue item_1, he or she is debarred + # Patron cannot issue item_1, they are debarred my $tomorrow = DateTime->today( time_zone => C4::Context->tz() )->add( days => 1 ); Koha::Patron::Debarments::AddDebarment( { borrowernumber => $patron->{borrowernumber}, expiration => $tomorrow } ); ( $error, $question, $alerts ) = CanBookBeIssued( $patron, $item_2->{barcode} ); @@ -1479,7 +1479,7 @@ subtest 'AddReturn + CumulativeRestrictionPeriods' => sub { ); $rule->store(); - # Patron cannot issue item_1, he or she has overdues + # Patron cannot issue item_1, they have overdues my $five_days_ago = dt_from_string->subtract( days => 5 ); my $ten_days_ago = dt_from_string->subtract( days => 10 ); AddIssue( $patron, $item_1->{barcode}, $five_days_ago ); # Add an overdue diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t index 12efa733f1..74f0e7fbc7 100644 --- a/t/db_dependent/Koha/Patrons.t +++ b/t/db_dependent/Koha/Patrons.t @@ -403,7 +403,7 @@ subtest 'add_enrolment_fee_if_needed' => sub { $borrower_data{categorycode} = 'J'; C4::Members::ModMember(%borrower_data); ($total) = C4::Members::GetMemberAccountRecords($borrowernumber); - is( $total, $enrolmentfee_K + $enrolmentfee_J, "Kid growing and become a juvenile, he should pay " . ( $enrolmentfee_K + $enrolmentfee_J ) ); + is( $total, $enrolmentfee_K + $enrolmentfee_J, "Kid growing and become a juvenile, they should pay " . ( $enrolmentfee_K + $enrolmentfee_J ) ); # Check with calling directly Koha::Patron->get_enrolment_fee_if_needed my $patron = Koha::Patrons->find($borrowernumber); @@ -412,7 +412,7 @@ subtest 'add_enrolment_fee_if_needed' => sub { ($total) = C4::Members::GetMemberAccountRecords($borrowernumber); is( $total, $enrolmentfee_K + $enrolmentfee_J + $enrolmentfee_YA, - "Juvenile growing and become an young adult, he or she should pay " . ( $enrolmentfee_K + $enrolmentfee_J + $enrolmentfee_YA ) + "Juvenile growing and become an young adult, they should pay " . ( $enrolmentfee_K + $enrolmentfee_J + $enrolmentfee_YA ) ); $patron->delete; diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t index 809b252870..4c027b17ed 100755 --- a/t/db_dependent/Reserves.t +++ b/t/db_dependent/Reserves.t @@ -535,13 +535,13 @@ C4::Biblio::ModBiblio( $record, $bibnum, $frameworkcode ); is( C4::Reserves::CanBookBeReserved($borrowernumber, $biblionumber) , 'OK', "Reserving an ageRestricted Biblio without a borrower dateofbirth succeeds" ); -#Set the dateofbirth for the Borrower making him or her "too young". +#Set the dateofbirth for the Borrower making them "too young". $borrower->{dateofbirth} = DateTime->now->add( years => -15 ); C4::Members::ModMember( borrowernumber => $borrowernumber, dateofbirth => $borrower->{dateofbirth} ); is( C4::Reserves::CanBookBeReserved($borrowernumber, $biblionumber) , 'ageRestricted', "Reserving a 'PEGI 16' Biblio by a 15 year old borrower fails"); -#Set the dateofbirth for the Borrower making him or her "too old". +#Set the dateofbirth for the Borrower making them "too old". $borrower->{dateofbirth} = DateTime->now->add( years => -30 ); C4::Members::ModMember( borrowernumber => $borrowernumber, dateofbirth => $borrower->{dateofbirth} );