[LON-CAPA-cvs] cvs: rat / lonratedt.pm map.pm loncom/homework bridgetask.pm hint.pm inputtags.pm response.pm structuretags.pm loncom/interface loncommon.pm loncoursedata.pm londocs.pm londropadd.pm lonuserutils.pm slotrequest.pm loncom/interface/spreadsheet Spreadsheet.pm loncom/interface/statistics lonproblemstatistics.pm lonstudentsubmissions.pm loncom/lonnet/perl lonnet.pm loncom/xml londefdef.pm lonxml.pm run.pm
bisitz
lon-capa-cvs-allow@mail.lon-capa.org
Thu, 11 Sep 2008 14:47:31 -0000
This is a MIME encoded message
--bisitz1221144451
Content-Type: text/plain
bisitz Thu Sep 11 10:47:31 2008 EDT
Modified files:
/loncom/homework bridgetask.pm hint.pm inputtags.pm response.pm
structuretags.pm
/loncom/interface loncommon.pm loncoursedata.pm londocs.pm
londropadd.pm lonuserutils.pm slotrequest.pm
/loncom/interface/spreadsheet Spreadsheet.pm
/loncom/interface/statistics lonproblemstatistics.pm
lonstudentsubmissions.pm
/loncom/lonnet/perl lonnet.pm
/loncom/xml londefdef.pm lonxml.pm run.pm
/rat lonratedt.pm map.pm
Log:
Past tense of "occur" is "occurred" (rr!)
Also added some missing &mt() calls and corrected some other little typos
--bisitz1221144451
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20080911104731.txt"
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.239 loncom/homework/bridgetask.pm:1.240
--- loncom/homework/bridgetask.pm:1.239 Wed Aug 13 05:10:44 2008
+++ loncom/homework/bridgetask.pm Thu Sep 11 10:47:17 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.239 2008/08/13 09:10:44 bisitz Exp $
+# $Id: bridgetask.pm,v 1.240 2008/09/11 14:47:17 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1325,7 +1325,7 @@
}
}
if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
- # instance generation occured and hasn't yet been stored
+ # instance generation occurred and hasn't yet been stored
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
Index: loncom/homework/hint.pm
diff -u loncom/homework/hint.pm:1.68 loncom/homework/hint.pm:1.69
--- loncom/homework/hint.pm:1.68 Wed May 23 18:36:21 2007
+++ loncom/homework/hint.pm Thu Sep 11 10:47:17 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# implements the tags that control the hints
#
-# $Id: hint.pm,v 1.68 2007/05/23 22:36:21 albertel Exp $
+# $Id: hint.pm,v 1.69 2008/09/11 14:47:17 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -160,7 +160,7 @@
my $partid=$Apache::inputtags::part;
my $id=$Apache::inputtags::hint[-1];
- #id submissions occured under
+ #id submissions occurred under
my $submitid=$Apache::inputtags::response[-1];
my $response = $Apache::lonhomework::history{
@@ -395,7 +395,7 @@
&Apache::response::setup_params('stringhint',$safeeval);
my $partid=$Apache::inputtags::part;
my $id=$Apache::inputtags::hint[-1];
- #id submissions occured under
+ #id submissions occurred under
my $submitid=$Apache::inputtags::response[-1];
my $response = $Apache::lonhomework::history{
"resource.$partid.$submitid.submission"};
@@ -530,7 +530,7 @@
my ($foilmatch,$conceptmatch)=(-1,-1);
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
my $partid=$Apache::inputtags::part;
- #id submissions occured under
+ #id submissions occurred under
my $submitid=$Apache::inputtags::response[-1];
my $part_id="$partid.$submitid";
my %answer;
@@ -610,7 +610,7 @@
my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
eval('@answer ='.$answer);
my $partid=$Apache::inputtags::part;
- #id submissions occured under
+ #id submissions occurred under
my $submitid=$Apache::inputtags::response[-1];
my $part_id="$partid.$submitid";
my $response = $Apache::lonhomework::history{
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.246 loncom/homework/inputtags.pm:1.247
--- loncom/homework/inputtags.pm:1.246 Wed Sep 10 04:47:15 2008
+++ loncom/homework/inputtags.pm Thu Sep 11 10:47:17 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.246 2008/09/10 08:47:15 onken Exp $
+# $Id: inputtags.pm,v 1.247 2008/09/11 14:47:17 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -743,7 +743,7 @@
$css_class=$possible_class{'not_charged_try'};
$button = 1;
} elsif ($award eq 'ERROR') {
- $message = &mt('An error occured while grading your answer.');
+ $message = &mt('An error occurred while grading your answer.');
$css_class=$possible_class{'not_charged_try'};
$button = 1;
} elsif ($award eq 'TOO_LONG') {
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.203 loncom/homework/response.pm:1.204
--- loncom/homework/response.pm:1.203 Tue Sep 9 09:56:48 2008
+++ loncom/homework/response.pm Thu Sep 11 10:47:17 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.203 2008/09/09 13:56:48 riegler Exp $
+# $Id: response.pm,v 1.204 2008/09/11 14:47:17 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1192,7 +1192,7 @@
}
# Submit All button on a .page was pressed
if (defined($env{'form.all_submit'})) { return 1; }
- # otherwise no submission occured
+ # otherwise no submission occurred
return 0;
}
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.429 loncom/homework/structuretags.pm:1.430
--- loncom/homework/structuretags.pm:1.429 Mon Aug 25 23:18:29 2008
+++ loncom/homework/structuretags.pm Thu Sep 11 10:47:17 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.429 2008/08/26 03:18:29 raeburn Exp $
+# $Id: structuretags.pm,v 1.430 2008/09/11 14:47:17 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1493,7 +1493,7 @@
$return = &Apache::run::run($code,$safeeval);
}
if ($error) {
- &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running <while> on line').' '.$line.'</pre>');
+ &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running <while> on line').' '.$line.'</pre>');
}
} elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.682 loncom/interface/loncommon.pm:1.683
--- loncom/interface/loncommon.pm:1.682 Mon Sep 8 15:39:26 2008
+++ loncom/interface/loncommon.pm Thu Sep 11 10:47:21 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.682 2008/09/08 19:39:26 raeburn Exp $
+# $Id: loncommon.pm,v 1.683 2008/09/11 14:47:21 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1507,9 +1507,9 @@
$fh = Apache::File->new('>/home/httpd'.$filename);
if (! defined($fh)) {
$r->log_error("Couldn't open $filename for output $!");
- $r->print("Problems occured in creating the output file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
+ $r->print(&mt('Problems occurred in creating the output file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.'));
}
return ($fh,$filename)
}
Index: loncom/interface/loncoursedata.pm
diff -u loncom/interface/loncoursedata.pm:1.187 loncom/interface/loncoursedata.pm:1.188
--- loncom/interface/loncoursedata.pm:1.187 Thu Apr 17 10:51:43 2008
+++ loncom/interface/loncoursedata.pm Thu Sep 11 10:47:21 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncoursedata.pm,v 1.187 2008/04/17 14:51:43 raeburn Exp $
+# $Id: loncoursedata.pm,v 1.188 2008/09/11 14:47:21 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -930,7 +930,7 @@
$dbh->do($request);
if ($dbh->err()) {
&Apache::lonnet::logthis("error ".$dbh->errstr().
- " occured executing \n".
+ " occurred executing \n".
$request);
}
return;
@@ -983,7 +983,7 @@
$dbh->do($request);
if ($dbh->err()) {
&Apache::lonnet::logthis("error ".$dbh->errstr().
- " occured executing \n".
+ " occurred executing \n".
$request);
}
return;
@@ -1053,7 +1053,7 @@
$dbh->do($request);
if ($dbh->err()) {
&Apache::lonnet::logthis("error ".$dbh->errstr().
- " occured executing \n".
+ " occurred executing \n".
$request);
}
return;
@@ -1112,7 +1112,7 @@
Output: $returnstatus
-$returnstatus is a string describing any errors that occured. 'okay' is the
+$returnstatus is a string describing any errors that occurred. 'okay' is the
default.
This subroutine loads a students data using lonnet::dump and inserts
@@ -1126,7 +1126,7 @@
Once the "fulldump" tables are updated, the tables used for chart and
spreadsheet (which hold only the current state of the student on their
-homework, not historical data) are updated. If all updates have occured
+homework, not historical data) are updated. If all updates have occurred
successfully, $student_table is updated to reflect the time of the update.
Notice we do not insert the data and immediately query it. This means it
@@ -1398,7 +1398,7 @@
Output: $returnstatus, \%student_data
-$returnstatus is a string describing any errors that occured. 'okay' is the
+$returnstatus is a string describing any errors that occurred. 'okay' is the
default.
\%student_data is the data returned by a call to lonnet::currentdump.
@@ -2209,7 +2209,7 @@
$dbh->do($request);
if ($dbh->err()) {
&Apache::lonnet::logthis("error ".$dbh->errstr().
- " occured executing \n".
+ " occurred executing \n".
$request);
}
return;
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.311 loncom/interface/londocs.pm:1.312
--- loncom/interface/londocs.pm:1.311 Thu Sep 4 20:08:46 2008
+++ loncom/interface/londocs.pm Thu Sep 11 10:47:21 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.311 2008/09/05 00:08:46 raeburn Exp $
+# $Id: londocs.pm,v 1.312 2008/09/11 14:47:21 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -309,10 +309,10 @@
chdir $cwd;
$outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
if ($copyresult) {
- $outcome .= 'The following errors occurred during export - '.$copyresult;
+ $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult);
}
} else {
- $outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />';
+ $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
}
}
$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
@@ -924,7 +924,7 @@
my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
'output',$1.$2);
if ($result != m|^/uploaded/|) {
- $errtext.='Map not saved: A network error occured when trying to save the new map. ';
+ $errtext.='Map not saved: A network error occurred when trying to save the new map. ';
$fatal = 2;
}
if ($fatal) {
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.173 loncom/interface/londropadd.pm:1.174
--- loncom/interface/londropadd.pm:1.173 Mon Oct 22 18:16:38 2007
+++ loncom/interface/londropadd.pm Thu Sep 11 10:47:21 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.173 2007/10/22 22:16:38 raeburn Exp $
+# $Id: londropadd.pm,v 1.174 2008/09/11 14:47:21 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1512,9 +1512,9 @@
time.'_'.rand(1000000000).'.csv';
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
$r->log_error("Couldn't open $CSVfilename for output $!");
- $r->print("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
+ $r->print(&mt('Problems occurred in writing the csv file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.'));
$CSVfile = undef;
}
#
@@ -2051,7 +2051,7 @@
$env{'request.course.id'},
$section,undef);
if ($modify_section_results !~ /^ok/) {
- $r->print(&mt('An error occured during the attempt to change the section for this student.')."<br />");
+ $r->print(&mt('An error occurred during the attempt to change the section for this student.')."<br />");
}
my $roleresults = &Apache::lonnet::modifystudent
($sdom,$slogin,$sid,undef,undef,$firstname,$middlename,$lastname,
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.63 loncom/interface/lonuserutils.pm:1.64
--- loncom/interface/lonuserutils.pm:1.63 Wed Aug 27 12:54:49 2008
+++ loncom/interface/lonuserutils.pm Thu Sep 11 10:47:21 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.63 2008/08/27 16:54:49 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.64 2008/09/11 14:47:21 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2241,9 +2241,9 @@
time.'_'.rand(1000000000).'.csv';
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
$r->log_error("Couldn't open $CSVfilename for output $!");
- $r->print("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
+ $r->print(&mt('Problems occurred in writing the csv file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.'));
$CSVfile = undef;
}
#
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.81 loncom/interface/slotrequest.pm:1.82
--- loncom/interface/slotrequest.pm:1.81 Mon Jan 14 09:32:30 2008
+++ loncom/interface/slotrequest.pm Thu Sep 11 10:47:21 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.81 2008/01/14 14:32:30 raeburn Exp $
+# $Id: slotrequest.pm,v 1.82 2008/09/11 14:47:21 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -335,7 +335,7 @@
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
"^$slot_name\0");
if (&Apache::lonnet::error(%consumed)) {
- $r->print("<p><span class=\"LC_error\">".&mt('A network error has occured.').'</span></p>');
+ $r->print("<p><span class=\"LC_error\">".&mt('A network error has occrured.').'</span></p>');
return;
}
if (!%consumed) {
@@ -569,7 +569,9 @@
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot);
if ($slot_name =~ /^error: (.*)/) {
- $r->print("<p><span class=\"LC_error\">An error occured while attempting to make a reservation. ($1)</span></p>");
+ $r->print('<p><span class="LC_error">'
+ .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+ .'</span></p>');
&return_link($r);
return 0;
}
@@ -610,7 +612,9 @@
if (defined($reserved)) {
my $retvalue = 0;
if ($slot_name =~ /^error: (.*)/) {
- $r->print("<p><span class=\"LC_error\">An error occured while attempting to make a reservation. ($1)</span></p>");
+ $r->print('<p><span class="LC_error">'
+ .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+ .'</span></p>');
} elsif ($reserved > -1) {
$r->print("<p>Success: $description</p>");
$retvalue = 1;
Index: loncom/interface/spreadsheet/Spreadsheet.pm
diff -u loncom/interface/spreadsheet/Spreadsheet.pm:1.78 loncom/interface/spreadsheet/Spreadsheet.pm:1.79
--- loncom/interface/spreadsheet/Spreadsheet.pm:1.78 Tue Mar 11 22:45:27 2008
+++ loncom/interface/spreadsheet/Spreadsheet.pm Thu Sep 11 10:47:22 2008
@@ -1,5 +1,5 @@
#
-# $Id: Spreadsheet.pm,v 1.78 2008/03/12 02:45:27 raeburn Exp $
+# $Id: Spreadsheet.pm,v 1.79 2008/09/11 14:47:22 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1532,9 +1532,9 @@
my $file;
unless ($file = Apache::File->new('>'.'/home/httpd'.$filename)) {
$r->log_error("Couldn't open $filename for output $!");
- $r->print(&mt("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator."));
+ $r->print(&mt('Problems occurred in writing the csv file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.'));
$r->print("<pre>\n".$csvdata."</pre>\n");
return 0;
}
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.112 loncom/interface/statistics/lonproblemstatistics.pm:1.113
--- loncom/interface/statistics/lonproblemstatistics.pm:1.112 Mon Jan 14 09:32:49 2008
+++ loncom/interface/statistics/lonproblemstatistics.pm Thu Sep 11 10:47:22 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemstatistics.pm,v 1.112 2008/01/14 14:32:49 raeburn Exp $
+# $Id: lonproblemstatistics.pm,v 1.113 2008/09/11 14:47:22 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -714,7 +714,7 @@
'</h3><p>'.
&mt('It may take some time to update the student data '.
'for the first analysis. Future analysis this session '.
- ' will not have this delay.').
+ 'will not have this delay.').
'</p>');
&clean_up();
return;
@@ -728,7 +728,7 @@
($navmap,@sequences) =
&Apache::lonstatistics::selected_sequences_with_assessments();
if (! ref($navmap)) {
- $r->print('<h1>'.&mt('A course-wide error occured.').'</h1>'.
+ $r->print('<h1>'.&mt('A course-wide error occurred.').'</h1>'.
'<h3>'.$navmap.'</h3>');
&clean_up();
return;
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.46 loncom/interface/statistics/lonstudentsubmissions.pm:1.47
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.46 Fri Aug 18 11:15:38 2006
+++ loncom/interface/statistics/lonstudentsubmissions.pm Thu Sep 11 10:47:23 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.46 2006/08/18 15:15:38 raeburn Exp $
+# $Id: lonstudentsubmissions.pm,v 1.47 2008/09/11 14:47:23 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -928,9 +928,9 @@
time.'_'.rand(1000000000).'.csv';
unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
$r->log_error("Couldn't open $filename for output $!");
- $r->print("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
+ $r->print(&mt('Problems occurred in writing the csv file. '
+ .'This error has been logged. '
+ .'Please alert your LON-CAPA administrator.'));
$outputfile = undef;
}
#
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.966 loncom/lonnet/perl/lonnet.pm:1.967
--- loncom/lonnet/perl/lonnet.pm:1.966 Mon Sep 1 13:58:30 2008
+++ loncom/lonnet/perl/lonnet.pm Thu Sep 11 10:47:23 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.966 2008/09/01 17:58:30 raeburn Exp $
+# $Id: lonnet.pm,v 1.967 2008/09/11 14:47:23 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -8985,7 +8985,7 @@
=item * B<con_failed>: unable to contact remote host and unable to save message
for later delivery
-=item * B<error:>: an error a occured, a description of the error follows the :
+=item * B<error:>: an error a occurred, a description of the error follows the :
=item * B<no_such_host>: unable to fund a host associated with the user/domain
that was requested
@@ -9565,7 +9565,7 @@
'key_exists: <key>' -> failed to anything out of $storehash, as at
least <key> already existed in the db (other
requested keys may also already exist)
- 'error: <msg>' -> unable to tie the DB or other erorr occured
+ 'error: <msg>' -> unable to tie the DB or other error occurred
'con_lost' -> unable to contact request server
'refused' -> action was not allowed by remote machine
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.391 loncom/xml/londefdef.pm:1.392
--- loncom/xml/londefdef.pm:1.391 Fri Sep 5 07:23:06 2008
+++ loncom/xml/londefdef.pm Thu Sep 11 10:47:24 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.391 2008/09/05 11:23:06 onken Exp $
+# $Id: londefdef.pm,v 1.392 2008/09/11 14:47:24 bisitz Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -107,13 +107,13 @@
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
- #&Apache::lonxml::debug("M is evaulated to:$inside:");
+ #&Apache::lonxml::debug("M is evaluated to:$inside:");
}
my $tex = $inside;
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
if ($Apache::lontexconvert::errorstring) {
- my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occured while attempting to convert this TeX: <pre>';
+ my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occurred while attempting to convert this TeX: <pre>';
$tex = &HTML::Entities::encode($tex,'<>&"');
my ($linenumber) =
($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.485 loncom/xml/lonxml.pm:1.486
--- loncom/xml/lonxml.pm:1.485 Fri Sep 5 08:11:45 2008
+++ loncom/xml/lonxml.pm Thu Sep 11 10:47:24 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.485 2008/09/05 12:11:45 onken Exp $
+# $Id: lonxml.pm,v 1.486 2008/09/11 14:47:24 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1854,7 +1854,7 @@
my ($symb)=&Apache::lonnet::symbread();
if ( !$symb ) {
#public or browsers
- $errormsg=&mt("An error occured while processing this resource. The author has been notified.");
+ $errormsg=&mt("An error occurred while processing this resource. The author has been notified.");
}
my $host=$Apache::lonnet::perlvar{'lonHostID'};
push(@errors,
@@ -1893,9 +1893,9 @@
}
}
if ($env{'request.role.adv'}) {
- $errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
+ $errormsg=&mt("An error occurred while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
} else {
- $errormsg=&mt("An error occured while processing this resource. The instructor has been notified.");
+ $errormsg=&mt("An error occurred while processing this resource. The instructor has been notified.");
}
}
push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");
Index: loncom/xml/run.pm
diff -u loncom/xml/run.pm:1.58 loncom/xml/run.pm:1.59
--- loncom/xml/run.pm:1.58 Thu Mar 16 10:47:37 2006
+++ loncom/xml/run.pm Thu Sep 11 10:47:24 2008
@@ -1,6 +1,6 @@
package Apache::run;
#
-# $Id: run.pm,v 1.58 2006/03/16 15:47:37 albertel Exp $
+# $Id: run.pm,v 1.59 2008/09/11 14:47:24 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -135,7 +135,7 @@
}
my $errormsg='<pre>'.&HTML::Entities::encode($error,'<>&"').' '.
&HTML::Entities::encode($innererror,'<>&"').
- '</pre> occured while running <pre>';
+ '</pre> occurred while running <pre>';
$code=&HTML::Entities::encode($code,'<>&"');
if ($innererror=~/line (\d+)/) {
my $linenumber=$1;
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.88 rat/lonratedt.pm:1.89
--- rat/lonratedt.pm:1.88 Wed Jul 11 16:32:01 2007
+++ rat/lonratedt.pm Thu Sep 11 10:47:24 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.88 2007/07/11 20:32:01 albertel Exp $
+# $Id: lonratedt.pm,v 1.89 2008/09/11 14:47:24 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -360,7 +360,7 @@
unless ($fatal) {
$targetmsg='<b>'.&mt('Saved.').'</b><br />';
} else {
- $targetmsg='<b>'.&mt('An error occured while saving.').'</b><br />';
+ $targetmsg='<b>'.&mt('An error occurred while saving.').'</b><br />';
}
}
if ($env{'form.revert'}) {
Index: rat/map.pm
diff -u rat/map.pm:1.10 rat/map.pm:1.11
--- rat/map.pm:1.10 Fri Nov 30 22:07:39 2007
+++ rat/map.pm Thu Sep 11 10:47:24 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# routines for modyfing .sequence and .page files
#
-# $Id: map.pm,v 1.10 2007/12/01 03:07:39 albertel Exp $
+# $Id: map.pm,v 1.11 2008/09/11 14:47:24 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -456,7 +456,7 @@
$instr=join('',@content);
}
if ($instr eq -2) {
- $errtext.='Map not loaded: An error occured while trying to load the map.';
+ $errtext.='Map not loaded: An error occurred while trying to load the map.';
} elsif ($instr eq '-1') {
# Map doesn't exist
} elsif ($instr) {
@@ -679,7 +679,7 @@
my $result=&Apache::lonnet::finishuserfileupload($2,$1,
'output',$3);
if ($result != m|^/uploaded/|) {
- $errtext.='Map not saved: A network error occured when trying to save the map. ';
+ $errtext.='Map not saved: A network error occurred when trying to save the map. ';
}
} else {
if (open(my $fh,">$fn")) {
--bisitz1221144451--