From e987766b2484908d802ac80f83b79f629b8c9da2 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 16 Dec 2013 12:01:21 +0100 Subject: [PATCH] [PASSED QA] Bug 11398: A typo occurred with occured This patch cures occured and makes occurred occur. Note that I found them while testing bug 11170. In a follow-up of 11170, I corrected this typo in parcels.tt. This patch touches update22to30.pl and modborrowers.tt Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Fixes a typo in 2 files. http://bugs.koha-community.org/show_bug.cgi?id=11298 --- installer/data/mysql/update22to30.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/update22to30.pl b/installer/data/mysql/update22to30.pl index 23d7a75..f10ace9 100755 --- a/installer/data/mysql/update22to30.pl +++ b/installer/data/mysql/update22to30.pl @@ -3443,7 +3443,7 @@ my $DBversion = "3.00.00.000"; $dbh->do($sql); if ($dbh->err) { print "==================== - An error occured during : + An error occurred during : \t$sql It probably means there is something wrong in your DB : a row ($table.$row->{key}) refers to a value in $row->{foreigntable}.$row->{foreignkey} that does not exist. solve the problem and run updater again (or just the previous SQL statement). You can find those values with select diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index 1e76757..a55dbd4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -191,7 +191,7 @@ [% IF ( op == 'show_results' ) %] [% IF ( errors ) %]
-

Errors occured:

+

Errors occurred:

    [% FOREACH error IN errors %] [% IF ( error.error == 'can_not_update' ) %] -- 1.8.3.2