[LON-CAPA-cvs] cvs: rat / lonuserstate.pm

[raeburn]

raeburn		Fri Aug 16 01:41:06 2013 EDT

  Modified files:              
    /rat	lonuserstate.pm 
  Log:
  - Exclude HTML tags from translation phrases.
   (Corresponding German translation file phrases and translations previously 
    updated in rev 1.514).
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.146 rat/lonuserstate.pm:1.147
--- rat/lonuserstate.pm:1.146	Wed Jun 26 21:22:55 2013
+++ rat/lonuserstate.pm	Fri Aug 16 01:41:05 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.146 2013/06/26 21:22:55 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.147 2013/08/16 01:41:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -184,7 +184,7 @@
     # We can only nest sequences or pages.  Anything else is an illegal nest.
 
     unless (($fn=~/\.sequence$/) || $ispage) { 
-	$errtext.=&mt("<br />Invalid map: <tt>[_1]</tt>",$fn);
+	$errtext.='<br />'.&mt('Invalid map: [_1]',"<tt>$fn</tt>");
 	return; 
     }
 
@@ -193,7 +193,9 @@
     my $instr=&Apache::lonnet::getfile($fn);
 
     if ($instr eq -1) {
-        $errtext.=&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',$fn);
+        $errtext.= '<br />'
+                  .&mt('Map not loaded: The file [_1] does not exist.',
+                       "<tt>$fn</tt>");
 	return;
     }
 
@@ -938,7 +940,9 @@
 			$further=simplify('('.'_'.$rid.')&('.
 					  $hash{'condid_'.$hash{'undercond_'.$id}}.')');
 		    } else {
-			$errtext.=&mt('<br />Undefined condition ID: [_1]',$hash{'undercond_'.$id});
+			$errtext.= '<br />'.
+                                   &mt('Undefined condition ID: [_1]',
+                                       $hash{'undercond_'.$id});
 		    }
                 }
 		#  Recurse to resoruces that have to's to us.
@@ -1548,8 +1552,8 @@
 			     $count++;
 			 }
 			 my ($mapid) = split(/\./,$id);
-                         &mt('Resource "[_1]" <br /> in Map "[_2]"',
-			     $hash{'title_'.$id},
+                         &mt('Resource [_1][_2]in Map [_3]',
+			     $hash{'title_'.$id},'<br />',
 			     $hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$mapid}}});
 		     } (@{ $mapalias_cache{$mapalias} }));
 	    next if ($count < 2);