--- loncom/homework/structuretags.pm 2007/09/10 16:25:38 1.394
+++ loncom/homework/structuretags.pm 2007/09/11 23:36:39 1.396
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.394 2007/09/10 16:25:38 www Exp $
+# $Id: structuretags.pm,v 1.396 2007/09/11 23:36:39 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1070,16 +1070,19 @@ sub start_definetag {
my $name = $token->[2]->{'name'};
my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style);
- if ($name=~/^\//) {
- $result=
- '
END '.$name.' |
';
- } else {
- $result=
- '
BEGIN '.$name.' |
';
+ if ($target eq 'web') {
+ if ($name=~/^\//) {
+ $result=
+ '
'.
+ &mt('END [_1]'.''.$name.'').' |
';
+ } else {
+ $result=
+ '
'.
+ &mt('BEGIN [_1]'.''.$name.'').' |
';
+ }
+ $skip = &HTML::Entities::encode($skip, '<>&"');
+ $result.=''.$skip.' |
';
}
- $skip=~s/\\<\;/gs;
- $skip=~s/\>/\>\;/gs;
- $result.=''.$skip.' |
';
return $result;
}
@@ -1142,7 +1145,7 @@ sub start_languageblock {
my $exclude = $token->[2]->{'exclude'};
my $preferred_language=(&Apache::loncommon::preferred_languages)[0];
# This should not even happen, since we should at least have the server language
- unless ($preferred_language) { $preferred_language='en'; }
+ if (!$preferred_language) { $preferred_language='en'; }
# If the languageblock has no arguments, show the contents
$result='1';
# Do we have an include argument?