[LON-CAPA-cvs] cvs: loncom /interface londocs.pm lonmenu.pm
www
lon-capa-cvs@mail.lon-capa.org
Wed, 17 Sep 2003 23:40:25 -0000
This is a MIME encoded message
--www1063842025
Content-Type: text/plain
www Wed Sep 17 19:40:25 2003 EDT
Modified files:
/loncom/interface londocs.pm lonmenu.pm
Log:
Localization
--www1063842025
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20030917194025.txt"
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.80 loncom/interface/londocs.pm:1.81
--- loncom/interface/londocs.pm:1.80 Wed Sep 17 17:20:15 2003
+++ loncom/interface/londocs.pm Wed Sep 17 19:40:25 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.80 2003/09/17 21:20:15 albertel Exp $
+# $Id: londocs.pm,v 1.81 2003/09/17 23:40:25 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,6 +38,7 @@
use Apache::loncreatecourse;
use HTML::Entities;
use GDBM_File;
+use Apache::lonlocal;
my $iconpath;
@@ -114,10 +115,11 @@
my $output='</td><td bgcolor="#DDDDCC">';
if ($home) {
return '</td><td bgcolor="#DDDDCC">'.
- '<input type="submit" name="dumpcourse" value="Dump Course DOCS to Construction Space" />';
+ '<input type="submit" name="dumpcourse" value="'.
+ &mt('Dump Course DOCS to Construction Space').'" />';
} else {
return'</td><td bgcolor="#DDDDCC">'.
- 'Dump Course DOCS to Construction Space: available on other servers';
+ &mt('Dump Course DOCS to Construction Space: available on other servers');
}
}
@@ -185,7 +187,7 @@
# Input form
unless ($home==1) {
$r->print(
- '<h3>Select the Construction Space</h3><select name="authorspace">');
+ '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
}
foreach (sort keys %outhash) {
if ($_=~/^home_(.+)$/) {
@@ -203,9 +205,9 @@
my $title=$origcrsdata{'description'};
$title=~s/\s+/\_/gs;
$title=~s/\W//gs;
- $r->print('<h3>Folder in Construction Space</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
+ $r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
&tiehash();
- $r->print('<h3>Filenames in Construction Space</h3><table border="2"><tr><th>Internal Filename</th><th>Title</th><th>Save as ...</th></tr>');
+ $r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');
foreach (&Apache::loncreatecourse::crsdirlist($origcrsid,'userfiles')) {
$r->print('<tr><td>'.$_.'</td>');
my ($ext)=($_=~/\.(\w+)$/);
@@ -223,7 +225,7 @@
$r->print("</table>\n");
&untiehash();
$r->print(
- '<p><input type="submit" name="dumpcourse" value="Dump Course DOCS" /></p></form>');
+ '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump Course DOCS').'" /></p></form>');
}
}
@@ -559,7 +561,7 @@
}
}
&untiehash();
- $r->print('<h1>Done.</h1>');
+ $r->print('<h1>'.&mt('Done').'.</h1>');
}
# -------------------------------------------------------------- Check Versions
@@ -652,9 +654,9 @@
}
}
$r->print('</table>');
- $r->print('<h1>Done.</h1>');
+ $r->print('<h1>'.&mt('Done').'.</h1>');
} else {
- $r->print('<p>No content modifications yet.</p>');
+ $r->print('<p>'.&mt('No content modifications yet.').'</p>');
}
&untiehash();
}
@@ -666,6 +668,7 @@
$r->send_http_header;
return OK if $r->header_only;
+ &Apache::lonlocal::clearreroutetrans();
# --------------------------------------------- Initialize help topics for this
foreach ('Adding_Course_Doc','Main_Course_Documents',
'Adding_External_Resource','Navigate_Content',
@@ -836,6 +839,28 @@
&Apache::loncommon::bodytag('Course Documents','',$events,
'','',$showdoc));
unless ($showdoc) {
+# -----------------------------------------------------------------------------
+ my %lt=&Apache::lonlocal::texthash(
+ 'uplm' => 'Upload a new main course document',
+ 'upls' => 'Upload a new supplemental course document',
+ 'impp' => 'Import a published document',
+ 'spec' => 'Special documents',
+ 'upld' => 'Upload Document',
+ 'srch' => 'Search',
+ 'impo' => 'Import',
+ 'selm' => 'Select Map',
+ 'load' => 'Load Map',
+ 'newf' => 'New Folder',
+ 'extr' => 'External Resource',
+ 'syll' => 'Syllabus',
+ 'navc' => 'Navigate Contents',
+ 'sipa' => 'Simple Page',
+ 'sipr' => 'Simple Problem',
+ 'scuf' => 'Score Upload Form',
+ 'bull' => 'Bulletin Board',
+ 'mypi' => 'My Personal Info'
+ );
+# -----------------------------------------------------------------------------
if ($allowed) {
my $dumpbut=&dumpbutton();
$r->print(<<ENDCOURSEVERIFY);
@@ -864,7 +889,7 @@
# --------------------------------------------------------- Standard documents
$r->print('<table border=2 cellspacing=4 cellpadding=4>');
if (($standard) && ($allowed) && (!$forcesupplement)) {
- $r->print('<tr><td bgcolor="#BBBBBB"><h2>Main Course Documents'.
+ $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').
($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
my $folder=$ENV{'form.folder'};
unless ($folder=~/^default/) { $folder='default'; }
@@ -880,18 +905,20 @@
$r->print(
'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'.
'<form method="post" action="/adm/roles" target="loncapaclient">'.
-'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'.
-$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.'.
+'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+&mt('Changes will become active for your current session after').
+' <input type="hidden" name="'.
+$ENV{'request.role'}.'" value="1" /><input type="button" value="'.
+&mt('re-initializing course').'" onClick="reinit(this.form)"/>'.&mt(', or the next time you log in.').
$help{'Caching'}.'</font></h3></form>');
}
my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
'.sequence';
-
$r->print(<<ENDFORM);
<table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">Upload a new main course document</th>
-<th bgcolor="#DDDDDD">Import a published document</th>
-<th bgcolor="#DDDDDD">Special documents</th>
+<th bgcolor="#DDDDDD">$lt{'uplm'}</th>
+<th bgcolor="#DDDDDD">$lt{'impp'}</th>
+<th bgcolor="#DDDDDD">$lt{'spec'}</th>
</tr>
<tr><td bgcolor="#DDDDDD">
File:<br />
@@ -903,7 +930,7 @@
<input type="hidden" name="folder" value="$folder">
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type="hidden" name="cmd" value="upload_default">
-<input type="submit" value="Upload Document">
+<input type="submit" value="$lt{'upld'}">
<nobr>
$help{'Uploading_From_Harddrive'}
</nobr>
@@ -914,10 +941,10 @@
<input type="hidden" name="folder" value="$folder">
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
<nobr>
<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">
$help{'Importing_LON-CAPA_Resource'}
</nobr>
<p>
@@ -925,7 +952,7 @@
<input type="text" size="20" name="importmap"><br />
<nobr><input type=button
onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="Select Map"> <input type="submit" name="loadmap" value="Load Map">
+value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
$help{'Load_Map'}</nobr>
</p>
</form>
@@ -937,7 +964,7 @@
<nobr>
<input name="newfolder" type="button"
onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" />$help{'Adding_Folders'}
+value="$lt{'newf'}" />$help{'Adding_Folders'}
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="newext">
@@ -946,7 +973,7 @@
<input type=hidden name="importdetail" value="">
<nobr>
<input name="newext" type="button" onClick="javascript:makenewext('newext');"
-value="External Resource" /> $help{'Adding_External_Resource'}
+value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="newsyl">
@@ -955,7 +982,7 @@
<input type=hidden name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus">
<nobr>
-<input name="newsyl" type="submit" value="Syllabus" />
+<input name="newsyl" type="submit" value="$lt{'syll'}" />
$help{'Syllabus'}
</nobr>
</form>
@@ -965,7 +992,7 @@
<input type=hidden name="importdetail"
value="Navigate Content=/adm/navmaps">
<nobr>
-<input name="newnav" type="submit" value="Navigate Content" />
+<input name="newnav" type="submit" value="$lt{'navc'}" />
$help{'Navigate_Content'}
</nobr>
</form>
@@ -974,7 +1001,7 @@
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type=hidden name="importdetail" value="">
<nobr>
-<input name="newsmppg" type="button" value="Simple Page"
+<input name="newsmppg" type="button" value="$lt{'sipa'}"
onClick="javascript:makesmppage();" /> $help{'Simple Page'}
</nobr>
</form>
@@ -983,7 +1010,7 @@
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type=hidden name="importdetail" value="">
<nobr>
-<input name="newsmpproblem" type="button" value="Simple Problem"
+<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
</nobr>
</form>
@@ -992,7 +1019,7 @@
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type=hidden name="importdetail" value="">
<nobr>
-<input name="newexamupload" type="button" value="Score Upload Form"
+<input name="newexamupload" type="button" value="$lt{'scuf'}"
onClick="javascript:makeexamupload();" />
$help{'Score_Upload_Form'}
</nobr>
@@ -1002,7 +1029,7 @@
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type=hidden name="importdetail" value="">
<nobr>
-<input name="newbulletin" type="button" value="Bulletin Board"
+<input name="newbulletin" type="button" value="$lt{'bull'}"
onClick="javascript:makebulboard();" />
$help{'Bulletin Board'}
</nobr>
@@ -1013,7 +1040,7 @@
<input type=hidden name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme">
<nobr>
-<input name="newaboutme" type="submit" value="My Personal Info" />
+<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
$help{'My Personal Info'}
</nobr>
</form>
@@ -1025,7 +1052,7 @@
# ----------------------------------------------------- Supplemental documents
if (!$forcestandard) {
$r->print(
- '<tr><td bgcolor="#BBBBBB"><h2>Supplemental Course Documents'.
+ '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents').
($allowed?' '.$help{'Supplemental'}:'').'</h2>');
my $folder=$ENV{'form.folder'};
unless ($folder=~/supplemental/) { $folder='supplemental'; }
@@ -1037,9 +1064,9 @@
$r->print(<<ENDSUPFORM);
<table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">Upload a new supplemental course document</th>
-<th bgcolor="#DDDDDD">Import a published document</th>
-<th bgcolor="#DDDDDD">Special documents</th>
+<th bgcolor="#DDDDDD">$lt{'upls'}</th>
+<th bgcolor="#DDDDDD">$lt{'impp'}</th>
+<th bgcolor="#DDDDDD">$lt{'spec'}</th>
</tr>
<tr><td bgcolor="#DDDDDD">
<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
@@ -1051,7 +1078,7 @@
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type="hidden" name="cmd" value="upload_supplemental">
<nobr>
-<input type="submit" value="Upload Document">
+<input type="submit" value="$lt{'upld'}">
$help{'Uploading_From_Harddrive'}
</nobr>
</form>
@@ -1062,9 +1089,9 @@
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type=hidden name="importdetail" value="">
<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
<input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'}
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'}
<p>
<hr />
<input type="text" size="20" name="importmap">
@@ -1081,7 +1108,7 @@
<nobr>
<input name="newfolder" type="button"
onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" /> $help{'Adding_Folders'}
+value="$lt{'newf'}" /> $help{'Adding_Folders'}
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="supnewext">
@@ -1091,7 +1118,7 @@
<nobr>
<input name="newext" type="button"
onClick="javascript:makenewext('supnewext');"
-value="External Resource" /> $help{'Adding_External_Resource'}
+value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
</nobr>
</form>
<form action="/adm/coursedocs" method="post" name="supnewsyl">
@@ -1100,7 +1127,7 @@
<input type=hidden name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus">
<nobr>
-<input name="newsyl" type="submit" value="Syllabus" />
+<input name="newsyl" type="submit" value="$lt{'syll'}" />
$help{'Syllabus'}
</nobr>
</form>
@@ -1110,7 +1137,7 @@
<input type=hidden name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme">
<nobr>
-<input name="newaboutme" type="submit" value="My Personal Info" />
+<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
$help{'My Personal Info'}
</nobr>
</form>
@@ -1125,11 +1152,12 @@
$r->print('</table>');
} else {
# -------------------------------------------------------- This is showdoc mode
- $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>".
- &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'</table></p>');
+ $r->print("<h1>".&mt('Uploaded Document').'</h1><p>'.
+&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
+ &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
}
}
- $r->print('</body></html>');
+ $r->print(&Apache::lonlocal::endreroutetrans().'</body></html>');
return OK;
}
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.90 loncom/interface/lonmenu.pm:1.91
--- loncom/interface/lonmenu.pm:1.90 Wed Sep 17 14:47:15 2003
+++ loncom/interface/lonmenu.pm Wed Sep 17 19:40:25 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.90 2003/09/17 18:47:15 matthew Exp $
+# $Id: lonmenu.pm,v 1.91 2003/09/17 23:40:25 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -879,7 +879,7 @@
$r->send_http_header;
return OK if $r->header_only;
-# &Apache::lonlocal::clearreroutetrans();
+ &Apache::lonlocal::clearreroutetrans();
my $form=&serverform();
my $bodytag=&Apache::loncommon::bodytag('Main Menu');
--www1063842025--