[LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm
www
lon-capa-cvs@mail.lon-capa.org
Thu, 25 Sep 2003 20:01:15 -0000
This is a MIME encoded message
--www1064520075
Content-Type: text/plain
www Thu Sep 25 16:01:15 2003 EDT
Modified files:
/loncom/publisher lonpublisher.pm
Log:
Internationalization and "obsolete" field.
--www1064520075
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20030925160115.txt"
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.135 loncom/publisher/lonpublisher.pm:1.136
--- loncom/publisher/lonpublisher.pm:1.135 Wed Sep 24 15:38:18 2003
+++ loncom/publisher/lonpublisher.pm Thu Sep 25 16:01:15 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.135 2003/09/24 19:38:18 albertel Exp $
+# $Id: lonpublisher.pm,v 1.136 2003/09/25 20:01:15 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -897,6 +897,7 @@
}
$outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
+### FIXME: is this really what we want?
#Encode any High ASCII characters
$outstring=&HTML::Entities::encode($outstring,"\200-\377");
# ------------------------------------------------------------- Write modified.
@@ -905,8 +906,9 @@
my $org;
unless ($org=Apache::File->new('>'.$source)) {
print $logfile "No write permit to $source\n";
- return ('<font color="red">No write permission to '.$source.
- ', FAIL</font>',1);
+ return ('<font color="red">'.&mt('No write permission to').
+ ' '.$source.
+ ', '.&mt('FAIL').'</font>',1);
}
print($org $outstring);
}
@@ -923,7 +925,7 @@
my %oldparmstores=();
unless ($batch) {
- $scrout.='<h3>Metadata Information ' .
+ $scrout.='<h3>'.&mt('Metadata Information').' ' .
Apache::loncommon::help_open_topic("Metadata_Description")
. '</h3>';
}
@@ -1003,7 +1005,8 @@
}
}
if ($chparms) {
- $scrout.='<p><b>New parameters or stored values:</b> '.$chparms.'</p>';
+ $scrout.='<p><b>'.&mt('New parameters or stored values').
+ ':</b> '.$chparms.'</p>';
}
$chparms='';
@@ -1017,7 +1020,7 @@
}
}
if ($chparms) {
- $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
+ $scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '.
$chparms.'</p>';
}
@@ -1170,10 +1173,22 @@
$scrout.=&textfield('Custom Distribution File','customdistributionfile',
$metadatafields{'customdistributionfile'}).
$copyright_help;
+ my $uctitle=uc(&mt('Obsolete'));
+ $scrout.=
+ "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+ '</b></font> <input type="checkbox" name="obsolete" ';
+ if ($metadatafields{'obsolete'}) {
+ $scrout.=' checked="1" ';
+ }
+ $scrout.='/ ></p>'.
+ &textfield('Suggested Replacement for Obsolete File',
+ 'obsoletereplacement',
+ $metadatafields{'obsoletereplacement'});
} else {
$scrout.=&hiddenfield('copyright','private');
}
- return ($scrout.'<p><input type="submit" value="Finalize Publication" /></p></form>',0);
+ return ($scrout.'<p><input type="submit" value="'.
+ &mt('Finalize Publication').'" /></p></form>',0);
# =============================================================================
# BATCH MODE
#
@@ -1251,14 +1266,16 @@
if ($target=~/\_\_\_/) {
$r->print(
- '<font color="red">Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>');
+ '<font color="red">'.&mt('Unsupported character combination').
+ ' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>');
return 0;
}
$distarget=~s/\/+/\//g;
my $logfile;
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
$r->print(
- '<font color="red">No write permission to user directory, FAIL</font>');
+ '<font color="red">'.
+ &mt('No write permission to user directory, FAIL').'</font>');
return 0;
}
print $logfile
@@ -1301,7 +1318,8 @@
my $mfh;
unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
return
- '<font color="red">Could not write metadata, FAIL</font>';
+ '<font color="red">'.&mt('Could not write metadata, FAIL').
+ '</font>';
}
foreach (sort keys %metadatafields) {
unless ($_=~/\./) {
@@ -1320,7 +1338,7 @@
.'</'.$tag.'>';
}
}
- $r->print('<p>Wrote Metadata</p>');
+ $r->print('<p>'.&mt('Wrote Metadata').'</p>');
print $logfile "\nWrote metadata";
}
@@ -1338,7 +1356,8 @@
print $logfile "\n".$error;
}
} else {
- $r->print('<p>Private Publication - did not synchronize database</p>');
+ $r->print('<p>'.
+ &mt('Private Publication - did not synchronize database').'</p>');
print $logfile "\nPrivate: Did not synchronize data into ".
"SQL metadata database";
}
@@ -1375,10 +1394,11 @@
if (copy($target,$copyfile)) {
print $logfile "Copied old target to ".$copyfile."\n";
- $r->print('<p>Copied old target file</p>');
+ $r->print('<p>'.&mt('Copied old target file').'</p>');
} else {
print $logfile "Unable to write ".$copyfile.':'.$!."\n";
- return "<font color=\"red\">Failed to copy old target, $!, FAIL</font>";
+ return "<font color=\"red\">".&mt('Failed to copy old target').
+ ", $!, ".&mt('FAIL')."</font>";
}
# --------------------------------------------------------------- Copy Metadata
@@ -1387,12 +1407,13 @@
if (copy($target.'.meta',$copyfile)) {
print $logfile "Copied old target metadata to ".$copyfile."\n";
- $r->print('<p>Copied old metadata</p>')
+ $r->print('<p>'.&mt('Copied old metadata').'</p>')
} else {
print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
if (-e $target.'.meta') {
return
- "<font color=\"red\">Failed to write old metadata copy, $!, FAIL</font>";
+ "<font color=\"red\">".
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>";
}
}
@@ -1413,17 +1434,18 @@
$path.="/$parts[$count]";
if ((-e $path)!=1) {
print $logfile "\nCreating directory ".$path;
- $r->print('<p>Created directory '.$parts[$count].'</p>');
+ $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
mkdir($path,0777);
}
}
if (copy($source,$copyfile)) {
print $logfile "\nCopied original source to ".$copyfile."\n";
- $r->print('<p>Copied source file</p>');
+ $r->print('<p>'.&mt('Copied source file').'</p>');
} else {
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
- return "<font color=\"red\">Failed to copy source, $!, FAIL</font>";
+ return "<font color=\"red\">".
+ &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
}
# --------------------------------------------------------------- Copy Metadata
@@ -1432,18 +1454,18 @@
if (copy($source.'.meta',$copyfile)) {
print $logfile "\nCopied original metadata to ".$copyfile."\n";
- $r->print('<p>Copied metadata</p>');
+ $r->print('<p>'.&mt('Copied metadata').'</p>');
} else {
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
return
- "<font color=\"red\">Failed to write metadata copy, $!, FAIL</font>";
+ "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>";
}
$r->rflush;
# --------------------------------------------------- Send update notifications
my @subscribed=&get_subscribed_hosts($target);
foreach my $subhost (@subscribed) {
- $r->print('<p>Notifying host '.$subhost.':');$r->rflush;
+ $r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
print $logfile "\nNotifying host ".$subhost.':';
my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
$r->print($reply.'</p><br />');$r->rflush;
@@ -1454,7 +1476,8 @@
my @subscribedmeta=&get_subscribed_hosts("$target.meta");
foreach my $subhost (@subscribedmeta) {
- $r->print('<p>Notifying host for metadata only '.$subhost.':');$r->rflush;
+ $r->print('<p>'.
+&mt('Notifying host for metadata only').' '.$subhost.':');$r->rflush;
print $logfile "\nNotifying host for metadata only ".$subhost.':';
my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
$subhost);
@@ -1466,7 +1489,7 @@
my %courses=&coursedependencies($target);
my $now=time;
foreach (keys %courses) {
- $r->print('<p>Notifying course '.$_.':');$r->rflush;
+ $r->print('<p>'.&mt('Notifying course').' '.$_.':');$r->rflush;
print $logfile "\nNotifying host ".$_.':';
my ($cdom,$cname)=split(/\_/,$_);
my $reply=&Apache::lonnet::cput
@@ -1639,7 +1662,7 @@
my $r=shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -1732,7 +1755,7 @@
# ---------------------------------------------------------- Start page output.
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print('<html><head><title>LON-CAPA Publishing</title></head>');
@@ -1755,9 +1778,9 @@
if ($fn=~/\/$/) {
# -------------------------------------------------------- This is a directory
&publishdirectory($r,$fn,$thisdisfn);
- $r->print('<hr><font size="+2">Done</font><br><a href="/priv/'
+ $r->print('<hr><font size="+2">'.&mt('Done').'</font><br><a href="/priv/'
.$cuname.'/'.$thisdisfn
- .'">Return to Directory</a>');
+ .'">'.&mt('Return to Directory').'</a>');
} else {
@@ -1765,7 +1788,7 @@
$thisfn=~/\.(\w+)$/;
my $thistype=$1;
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
- $r->print('<h2>Publishing '.
+ $r->print('<h2>'.&mt('Publishing').' '.
&Apache::loncommon::filedescription($thistype).' <tt>');
$r->print(<<ENDCAPTION);
@@ -1773,18 +1796,19 @@
$thisdisfn</a>
ENDCAPTION
$r->print(
- '</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><br />');
+ '</tt></h2><b>'.&mt('Target').':</b> <tt>'.$thisdistarget.'</tt><br />');
if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
- $r->print('<h3><font color="red">Co-Author: '.$cuname.' at '.$cudom.
+ $r->print('<h3><font color="red">'.&mt('Co-Author').': '.$cuname.&mt(' at ').$cudom.
'</font></h3>');
}
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
$r->print(<<ENDDIFF);
<br />
-<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>Diffs with Current Version</a><br />
+<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
ENDDIFF
+ $r->print(&mt('Diffs with Current Version').'</a><br />');
}
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
--www1064520075--