From 37f2ab4d240926b9cb0b09090cff24c5ff63c5fd Mon Sep 17 00:00:00 2001 From: "G. Richardson" Date: Wed, 13 May 2020 09:13:47 +0200 Subject: [PATCH] =?utf8?q?Typos=20und=20spellcheck=20f=C3=BCr=20occurred?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Controller/Letter.pm | 2 +- SL/DATEV.pm | 2 +- SL/DB.pm | 2 +- SL/X.pm | 2 +- locale/de/all | 2 +- locale/en/all | 2 +- t/006spellcheck.t | 1 + templates/mail/self_test/status_mail.txt | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm index 2c93480c4..3ee9eb78d 100644 --- a/SL/Controller/Letter.pm +++ b/SL/Controller/Letter.pm @@ -151,7 +151,7 @@ sub action_delete { my ($self, %params) = @_; if (!$self->letter->delete) { - flash('error', t8('An error occured. Letter could not be deleted.')); + flash('error', t8('An error occurred. Letter could not be deleted.')); return $self->action_update; } diff --git a/SL/DATEV.pm b/SL/DATEV.pm index c5d75ea00..3766c1b60 100644 --- a/SL/DATEV.pm +++ b/SL/DATEV.pm @@ -1634,7 +1634,7 @@ Forces a garbage collection on previous exports which will delete all exports th =item errors -Returns a list of errors that occured. If no errors occured, the export was a success. +Returns a list of errors that occurred. If no errors occurred, the export was a success. =item export diff --git a/SL/DB.pm b/SL/DB.pm index ff54cceeb..a59fd6fdf 100644 --- a/SL/DB.pm +++ b/SL/DB.pm @@ -205,7 +205,7 @@ within another C, whereas L can not. =item Return values C adopts the behaviour of C in that it returns the -result of the inner block, and C if an error occured. This way you can +result of the inner block, and C if an error occurred. This way you can use the same pattern you would normally use with C for C: diff --git a/SL/X.pm b/SL/X.pm index b8ae60ac6..9343deab0 100644 --- a/SL/X.pm +++ b/SL/X.pm @@ -22,7 +22,7 @@ use Exception::Class ( 'SL::X::DBRoseError' => { isa => 'SL::X::DBError', fields => [ qw(class metaobject object) ], - defaults => { error_template => [ '\'%s\' in object of type \'%s\' occured', qw(db_error class) ] }, + defaults => { error_template => [ '\'%s\' in object of type \'%s\' occurred', qw(db_error class) ] }, }, 'SL::X::DBUtilsError' => { isa => 'SL::X::DBError', diff --git a/locale/de/all b/locale/de/all index 7c0a2acea..1e53eca9c 100755 --- a/locale/de/all +++ b/locale/de/all @@ -290,7 +290,7 @@ $self->{texts} = { 'Amount payable' => 'Noch zu bezahlender Betrag', 'Amount payable less discount' => 'Noch zu bezahlender Betrag abzüglich Skonto', 'Amounts differ too much' => 'Beträge weichen zu sehr voneinander ab.', - 'An error occured. Letter could not be deleted.' => 'Es ist ein Fehler aufgetreten. Der Brief konnte nicht gelöscht werden.', + 'An error occurred. Letter could not be deleted.' => 'Es ist ein Fehler aufgetreten. Der Brief konnte nicht gelöscht werden.', 'An error occurred while transferring the file.' => 'Bei Übertragung der Datei trat ein Fehler auf', 'An exception occurred during execution.' => 'Während der Ausführung trat eine Ausnahme auf.', 'An invalid character was used (invalid characters: #1).' => 'Ein ungültiges Zeichen wurde benutzt (ungültige Zeichen: #1).', diff --git a/locale/en/all b/locale/en/all index 788b74077..0edb889be 100644 --- a/locale/en/all +++ b/locale/en/all @@ -290,7 +290,7 @@ $self->{texts} = { 'Amount payable' => '', 'Amount payable less discount' => '', 'Amounts differ too much' => '', - 'An error occured. Letter could not be deleted.' => '', + 'An error occurred. Letter could not be deleted.' => '', 'An error occurred while transferring the file.' => '', 'An exception occurred during execution.' => '', 'An invalid character was used (invalid characters: #1).' => '', diff --git a/t/006spellcheck.t b/t/006spellcheck.t index bc511a426..71b7e58b2 100644 --- a/t/006spellcheck.t +++ b/t/006spellcheck.t @@ -43,6 +43,7 @@ existant fomr invoce lenght +occured paramater pirce postition diff --git a/templates/mail/self_test/status_mail.txt b/templates/mail/self_test/status_mail.txt index c2d8f9992..b34ce1102 100644 --- a/templates/mail/self_test/status_mail.txt +++ b/templates/mail/self_test/status_mail.txt @@ -1,7 +1,7 @@ kivitendo selftest report. [% IF errors %] - General error(s) have occured. + General error(s) have occurred. [% errors %] [% END %] -- 2.20.1