diff --git a/.codespell-ignore b/.codespell-ignore index 7ba49e57be..7c249c7081 100644 --- a/.codespell-ignore +++ b/.codespell-ignore @@ -16,3 +16,4 @@ ore sav theses rouge +connexion diff --git a/Koha/Edifact.pm b/Koha/Edifact.pm index d4b8e5b3ef..7479a9b42b 100644 --- a/Koha/Edifact.pm +++ b/Koha/Edifact.pm @@ -280,7 +280,7 @@ Edifact - Edifact message handler =head2 get_transmission - This method is useful in debug:ing. Call on an Edifact object + This method is useful in debugging. Call on an Edifact object it returns the object's transmission member =head2 message_type diff --git a/Koha/Edifact/Line.pm b/Koha/Edifact/Line.pm index be83bd2c77..4c55e06f75 100644 --- a/Koha/Edifact/Line.pm +++ b/Koha/Edifact/Line.pm @@ -755,9 +755,9 @@ sub pri_price { # In practice qualifier is AAE in the quote and AAA & AAB in invoices # but the following are defined - # AAA calculation price net (unit price excl tax but incl any allowances or charges) - # AAB calculation price gross (unit price excl all taxes, allowances and charges ) - # AAE information price (incl tax but excl allowances or charges ) + # AAA calculation price net (unit price excluding tax but including any allowances or charges) + # AAB calculation price gross (unit price excluding all taxes, allowances and charges ) + # AAE information price (including tax but excluding allowances or charges ) # AAF information price (including all taxes, allowances or charges) foreach my $s ( @{ $self->{segs} } ) { if ( $s->tag eq 'PRI' && $s->elem( 0, 0 ) eq $price_qualifier ) { diff --git a/fix-perl-path.PL b/fix-perl-path.PL index 43be7f7a43..df9f13d37b 100644 --- a/fix-perl-path.PL +++ b/fix-perl-path.PL @@ -28,8 +28,8 @@ my $bindir = $Config{installbin}; $bindir =~ s!\\!/!g; # make all directory separators uniform since Win32 does not care and *nix does... my $shebang = "#!$bindir\/perl"; -warn "Perl binary located in $bindir on this system.\n" if $DEBUG; -warn "The shebang line for this systems should be $shebang\n\n" if $DEBUG; +warn "Perl binary located in $bindir on this system.\n" if $DEBUG; +warn "The shebang line for this system should be $shebang\n\n" if $DEBUG; die if $basedir eq 'test'; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 136dc90fd5..1daafbea0a 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2763,7 +2763,7 @@ CREATE TABLE `deletedborrowers` ( `updated_on` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() COMMENT 'time of last change could be useful for synchronization with external systems (among others)', `lastseen` datetime DEFAULT NULL COMMENT 'last time a patron has been seen (connected at the OPAC or staff interface)', `lang` varchar(25) NOT NULL DEFAULT 'default' COMMENT 'lang to use to send notices to this patron', - `login_attempts` int(4) NOT NULL DEFAULT 0 COMMENT 'number of failed login attemps', + `login_attempts` int(4) NOT NULL DEFAULT 0 COMMENT 'number of failed login attempts', `overdrive_auth_token` mediumtext DEFAULT NULL COMMENT 'persist OverDrive auth token', `anonymized` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'flag for data anonymization', `autorenew_checkouts` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'flag for allowing auto-renewal', diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index fd03ce9cf3..b50e922f06 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -76,8 +76,8 @@ [% FOREACH line IN result %] - [% IF result.html %] - [% result.html | $raw %] + [% IF line.html %] + [% line.html | $raw %] [% ELSE %] [% PROCESS authresult summary=line.summary authid=line.authid %] [% END %] diff --git a/misc/bin/connexion_import_daemon.pl b/misc/bin/connexion_import_daemon.pl index 2c0e53eaf9..47bd449346 100755 --- a/misc/bin/connexion_import_daemon.pl +++ b/misc/bin/connexion_import_daemon.pl @@ -62,11 +62,11 @@ Config file format: add_only_for_matches, add_only_for_new or ignore import_mode - stage or direct framework - to be used if import_mode is direct, if blank, will use default - connection_user - User sent from connection client - connection_password - Password sent from connection client + connexion_user - User sent from connexion client + connexion_password - Password sent from connexion client - Note: If connection parameters are not defined request authentication will not be checked - You should specify a different user for connection to protect the Koha credentials + Note: If connexion parameters are not defined request authentication will not be checked + You should specify a different user for connexion to protect the Koha credentials All process related parameters (all but ip and port) have default values as per Koha import process. diff --git a/t/db_dependent/Holds/HoldFulfillmentPolicy.t b/t/db_dependent/Holds/HoldFulfillmentPolicy.t index a092a12505..e4c59be287 100755 --- a/t/db_dependent/Holds/HoldFulfillmentPolicy.t +++ b/t/db_dependent/Holds/HoldFulfillmentPolicy.t @@ -184,7 +184,7 @@ $reserve_id = AddReserve( is( $status, q{}, "Hold where pickup ne home, pickup ne holding not targeted" ); Koha::Holds->find($reserve_id)->cancel; -# With hold_fulfillment_policy = any, hold should be pikcup up regardless of matching home or holding branch +# With hold_fulfillment_policy = any, hold should be picked regardless of matching home or holding branch $dbh->do("DELETE FROM circulation_rules"); Koha::CirculationRules->set_rules( { diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t index 90b73c1bf2..ea0fff354e 100755 --- a/t/db_dependent/HoldsQueue.t +++ b/t/db_dependent/HoldsQueue.t @@ -861,7 +861,7 @@ $holds_queue = $dbh->selectall_arrayref( "SELECT * FROM tmp_holdsqueue", { Slice is( @$holds_queue, 0, "Hold where pickup ne home, pickup ne holding not targeted" ); Koha::Holds->find($reserve_id)->cancel; -# With hold_fulfillment_policy = any, hold should be pikcup up regardless of matching home or holding branch +# With hold_fulfillment_policy = any, hold should be picked regardless of matching home or holding branch $dbh->do("DELETE FROM circulation_rules"); Koha::CirculationRules->set_rules( { diff --git a/t/mock_templates/intranet-tmpl/prog/en/modules/about.tt b/t/mock_templates/intranet-tmpl/prog/en/modules/about.tt index fd8bf7e09c..701ae5407f 100644 --- a/t/mock_templates/intranet-tmpl/prog/en/modules/about.tt +++ b/t/mock_templates/intranet-tmpl/prog/en/modules/about.tt @@ -252,7 +252,7 @@ [% WRAPPER tab_panel tabname= "perl" bt_active = 1 %] - [% FOREACH table IN tablee %] + [% FOREACH table IN tables %] [% FOREACH ro IN table.row %] [% IF ( ro.require ) %] @@ -1186,7 +1186,7 @@ - [% FOREACH table IN tablee2 %] + [% FOREACH table IN tables2 %] [% FOREACH ro IN table.row2 %] diff --git a/t/mock_templates/intranet-tmpl/prog/fr-CA/modules/about.tt b/t/mock_templates/intranet-tmpl/prog/fr-CA/modules/about.tt index 330aa318d9..825a99a893 100644 --- a/t/mock_templates/intranet-tmpl/prog/fr-CA/modules/about.tt +++ b/t/mock_templates/intranet-tmpl/prog/fr-CA/modules/about.tt @@ -252,7 +252,7 @@ [% WRAPPER tab_panel tabname= "perl" bt_active = 1 %]
Perl modules
Description
[% ro.date | html %]
- [% FOREACH table IN tablee %] + [% FOREACH table IN tables %] [% FOREACH ro IN table.row %] [% IF ( ro.require ) %] @@ -1192,7 +1192,7 @@ - [% FOREACH table IN tablee2 %] + [% FOREACH table IN tables2 %] [% FOREACH ro IN table.row2 %]
Perl modules
Description
[% ro.date | html %]