--- loncom/publisher/lonpublisher.pm 2003/09/16 22:00:25 1.133
+++ loncom/publisher/lonpublisher.pm 2003/09/25 20:01:15 1.136
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.133 2003/09/16 22:00:25 albertel Exp $
+# $Id: lonpublisher.pm,v 1.136 2003/09/25 20:01:15 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -142,6 +142,7 @@ use DBI;
use Apache::lonnet();
use Apache::loncommon();
use Apache::lonmysql;
+use Apache::lonlocal;
use vars qw(%metadatafields %metadatakeys);
my %addid;
@@ -324,6 +325,7 @@ string which presents the form field (fo
#########################################
sub textfield {
my ($title,$name,$value)=@_;
+ $title=&mt($title);
my $uctitle=uc($title);
return "\n
$uctitle:".
"
".
@@ -337,6 +339,7 @@ sub hiddenfield {
sub selectbox {
my ($title,$name,$value,$functionref,@idlist)=@_;
+ $title=&mt($title);
my $uctitle=uc($title);
$value=(split(/\s*,\s*/,$value))[-1];
my $selout="\n$uctitle:".
@@ -667,7 +670,10 @@ sub fix_ids_and_indices {
}
}
# probably a image type
- if ($lctag eq 'label' && defined($parms{'description'})) {
+ # or a tag inside
+ if (($lctag eq 'label' && defined($parms{'description'}))
+ ||
+ ($lctag eq 'image')) {
my $next_token=$parser[-1]->get_token();
if ($next_token->[0] eq 'T') {
$next_token->[1]=&set_allow(\%allow,$logfile,
@@ -891,6 +897,7 @@ sub publish {
}
$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.
@@ -899,8 +906,9 @@ sub publish {
my $org;
unless ($org=Apache::File->new('>'.$source)) {
print $logfile "No write permit to $source\n";
- return ('No write permission to '.$source.
- ', FAIL ',1);
+ return (''.&mt('No write permission to').
+ ' '.$source.
+ ', '.&mt('FAIL').' ',1);
}
print($org $outstring);
}
@@ -917,7 +925,7 @@ sub publish {
my %oldparmstores=();
unless ($batch) {
- $scrout.='Metadata Information ' .
+ $scrout.=''.&mt('Metadata Information').' ' .
Apache::loncommon::help_open_topic("Metadata_Description")
. ' ';
}
@@ -997,7 +1005,8 @@ sub publish {
}
}
if ($chparms) {
- $scrout.=' New parameters or stored values: '.$chparms.'
';
+ $scrout.=''.&mt('New parameters or stored values').
+ ': '.$chparms.'
';
}
$chparms='';
@@ -1011,7 +1020,7 @@ sub publish {
}
}
if ($chparms) {
- $scrout.='Obsolete parameters or stored values: '.
+ $scrout.='
'.&mt('Obsolete parameters or stored values').': '.
$chparms.'
';
}
@@ -1164,10 +1173,22 @@ END
$scrout.=&textfield('Custom Distribution File','customdistributionfile',
$metadatafields{'customdistributionfile'}).
$copyright_help;
+ my $uctitle=uc(&mt('Obsolete'));
+ $scrout.=
+ "\n$uctitle:".
+ '
'.
+ &textfield('Suggested Replacement for Obsolete File',
+ 'obsoletereplacement',
+ $metadatafields{'obsoletereplacement'});
} else {
$scrout.=&hiddenfield('copyright','private');
}
- return ($scrout.'
',0);
+ return ($scrout.'
',0);
# =============================================================================
# BATCH MODE
#
@@ -1245,14 +1266,16 @@ sub phasetwo {
if ($target=~/\_\_\_/) {
$r->print(
- 'Unsupported character combination "___ " in filename, FAIL ');
+ ''.&mt('Unsupported character combination').
+ ' "___ " '.&mt('in filename, FAIL').' ');
return 0;
}
$distarget=~s/\/+/\//g;
my $logfile;
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
$r->print(
- 'No write permission to user directory, FAIL ');
+ ''.
+ &mt('No write permission to user directory, FAIL').' ');
return 0;
}
print $logfile
@@ -1295,7 +1318,8 @@ sub phasetwo {
my $mfh;
unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
return
- 'Could not write metadata, FAIL ';
+ ''.&mt('Could not write metadata, FAIL').
+ ' ';
}
foreach (sort keys %metadatafields) {
unless ($_=~/\./) {
@@ -1314,7 +1338,7 @@ sub phasetwo {
.''.$tag.'>';
}
}
- $r->print('Wrote Metadata
');
+ $r->print(''.&mt('Wrote Metadata').'
');
print $logfile "\nWrote metadata";
}
@@ -1332,7 +1356,8 @@ sub phasetwo {
print $logfile "\n".$error;
}
} else {
- $r->print('Private Publication - did not synchronize database
');
+ $r->print(''.
+ &mt('Private Publication - did not synchronize database').'
');
print $logfile "\nPrivate: Did not synchronize data into ".
"SQL metadata database";
}
@@ -1369,10 +1394,11 @@ sub phasetwo {
if (copy($target,$copyfile)) {
print $logfile "Copied old target to ".$copyfile."\n";
- $r->print('Copied old target file
');
+ $r->print(''.&mt('Copied old target file').'
');
} else {
print $logfile "Unable to write ".$copyfile.':'.$!."\n";
- return "Failed to copy old target, $!, FAIL ";
+ return "".&mt('Failed to copy old target').
+ ", $!, ".&mt('FAIL')." ";
}
# --------------------------------------------------------------- Copy Metadata
@@ -1381,12 +1407,13 @@ sub phasetwo {
if (copy($target.'.meta',$copyfile)) {
print $logfile "Copied old target metadata to ".$copyfile."\n";
- $r->print('Copied old metadata
')
+ $r->print(''.&mt('Copied old metadata').'
')
} else {
print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
if (-e $target.'.meta') {
return
- "Failed to write old metadata copy, $!, FAIL ";
+ "".
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')." ";
}
}
@@ -1407,17 +1434,18 @@ sub phasetwo {
$path.="/$parts[$count]";
if ((-e $path)!=1) {
print $logfile "\nCreating directory ".$path;
- $r->print('Created directory '.$parts[$count].'
');
+ $r->print(''.&mt('Created directory').' '.$parts[$count].'
');
mkdir($path,0777);
}
}
if (copy($source,$copyfile)) {
print $logfile "\nCopied original source to ".$copyfile."\n";
- $r->print('Copied source file
');
+ $r->print(''.&mt('Copied source file').'
');
} else {
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
- return "Failed to copy source, $!, FAIL ";
+ return "".
+ &mt('Failed to copy source').", $!, ".&mt('FAIL')." ";
}
# --------------------------------------------------------------- Copy Metadata
@@ -1426,18 +1454,18 @@ sub phasetwo {
if (copy($source.'.meta',$copyfile)) {
print $logfile "\nCopied original metadata to ".$copyfile."\n";
- $r->print('Copied metadata
');
+ $r->print(''.&mt('Copied metadata').'
');
} else {
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
return
- "Failed to write metadata copy, $!, FAIL ";
+ "".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')." ";
}
$r->rflush;
# --------------------------------------------------- Send update notifications
my @subscribed=&get_subscribed_hosts($target);
foreach my $subhost (@subscribed) {
- $r->print('Notifying host '.$subhost.':');$r->rflush;
+ $r->print('
'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
print $logfile "\nNotifying host ".$subhost.':';
my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
$r->print($reply.'
');$r->rflush;
@@ -1448,7 +1476,8 @@ sub phasetwo {
my @subscribedmeta=&get_subscribed_hosts("$target.meta");
foreach my $subhost (@subscribedmeta) {
- $r->print('Notifying host for metadata only '.$subhost.':');$r->rflush;
+ $r->print('
'.
+&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);
@@ -1460,7 +1489,7 @@ sub phasetwo {
my %courses=&coursedependencies($target);
my $now=time;
foreach (keys %courses) {
- $r->print('
Notifying course '.$_.':');$r->rflush;
+ $r->print('
'.&mt('Notifying course').' '.$_.':');$r->rflush;
print $logfile "\nNotifying host ".$_.':';
my ($cdom,$cname)=split(/\_/,$_);
my $reply=&Apache::lonnet::cput
@@ -1633,7 +1662,7 @@ sub handler {
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;
}
@@ -1726,7 +1755,7 @@ unless ($ENV{'form.phase'} eq 'two') {
# ---------------------------------------------------------- Start page output.
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print('
LON-CAPA Publishing ');
@@ -1749,9 +1778,9 @@ unless ($ENV{'form.phase'} eq 'two') {
if ($fn=~/\/$/) {
# -------------------------------------------------------- This is a directory
&publishdirectory($r,$fn,$thisdisfn);
- $r->print('Done '.&mt('Done').' Return to Directory ');
+ .'">'.&mt('Return to Directory').'');
} else {
@@ -1759,7 +1788,7 @@ unless ($ENV{'form.phase'} eq 'two') {
$thisfn=~/\.(\w+)$/;
my $thistype=$1;
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
- $r->print('
Publishing '.
+ $r->print(''.&mt('Publishing').' '.
&Apache::loncommon::filedescription($thistype).' ');
$r->print(<
ENDCAPTION
$r->print(
- ' Target: '.$thisdistarget.' ');
+ ' '.&mt('Target').': '.$thisdistarget.' ');
if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
- $r->print('Co-Author: '.$cuname.' at '.$cudom.
+ $r->print(''.&mt('Co-Author').': '.$cuname.&mt(' at ').$cudom.
' ');
}
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
$r->print(<
-Diffs with Current Version
+
ENDDIFF
+ $r->print(&mt('Diffs with Current Version').' ');
}
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.