--- loncom/homework/lonhomework.pm 2006/06/30 17:42:38 1.256
+++ loncom/homework/lonhomework.pm 2006/09/25 19:41:56 1.258
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.256 2006/06/30 17:42:38 albertel Exp $
+# $Id: lonhomework.pm,v 1.258 2006/09/25 19:41:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -514,8 +514,9 @@ sub due_date {
my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
$udom,$uname);
&Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
- if (defined($interval)) {
+ if ($interval =~ /\d+/) {
my $first_access=&Apache::lonnet::get_first_access('map',$symb);
+ &Apache::lonxml::debug("looking for first_access $first_access");
if (defined($first_access)) {
$interval = $first_access+$interval;
$date = ($interval < $due_date)? $interval : $due_date;
@@ -968,7 +969,7 @@ sub newproblem {
# I don't like hard-coded filenames but for now, this will work.
use File::Copy;
my $templatefilename =
- $request->dir_config('lonIncludes').'/templates/blank.problem';
+ $request->dir_config('lonIncludes').'/templates/blank.'.$extension;
&Apache::lonxml::debug("$templatefilename");
my $dest = &Apache::lonnet::filelocation("",$request->uri);
copy($templatefilename,$dest);
@@ -994,16 +995,19 @@ sub newproblem {
'click' => 'click on the',
'Create' => 'Create',
'button' => 'button');
- $request->print(<
-$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.
-$lt{'create'} $extension $lt{'resource'}
+".&mt("Creating a new $extension resource.")."
$errormsg
-$lt{'requested'} $shownurl $lt{'not exist'}.
+".&mt("The requested file [_1] currently does not exist.",
+ "$shownurl")."