--- loncom/interface/lonmeta.pm	2003/09/22 00:48:32	1.35
+++ loncom/interface/lonmeta.pm	2003/10/04 20:49:40	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.35 2003/09/22 00:48:32 www Exp $
+# $Id: lonmeta.pm,v 1.38 2003/10/04 20:49:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -219,9 +219,9 @@ sub handler {
 
 # --------------------------------------------------------------- Render Output
   my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
-my $creationdate=localtime(
+my $creationdate=&Apache::lonlocal::locallocaltime(
  &Apache::loncommon::unsqltime($content{'creationdate'}));
-my $lastrevisiondate=localtime(
+my $lastrevisiondate=&Apache::lonlocal::locallocaltime(
  &Apache::loncommon::unsqltime($content{'lastrevisiondate'}));
 my $language=&Apache::loncommon::languagedescription($content{'language'});
 my $mime=&Apache::loncommon::filedescription($content{'mime'}); 
@@ -234,8 +234,8 @@ my $owner=$content{'owner'};
 $owner=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
 my $versiondisplay='';
 if ($thisversion) {
-    $versiondisplay='Version: '.$thisversion.
-    ' (most recent version: '.$currentversion.')';
+    $versiondisplay=&mt('Version').': '.$thisversion.
+    ' ('.&mt('most recent version').': '.$currentversion.')';
 } else {
     $versiondisplay='Version: '.$currentversion;
 }
@@ -244,6 +244,14 @@ if ($content{'customdistributionfile'})
    $customdistributionfile='<a href="'.$content{'customdistributionfile'}.
      '"><tt>'.$content{'customdistributionfile'}.'</tt></a>';
 }
+
+my $obsolete=$content{'obsolete'};
+my $obsoletereplace=$content{'obsoletereplacement'};
+my $obsoletewarning='';
+if (($obsolete) && ($ENV{'user.adv'})) {
+    $obsoletewarning='<p><font color="red">'.&mt('This resource has been marked obsolete by the author(s)').'</font></p>';
+}
+
 my %lt=&Apache::lonlocal::texthash(
 				   'au' =>'Author(s)',
 				   'sb' => 'Subject',
@@ -255,7 +263,10 @@ my %lt=&Apache::lonlocal::texthash(
 				   'cd' => 'Creation Date',
 				   'pu' => 'Publisher/Owner',
                                    'co' => 'Copyright/Distribution',
-				   'cf' => 'Custom Distribution File');
+				   'cf' => 'Custom Distribution File',
+                                   'ob' => 'Obsolete',
+                                   'or' => 
+                                    'Suggested Replacement for Obsolete File');
 my $bodytag=&Apache::loncommon::bodytag
             ('Catalog Information','','','',$resdomain);
   $r->print(<<ENDHEAD);
@@ -263,6 +274,7 @@ my $bodytag=&Apache::loncommon::bodytag
 $bodytag
 <h2>$content{'title'}</h2>
 <h3><tt>$disuri</tt></h3>
+$obsoletewarning
 $versiondisplay<br />
 <table cellspacing=2 border=0>
 <tr><td bgcolor='#AAAAAA'>$lt{'au'}</td>
@@ -289,6 +301,10 @@ Last Revision Date</td><td bgcolor="#CCC
 <td bgcolor="#CCCCCC">$content{'copyright'}&nbsp;</td></tr>
 <tr><td bgcolor='#AAAAAA'>$lt{'cf'}</td>
 <td bgcolor="#CCCCCC">$customdistributionfile&nbsp;</td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'ob'}</td>
+<td bgcolor="#CCCCCC">$obsolete&nbsp;</td></tr>
+<tr><td bgcolor='#AAAAAA'>$lt{'or'}</td>
+<td bgcolor="#CCCCCC">$obsoletereplace&nbsp;</td></tr>
 </table>
 ENDHEAD
   delete($content{'title'});
@@ -304,6 +320,8 @@ ENDHEAD
   delete($content{'owner'});
   delete($content{'copyright'});
   delete($content{'customdistributionfile'});
+  delete($content{'obsolete'});
+  delete($content{'obsoletereplacement'});
   if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata
    $r->print(
@@ -383,7 +401,8 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
   '<h4>'.&mt('Evaluation Comments').' ('.&mt('visible to author and co-authors only').')</h4>'.
       '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
       $r->print(
-   '<h4>Error Messages (visible to author and co-authors only)</h4>');
+   '<h4>'.&mt('Error Messages').' ('.
+          &mt('visible to author and co-authors only').')</h4>');
       my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$1,$2);
       foreach (keys %errormsgs) {
 	if ($_=~/^\Q$disuri\E\_\d+$/) {
@@ -436,7 +455,8 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
   if ($disuri=~/\/default$/) {
       my $dir=$disuri;
       $dir=~s/default$//;
-      $displayfile='Default Cataloging Information for Directory '.$dir;
+      $displayfile=&mt('Default Cataloging Information for Directory').' '.
+	  $dir;
   }
   %Apache::lonpublisher::metadatafields=();
   %Apache::lonpublisher::metadatakeys=();
@@ -448,7 +468,8 @@ $bodytag
 <form method="post">
 ENDEDIT
    foreach ('author','title','subject','keywords','abstract','notes',
-            'copyright','customdistributionfile','language') {
+            'copyright','customdistributionfile','language',
+            'obsolete','obsoletereplacement') {
        if ($ENV{'form.new_'.$_}) {
 	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
        }
@@ -471,7 +492,8 @@ ENDEDIT
       my $mfh;
       unless ($mfh=Apache::File->new('>'.$fn)) {
             $r->print(
-            '<p><font color=red>Could not write metadata, FAIL</font>');
+            '<p><font color=red>'.&mt('Could not write metadata').', '.
+		      &mt('FAIL').'</font>');
       } else {
           foreach (sort keys %Apache::lonpublisher::metadatafields) {
             unless ($_=~/\./) {
@@ -492,11 +514,12 @@ ENDEDIT
                         .'</'.$tag.'>';
             }
 	  }
-          $r->print('<p>Wrote Metadata');
+          $r->print('<p>'.&mt('Wrote Metadata'));
       }
     }
     $r->print(
- '<br /><input type="submit" name="store" value="Store Catalog Information"></form></body></html>');
+ '<br /><input type="submit" name="store" value="'.
+&mt('Store Catalog Information').'"></form></body></html>');
     return OK;
   }
 }