--- loncom/publisher/lonpublisher.pm	2004/01/20 23:02:20	1.145.2.1
+++ loncom/publisher/lonpublisher.pm	2003/12/16 14:42:34	1.147
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.145.2.1 2004/01/20 23:02:20 albertel Exp $
+# $Id: lonpublisher.pm,v 1.147 2003/12/16 14:42:34 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -219,10 +219,7 @@ sub metaeval {
 		$newentry=~s/^\s*//;
 		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
 	    }
-# actually store
-	    if ( $entry eq 'rule' && exists($metadatafields{$unikey})) {
-		$metadatafields{$unikey}.=','.$newentry;
-	    } else {
+	    unless ($metadatafields{$unikey}=~/\w/) {
 		$metadatafields{$unikey}=$newentry;
 	    }
 	}
@@ -270,7 +267,7 @@ sub metaread {
     my ($logfile,$fn,$prefix)=@_;
     unless (-e $fn) {
 	print($logfile 'No file '.$fn."\n");
-        return '<br /><b>No file:</b> <tt>'.
+        return '<br /><b>'.&mt('No file').':</b> <tt>'.
 	    &Apache::loncfile::display($fn).'</tt>';
     }
     print($logfile 'Processing '.$fn."\n");
@@ -280,7 +277,7 @@ sub metaread {
 	$metastring=join('',<$metafh>);
     }
     &metaeval($metastring,$prefix);
-    return '<br /><b>Processed file:</b> <tt>'.
+    return '<br /><b>'.&mt('Processed file').':</b> <tt>'.
 	&Apache::loncfile::display($fn).'</tt>';
 }
 
@@ -631,7 +628,7 @@ sub fix_ids_and_indices {
 			   join(', ',@duplicatedids));
     if ($duplicateids) {
 	print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
-	my $outstring='<font color="red">Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are: '.join(', ',@duplicatedids).'</font>';
+	my $outstring='<font color="red">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</font>';
 	return ($outstring,1);
     }
     if ($needsfixup) {
@@ -871,7 +868,7 @@ sub publish {
     my %allow=();
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return ('<font color="red">No write permission to user directory, FAIL</font>',1);
+	return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1);
     }
     print $logfile 
 "\n\n================= Publish ".localtime()." Phase One  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
@@ -895,7 +892,7 @@ sub publish {
 	if ($error) { return ($outstring,$error); }
 # ------------------------------------------------------------ Construct Allows
     
-	$scrout.='<h3>Dependencies</h3>';
+	$scrout.='<h3>'.&mt('Dependencies').'</h3>';
         my $allowstr='';
         foreach (sort(keys(%allow))) {
 	   my $thisdep=$_;
@@ -913,7 +910,7 @@ sub publish {
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
                                             $thisdep.'.meta') eq '-1') {
-		   $scrout.= ' - <font color="red">Currently not available'.
+		   $scrout.= ' - <font color="red">'.&mt('Currently not available').
 		       '</font>';
                } else {
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
@@ -1090,7 +1087,7 @@ sub publish {
     unless ($batch) {
         $scrout.=
 	    '<form name="pubform" action="/adm/publish" method="post">'.
-            '<p><input type="submit" value="Finalize Publication" /></p>'.
+            '<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
             &hiddenfield('phase','two').
             &hiddenfield('filename',$ENV{'form.filename'}).
 	    &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
@@ -1102,6 +1099,9 @@ sub publish {
 # --------------------------------------------------- Scan content for keywords
 
         my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
+        my $KEYWORDS=&mt('KEYWORDS');
+	my $CheckAll=&mt('check all');
+	my $UncheckAll=&mt('uncheck all');
 	my $keywordout=<<"END";
 <script>
 function checkAll(field) {
@@ -1114,10 +1114,10 @@ function uncheckAll(field) {
         field[i].checked = false ;
 }
 </script>
-<p><font color="#800000" face="helvetica"><b>KEYWORDS:</b></font>
+<p><font color="#800000" face="helvetica"><b>$KEYWORDS:</b></font>
  $keywords_help</b>
-<input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)" /> 
-<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)" /> 
+<input type="button" value="$CheckAll" onclick="javascript:checkAll(document.pubform.keywords)" /> 
+<input type="button" value="$UncheckAll" onclick="javascript:uncheckAll(document.pubform.keywords)" /> 
 </p>
 <br />
 END
@@ -1150,7 +1150,7 @@ END
 	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
 	$scrout.=
-	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>ABSTRACT:".
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('ABSTRACT').":".
 	    "</b></font></p><br />".
 	    '<textarea cols="80" rows="5" name="abstract">'.
 	    $metadatafields{'abstract'}.'</textarea></p>';