--- loncom/lonmap.pm 2013/05/30 05:04:16 1.11
+++ loncom/lonmap.pm 2013/07/22 18:07:01 1.13
@@ -2,7 +2,7 @@
#
# Read maps into a 'big hash'.
#
-# $Id: lonmap.pm,v 1.11 2013/05/30 05:04:16 raeburn Exp $
+# $Id: lonmap.pm,v 1.13 2013/07/22 18:07:01 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -213,9 +213,10 @@ sub get_mapalias_errors {
$count++;
}
my ($mapid) = split(/\./,$id);
- &mt('Resource "[_1]"
in Map "[_2]"',
- $hash->{'title_'.$id},
- $hash->{'title_'.$hash->{'ids_'.$hash->{'map_id_'.$mapid}}});
+ &mt('Resource [_1][_2]in Map [_3]',
+ '"'.$hash->{'title_'.$id}.'"',
+ '
',
+ '"'.$hash->{'title_'.$hash->{'ids_'.$hash->{'map_id_'.$mapid}}}.'"');
} (@{ $mapalias_cache{$mapalias} }));
next if ($count < 2);
$error_text .= '
'.
@@ -681,7 +682,7 @@ sub traceroute {
$further=simplify('('.'_'.$rid.')&('.
$hash->{'condid_'.$hash->{'undercond_'.$id}}.')');
} else {
- my $errtext.=&mt('
Undefined condition ID: [_1]',$hash->{'undercond_'.$id});
+ my $errtext.='
'.&mt('Undefined condition ID: [_1]',$hash->{'undercond_'.$id});
throw Error::Simple($errtext);
}
}
@@ -1252,7 +1253,7 @@ sub read_map {
my $ispage = ($filename =~/\.page$/);
unless ($ispage || ($filename =~ /\.sequence$/)) {
&Apache::lonnet::logthis("invalid: $filename : $uri");
- throw Error::Simple(&mt("
Invalid map: [_1]", $filename));
+ throw Error::Simple('
'.&mt('Invalid map: [_1]',''.$filename.''));
}
$filename =~ /\.(\w+)$/;
@@ -1263,8 +1264,8 @@ sub read_map {
my $contents = &Apache::lonnet::getfile($filename);
if($contents eq -1) {
- throw Error::Simple(&mt('
Map not loaded: The file [_1] does not exist.',
- $filename));
+ throw Error::Simple('
'.&mt('Map not loaded: The file [_1] does not exist.',
+ ''.$filename.''));
}
# Now that we succesfully retrieved the file we can make our parsing passes over it:
# parsing is done in passes: