@@ -, +, @@ --- C4/Labels/Label.pm | 2 +- Koha/AuthUtils.pm | 2 +- Koha/Patron.pm | 2 +- Makefile.PL | 4 ++-- basket/sendbasket.pl | 2 +- catalogue/search.pl | 6 +++--- circ/branchtransfers.pl | 8 ++++---- circ/returns.pl | 4 ++-- installer/html-template-to-template-toolkit.pl | 2 +- installer/install.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref | 2 +- koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl | 2 +- .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 6 +++--- labels/label-manage.pl | 4 ++-- misc/batchDeleteUnusedSubfields.pl | 2 +- misc/check_sysprefs.pl | 2 +- opac/ilsdi.pl | 2 +- opac/opac-passwd.pl | 2 +- opac/opac-reserve.pl | 2 +- opac/opac-search.pl | 2 +- opac/opac-sendbasket.pl | 2 +- opac/opac-sendshelf.pl | 2 +- patroncards/manage.pl | 4 ++-- reports/borrowers_stats.pl | 2 +- reports/guided_reports.pl | 8 ++++---- reserve/request.pl | 2 +- serials/routing-preview.pl | 2 +- serials/subscription-detail.pl | 2 +- 33 files changed, 51 insertions(+), 51 deletions(-) --- a/C4/Labels/Label.pm +++ a/C4/Labels/Label.pm @@ -408,7 +408,7 @@ sub draw_label_text { else { $field->{'data'} = _get_barcode_data($field->{'code'},$item,$record); } - # Find apropriate font it oblique title selected, except main font is oblique + # Find appropriate font it oblique title selected, except main font is oblique if ( ( $field->{'code'} eq 'title' ) and ( $self->{'oblique_title'} == 1 ) ) { if ( $font =~ /^TB$/ ) { $font .= 'I'; --- a/Koha/AuthUtils.pm +++ a/Koha/AuthUtils.pm @@ -79,7 +79,7 @@ sub hash_password { For general password salting a C<$strength> of C is recommend, For generating a server-salt a C<$strength> of C is recommended -'strong' uses /dev/random which may block until sufficient entropy is acheived. +'strong' uses /dev/random which may block until sufficient entropy is achieved. 'weak' uses /dev/urandom and is non-blocking. =item length --- a/Koha/Patron.pm +++ a/Koha/Patron.pm @@ -202,7 +202,7 @@ sub store { $self->updated_on(undef); } elsif ( not $self->updated_on ) { # This is bad we should use columns_info instead - # But it will avoid unecessary processing + # But it will avoid unnecessary processing $self->updated_on(\"current_timestamp"); } --- a/Makefile.PL +++ a/Makefile.PL @@ -1181,7 +1181,7 @@ PazPar2 port?); $msg = q( Use memcached to cache the results of some function calls? -This provides a signficant performance improvement. +This provides a significant performance improvement. You will need a Memcached server running.); $msg .= _add_valid_values_disp('USE_MEMCACHED', $valid_values); $config{'USE_MEMCACHED'} = _get_value('USE_MEMCACHED', $msg, $defaults->{'USE_MEMCACHED'}, $valid_values, $install_log_values); @@ -1219,7 +1219,7 @@ Would you like to run the database-dependent test suite?); THE DATA IN THIS DATABASE WILL BE DESTROYED during the process of testing. Please don't do this on your production database. It is not -reversable. +reversible. YOU WILL SUFFER DATA LOSS if you run this test suite on your test database. You are better off not running this optional test suite than --- a/basket/sendbasket.pl +++ a/basket/sendbasket.pl @@ -163,7 +163,7 @@ END_OF_BODY $template->param( SENT => "1" ); } else { - # do something if it doesnt work.... + # do something if it doesn't work.... carp "Error sending mail: $Mail::Sendmail::error \n"; $template->param( error => 1 ); } --- a/catalogue/search.pl +++ a/catalogue/search.pl @@ -94,7 +94,7 @@ weighting, koha-specific relevance ranking, and stemming. When I have a chance I'll try to flesh out this section to better explain. This query incorporates query profiles that aren't compatible with most non-Zebra -Z39.50 targets to acomplish the field weighting and relevance ranking. +Z39.50 targets to accomplish the field weighting and relevance ranking. =item 2 $simple_query - a simple query that doesn't contain the field weighting, stemming, etc., suitable to pass off to other search targets @@ -293,7 +293,7 @@ if ( $template_type eq 'advsearch' ) { # shouldn't appear on the first one, scan indexes should, adding a new # box should only appear on the last, etc. my @search_boxes_array; - my $search_boxes_count = 3; # begin whith 3 boxes + my $search_boxes_count = 3; # begin with 3 boxes # FIXME: all this junk can be done in TMPL using __first__ and __last__ for (my $i=1;$i<=$search_boxes_count;$i++) { # if it's the first one, don't display boolean option, but show scan indexes @@ -383,7 +383,7 @@ my @indexes = map uri_unescape($_), $cgi->multi_param('idx'); # if a simple index (only one) display the index used in the top search box if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) { my $idx = "ms_".$indexes[0]; - $idx =~ s/\,/comma/g; # template toolkit doesnt like variables with a , in it + $idx =~ s/\,/comma/g; # template toolkit doesn't like variables with a , in it $template->param($idx => 1); } --- a/circ/branchtransfers.pl +++ a/circ/branchtransfers.pl @@ -111,20 +111,20 @@ elsif ( $request eq 'KillReserved' ) { } # FIXME else? } -# collect the stack of books already transfered so they can printed... +# collect the stack of books already transferred so they can printed... my @trsfitemloop; -my $transfered; +my $transferred; my $barcode = $query->param('barcode'); # remove leading/trailing whitespace defined $barcode and $barcode =~ s/^\s*|\s*$//g; # FIXME: barcodeInputFilter # warn "barcode : $barcode"; if ($barcode) { - ( $transfered, $messages ) = + ( $transferred, $messages ) = transferbook( $tobranchcd, $barcode, $ignoreRs ); my $item = Koha::Items->find({ barcode => $barcode }); $found = $messages->{'ResFound'}; - if ($transfered) { + if ($transferred) { my %item; my $biblio = $item->biblio; my $frbranchcd = C4::Context->userenv->{'branch'}; --- a/circ/returns.pl +++ a/circ/returns.pl @@ -360,7 +360,7 @@ my $waiting = 0; my $reserved = 0; # new op dev : we check if the document must be returned to his homebranch directly, -# if the document is transfered, we have warning message . +# if the document is transferred, we have warning message . if ( $messages->{'WasTransfered'} ) { $template->param( @@ -385,7 +385,7 @@ if ( $messages->{'Wrongbranch'} ){ ); } -# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD) +# case of wrong transfert, if the document wasn't transferred to the right library (according to branchtransfer (tobranch) BDD) if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { $template->param( --- a/installer/html-template-to-template-toolkit.pl +++ a/installer/html-template-to-template-toolkit.pl @@ -102,7 +102,7 @@ foreach my $file (@template_files) { # Process.. # NB: if you think you're seeing double, you probably are, *some* (read:most) patterns appear twice: once with quotations marks, once without. - # trying to combine them into a single pattern proved troublesome as a regex like ['"]?(.*?)['"]? was causing problems and fixing the problem caused (alot) more complex regex + # trying to combine them into a single pattern proved troublesome as a regex like ['"]?(.*?)['"]? was causing problems and fixing the problem caused (a lot) more complex regex # variables $input_tmpl =~ s/<[!-]*\s*TMPL_VAR\s+NAME\s?=\s?['"]?\s*(\w*?)\s*['"]?\s+ESCAPE=['"](\w*?)['"]\s+DEFAULT=['"]?(.*?)['"]?\s*-*>/[% DEFAULT $cur_scope[-1]$1="$3" |$2 %]/ig; --- a/installer/install.pl +++ a/installer/install.pl @@ -292,7 +292,7 @@ elsif ( $step && $step == 3 ) { # Where is a category of requirement : required, recommended optional # level should contain : # SQL File for import With a readable name. -# txt File taht explains what this SQL File is meant for. +# txt File that explains what this SQL File is meant for. # Could be VERY useful to have A Big file for a kind of library. # But could also be useful to have some Authorised values data set prepared here. # Marcflavour Selection is achieved through radiobuttons. --- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml +++ a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml @@ -181,7 +181,7 @@ Directories Statistics Technical reports - Standars/specifications + Standards/specifications Legal cases and case notes Law reports and digests Yearbooks @@ -212,7 +212,7 @@ Directories Statistics Technical reports - Standars/specifications + Standards/specifications Legal cases and case notes Law reports and digests Yearbooks @@ -243,7 +243,7 @@ Directories Statistics Technical reports - Standars/specifications + Standards/specifications Legal cases and case notes Law reports and digests Yearbooks --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -314,7 +314,7 @@ Accounting details
  1. - +
  2. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -318,7 +318,7 @@ [% END %] Required [% END %] - +
  3. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -201,7 +201,7 @@ Patrons: yes: Do no: "Don't" - track last patron activity. - - Everytime a patron will connect, the borrowers.lastseen will be updated with the current time. + - Every time a patron will connect, the borrowers.lastseen will be updated with the current time. - - Block a patron's account if it reaches - pref: FailedLoginAttempts --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl +++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl @@ -428,7 +428,7 @@ poetry - rehersal + rehearsal reporting --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -148,7 +148,7 @@ abc au - + --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -26,7 +26,7 @@ [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] [% IF ( nopermission ) %] - +

    Access denied

    Sorry, the system doesn't think you have permission to access this page.

    @@ -50,7 +50,7 @@ [% END %] [% IF ( different_ip ) %] - +

    You are logging from a different IP address. Please log in again.

    @@ -58,7 +58,7 @@ [% IF invalid_username_or_password || too_many_login_attempts %] - +

    You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.

    --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -140,7 +140,7 @@ [% END # / IF confirm %] [% IF ( nopermission ) %] - +

    Access denied

    Sorry, this self-checkout station has lost authentication. Please contact the administrator to resolve this problem.

    @@ -148,7 +148,7 @@ [% END %] [% IF ( different_ip ) %] - +

    Session lost

    You are accessing self-checkout from a different IP address! please log in again.

    @@ -156,7 +156,7 @@ [% END %] [% IF ( invalid_username_or_password ) %] - +

    Record not found

    Your userid was not found in the database. Please try again.

    --- a/labels/label-manage.pl +++ a/labels/label-manage.pl @@ -61,7 +61,7 @@ my $display_columns = { layout => [ # db column => {col label {profile_id => {label => 'Profile ID', link_field => 0}}, {printer_name => {label => 'Printer Name', link_field => 0}}, {paper_bin => {label => 'Paper Bin', link_field => 0}}, - {_template_code => {label => 'Template Name', link_field => 0}}, # this display column does not have a corrisponding db column in the profile table, hence the underscore + {_template_code => {label => 'Template Name', link_field => 0}}, # this display column does not have a corresponding db column in the profile table, hence the underscore {select => {label => 'Actions', value => 'profile_id'}}, ], batch => [ @@ -73,7 +73,7 @@ my $display_columns = { layout => [ # db column => {col label ], }; -my $label_element = $cgi->param('label_element') || 'template'; # default to template managment +my $label_element = $cgi->param('label_element') || 'template'; # default to template management my $op = $cgi->param('op') || 'none'; my $element_id = $cgi->param('element_id') || undef; my $error = $cgi->param('error') || 0; --- a/misc/batchDeleteUnusedSubfields.pl +++ a/misc/batchDeleteUnusedSubfields.pl @@ -30,7 +30,7 @@ if ($version || (!$confirm)) { This script cleans unused subfields in the MARC DB. If you alter the MARC parameters and remove a subfield (ie : move it to ignore (10) tab), existing subfields are NOT removed. It's not a bug, it prevents deleting useful values in case of erroneous move. -This script definetly remove unused subfields in the MARC DB. +This script definitely remove unused subfields in the MARC DB. syntax : \t./cleanmarcdb.pl -h (or without arguments => shows this screen) \t./cleanmarcdb.pl -c (c like confirm => cleans the marc DB (may be long) --- a/misc/check_sysprefs.pl +++ a/misc/check_sysprefs.pl @@ -21,7 +21,7 @@ sub check_sys_pref { if ( !-d _ ) { my $name = $File::Find::name; if ( $name =~ /(\.pl|\.pm)$/ ) { - open( FILE, "$_" ) || die "cant open $name"; + open( FILE, "$_" ) || die "can't open $name"; while ( my $inp = ) { if ( $inp =~ /C4::Context->preference\((.*?)\)/ ) { my $variable = $1; --- a/opac/ilsdi.pl +++ a/opac/ilsdi.pl @@ -32,7 +32,7 @@ use CGI qw ( -utf8 ); This script is a basic implementation of ILS-DI protocol for Koha. It acts like a dispatcher, that get the CGI request, check required and -optionals arguments, call a function from C4::ILS-DI, and finaly +optionals arguments, call a function from C4::ILS-DI, and finally outputs the returned hashref as XML. =cut --- a/opac/opac-passwd.pl +++ a/opac/opac-passwd.pl @@ -92,7 +92,7 @@ if ( C4::Context->preference("OpacPasswordChange") ) { # Called Empty, Ask for data. $template->param( 'Ask_data' => '1' ); if (!$query->param('Oldkey') && ($query->param('Newkey') || $query->param('Confirm'))){ - # Old password is empty but one of the others isnt + # Old password is empty but one of the others isn't $template->param( 'Error_messages' => '1' ); $template->param( 'WrongPass' => '1' ); } --- a/opac/opac-reserve.pl +++ a/opac/opac-reserve.pl @@ -496,7 +496,7 @@ foreach my $biblioNum (@biblionumbers) { $itemInfo->{backgroundcolor} = 'other'; } - # Check of the transfered documents + # Check of the transferred documents my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itemNum); if ( $transfertwhen && ($transfertwhen ne '') ) { --- a/opac/opac-search.pl +++ a/opac/opac-search.pl @@ -326,7 +326,7 @@ if ( $template_type && $template_type eq 'advsearch' ) { # shouldn't appear on the first one, scan indexes should, adding a new # box should only appear on the last, etc. my @search_boxes_array; - my $search_boxes_count = 3; # begin whith 3 boxes + my $search_boxes_count = 3; # begin with 3 boxes $template->param( search_boxes_count => $search_boxes_count ); if ($cgi->cookie("num_paragraph")){ --- a/opac/opac-sendbasket.pl +++ a/opac/opac-sendbasket.pl @@ -183,7 +183,7 @@ END_OF_BODY $template->param( SENT => "1" ); } else { - # do something if it doesnt work.... + # do something if it doesn't work.... carp "Error sending mail: empty basket" if !defined($iso2709); carp "Error sending mail: $Mail::Sendmail::error" if $Mail::Sendmail::error; $template->param( error => 1 ); --- a/opac/opac-sendshelf.pl +++ a/opac/opac-sendshelf.pl @@ -183,7 +183,7 @@ END_OF_BODY $template->param( SENT => "1" ); } else { - # do something if it doesnt work.... + # do something if it doesn't work.... carp "Error sending mail: $Mail::Sendmail::error \n"; $template->param( error => 1 ); } --- a/patroncards/manage.pl +++ a/patroncards/manage.pl @@ -44,7 +44,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( ); my $op = $cgi->param('op') || 'none'; -my $card_element = $cgi->param('card_element') || 'template'; # default to template managment +my $card_element = $cgi->param('card_element') || 'template'; # default to template management my $element_id = $cgi->param('element_id') || 0; # there should never be an element with a id of 0 so this is a safe default my $db_rows = {}; @@ -64,7 +64,7 @@ my $display_columns = { layout => [ # db column => {col label profile => [ {profile_id => {label => 'Profile ID', link_field => 0}}, {printer_name => {label => 'Printer Name', link_field => 0}}, {paper_bin => {label => 'Paper Bin', link_field => 0}}, - {_template_code => {label => 'Template Name', link_field => 0}}, # this display column does not have a corrisponding db column in the profile table, hence the underscore + {_template_code => {label => 'Template Name', link_field => 0}}, # this display column does not have a corresponding db column in the profile table, hence the underscore {_action => {label => 'Action', link_field => 0}}, {select => {label => 'Select', value => 'profile_id'}}, ], --- a/reports/borrowers_stats.pl +++ a/reports/borrowers_stats.pl @@ -126,7 +126,7 @@ if ($do_it) { $req->execute; $template->param( SORT1_LOOP => $req->fetchall_arrayref({})); $req = $dbh->prepare("SELECT DISTINCTROW sort2 AS value FROM borrowers WHERE sort2 IS NOT NULL AND sort2 <> '' ORDER BY sort2 LIMIT 200"); - # More than 200 items in a dropdown is not going to be useful anyway, and w/ 50,000 patrons we can destory DB performance. + # More than 200 items in a dropdown is not going to be useful anyway, and w/ 50,000 patrons we can destroy DB performance. $req->execute; $template->param( SORT2_LOOP => $req->fetchall_arrayref({})); --- a/reports/guided_reports.pl +++ a/reports/guided_reports.pl @@ -225,7 +225,7 @@ elsif ( $phase eq 'Update SQL'){ $cache_expiry *= 86400; # 60 * 60 * 24 } } - # check $cache_expiry isnt too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp + # check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp if( $cache_expiry >= 2592000 ){ push @errors, {cache_expiry => $cache_expiry}; } @@ -322,7 +322,7 @@ elsif ( $phase eq 'Report on this Area' ) { } elsif( $cache_expiry_units eq "days" ){ $cache_expiry *= 86400; # 60 * 60 * 24 } - # check $cache_expiry isnt too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp + # check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp if( $cache_expiry >= 2592000 ){ # oops, over the limit of 30 days # report error to user $template->param( @@ -334,7 +334,7 @@ elsif ( $phase eq 'Report on this Area' ) { 'public' => scalar $input->param('public'), ); } else { - # they have choosen a new report and the area to report on + # they have chosen a new report and the area to report on $template->param( 'build2' => 1, 'area' => scalar $input->param('area'), @@ -586,7 +586,7 @@ elsif ( $phase eq 'Save Report' ) { $cache_expiry *= 86400; # 60 * 60 * 24 } } - # check $cache_expiry isnt too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp + # check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp if( $cache_expiry && $cache_expiry >= 2592000 ){ push @errors, {cache_expiry => $cache_expiry}; } --- a/reserve/request.pl +++ a/reserve/request.pl @@ -452,7 +452,7 @@ foreach my $biblionumber (@biblionumbers) { # for branches they arent logged in to if ( C4::Context->preference("IndependentBranches") ) { if (! C4::Context->preference("canreservefromotherbranches")){ - # cant reserve items so need to check if item homebranch and userenv branch match if not we cant reserve + # can't reserve items so need to check if item homebranch and userenv branch match if not we can't reserve my $userenv = C4::Context->userenv; unless ( C4::Context->IsSuperLibrarian ) { $item->{cantreserve} = 1 if ( $item->{homebranch} ne $userenv->{branch} ); --- a/serials/routing-preview.pl +++ a/serials/routing-preview.pl @@ -16,7 +16,7 @@ # along with Koha; if not, see . # Routing Preview.pl script used to view a routing list after creation -# lets one print out routing slip and create (in this instance) the heirarchy +# lets one print out routing slip and create (in this instance) the hierarchy # of reserves for the serial use Modern::Perl; use CGI qw ( -utf8 ); --- a/serials/subscription-detail.pl +++ a/serials/subscription-detail.pl @@ -45,7 +45,7 @@ if ( $op and $op eq "close" ) { C4::Serials::ReopenSubscription( $subscriptionid ); } -# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...) +# the subscription must be deletable if there is NO issues for a reason or another (should not happened, but...) # Permission needed if it is a deletion (del) : delete_subscription # Permission needed otherwise : * --