--- loncom/publisher/lonpublisher.pm	2003/09/25 20:01:15	1.136
+++ loncom/publisher/lonpublisher.pm	2003/09/25 22:30:06	1.138
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.136 2003/09/25 20:01:15 www Exp $
+# $Id: lonpublisher.pm,v 1.138 2003/09/25 22:30:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -898,8 +898,10 @@ sub publish {
         $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
 
 ### FIXME: is this really what we want?
+# I dont' think so, to will corrupt any UTF-8 resources at least, 
+# and any encoding other than ISO-8859-1 will probably break
 	#Encode any High ASCII characters
-	$outstring=&HTML::Entities::encode($outstring,"\200-\377");
+	#$outstring=&HTML::Entities::encode($outstring,"\200-\377");
 # ------------------------------------------------------------- Write modified.
 
         {
@@ -1299,6 +1301,9 @@ sub phasetwo {
     $metadatafields{'copyright'}=$ENV{'form.copyright'};
     $metadatafields{'customdistributionfile'}=
                                  $ENV{'form.customdistributionfile'};
+    $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
+    $metadatafields{'obsoletereplacement'}=
+	                        $ENV{'form.obsoletereplacement'};
     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
     
     my $allkeywords=$ENV{'form.addkey'};
@@ -1349,7 +1354,7 @@ sub phasetwo {
     unless ($metadatafields{'copyright'} eq 'priv') {
         my ($error,$success) = &store_metadata(\%metadatafields);
         if ($success) {
-            $r->print('<p>Synchronized SQL metadata database</p>');
+            $r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
             print $logfile "\nSynchronized SQL metadata database";
         } else {
             $r->print($error);
@@ -1419,7 +1424,7 @@ sub phasetwo {
         
         
     } else {
-        $r->print('<p>Initial version</p>');
+        $r->print('<p>'.&mt('Initial version').'</p>');
         print $logfile "\nInitial version";
     }
 
@@ -1511,10 +1516,12 @@ sub phasetwo {
         
         $r->print(
            '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
-           'View Published Version</font></a>'.
-           '<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a></p>'.
+           &mt('View Published Version').'</font></a>'.
+           '<p><a href="'.$thissrc.'"><font size=+2>'.
+		  &mt('Back to Source').'</font></a></p>'.
            '<p><a href="'.$thissrcdir.
-                   '"><font size="+2">Back to Source Directory</font></a></p>');
+                   '"><font size="+2">'.
+		  &mt('Back to Source Directory').'</font></a></p>');
     }
 }
 
@@ -1545,7 +1552,7 @@ sub batchpublish {
 
       my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
      
-    $r->print('<h2>Publishing <tt>'.$thisdisfn.'</tt></h2>');
+    $r->print('<h2>'.&mt('Publishing').' <tt>'.$thisdisfn.'</tt></h2>');
 
 # phase one takes
 #  my ($source,$target,$style,$batch)=@_;