[LON-CAPA-cvs] cvs: loncom /interface londocs.pm lonhelper.pm slotrequest.pm /interface/spreadsheet assesscalc.pm /publisher testbankimport.pm
bisitz
bisitz at source.lon-capa.org
Tue Feb 11 14:11:30 EST 2014
bisitz Tue Feb 11 19:11:30 2014 EDT
Modified files:
/loncom/publisher testbankimport.pm
/loncom/interface lonhelper.pm londocs.pm slotrequest.pm
/loncom/interface/spreadsheet assesscalc.pm
Log:
Internationalization: Added missing &mt() calls
-------------- next part --------------
Index: loncom/publisher/testbankimport.pm
diff -u loncom/publisher/testbankimport.pm:1.43 loncom/publisher/testbankimport.pm:1.44
--- loncom/publisher/testbankimport.pm:1.43 Thu Oct 10 00:46:50 2013
+++ loncom/publisher/testbankimport.pm Tue Feb 11 19:11:18 2014
@@ -1,5 +1,5 @@
# Handler for parsing text upload problem descriptions into .problems
-# $Id: testbankimport.pm,v 1.43 2013/10/10 00:46:50 raeburn Exp $
+# $Id: testbankimport.pm,v 1.44 2014/02/11 19:11:18 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -579,7 +579,7 @@
my $blocks = $env{'form.blocks'};
my $qnumformat = $env{'form.qnumformat'};
my @types = ("MC","MA","TF","Ess","FIB","Ord");
- my %typenames = (
+ my %typenames = &Apache::lonlocal::texthash(
MC => "Multiple Choice",
TF => "True/False",
MA => "Multiple Answer",
@@ -1617,7 +1617,10 @@
my ($r,$fn,$current_page,$webpath,$res) = @_;
$r->print('<p><form name="display" method="post" action="/adm/testbank">'.&mt('The file you uploaded does not appear to be in the correct format.').
'</p><p>'.&mt('Extraction of questions is only possible for the following file types:').
- '<ul><li>'.&mt('plain text').'</li><li>RTF</li><li>HTML</li></ul>'.
+ '<ul>'.
+ '<li>'.&mt('plain text').'</li>'.
+ '<li>'.&mt('RTF').'</li>'.
+ '<li>'.&mt('HTML').'</li></ul>'.
&mt('The file type identified for the file you uploaded is [_1].','<b>'.$res.'</b>').'</p>');
$r->print(&page_footer($env{'form.newdir'},$fn,$current_page,$webpath,undef,'badfile').
'</form>');
@@ -1862,7 +1865,7 @@
if ($env{'form.phase'} eq 'three') {
$current_page = &display_control();
@pages = ('Welcome','Blocks','Format','Target','Confirmation');
- %names = (
+ %names = &Apache::lonlocal::texthash(
Welcome => 'Testbank Format',
Blocks => 'Classification',
Format => 'Selection',
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.190 loncom/interface/lonhelper.pm:1.191
--- loncom/interface/lonhelper.pm:1.190 Sun Dec 30 16:05:16 2012
+++ loncom/interface/lonhelper.pm Tue Feb 11 19:11:24 2014
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.190 2012/12/30 16:05:16 raeburn Exp $
+# $Id: lonhelper.pm,v 1.191 2014/02/11 19:11:24 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2396,7 +2396,7 @@
$result .= "<th>$text</th>";
}
}
- $result .= "<th>Select</th>";
+ $result .= '<th>'.&mt('Select').'</th>';
$result .= "</tr><tr>"; # Close off the extra row and start a new one.
$headings_done = 1;
}
@@ -2493,9 +2493,9 @@
&HTML::Entities::encode(&$valueFunc($resource),"<>&\"'");
if ($addparts && (scalar(@{$resource->parts}) > 1)) {
$col .= "<select onclick=\"javascript:updateRadio(this.form,'${var}_forminput','$resource_name');updateHidden(this.form,'$id','${var}');\" name='part_${id}_forminput'>\n";
- $col .= "<option value=\"$part\">All Parts</option>\n";
+ $col .= "<option value=\"$part\">'.&mt('All Parts').'</option>\n";
foreach my $part (@{$resource->parts}) {
- $col .= "<option value=\"$part\">Part: $part</option>\n";
+ $col .= "<option value=\"$part\">".&mt('Part: [_1]',$part)."</option>\n";
}
$col .= "</select>";
}
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.576 loncom/interface/londocs.pm:1.577
--- loncom/interface/londocs.pm:1.576 Sun Jan 12 22:34:51 2014
+++ loncom/interface/londocs.pm Tue Feb 11 19:11:24 2014
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.576 2014/01/12 22:34:51 raeburn Exp $
+# $Id: londocs.pm,v 1.577 2014/02/11 19:11:24 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -301,14 +301,14 @@
if ($contents{content}) {
$content .= '
<div class="LC_Box">
-<h4 class="LC_hcell">Content</h4>'.
+<h4 class="LC_hcell">'.&mt('Content').'</h4>'.
$contents{content}.'
</div>';
}
if ($contents{webreferences}) {
$content .= '
<div class="LC_Box">
-<h4 class="LC_hcell">Web References</h4>'.
+<h4 class="LC_hcell">'.&mt('Web References').'</h4>'.
$contents{webreferences}.'
</div>';
}
@@ -4849,7 +4849,11 @@
'title' => 'Title',
'comment' => 'Comment',
'parse' => 'Upload embedded images/multimedia files if HTML file',
- );
+ 'bb5' => 'Blackboard 5',
+ 'bb6' => 'Blackboard 6',
+ 'angel5' => 'ANGEL 5.5',
+ 'webctce4' => 'WebCT 4 Campus Edition',
+ );
# -----------------------------------------------------------------------------
my $fileupload=(<<FIUP);
$lt{'file'}:<br />
@@ -4880,10 +4884,10 @@
$lt{'cms'}:
<select name="source">
<option value="-1" selected="selected">$lt{'se'}</option>
- <option value="bb5">Blackboard 5</option>
- <option value="bb6">Blackboard 6</option>
- <option value="angel5">ANGEL 5.5</option>
- <option value="webctce4">WebCT 4 Campus Edition</option>
+ <option value="bb5">$lt{'bb5'}</option>
+ <option value="bb6">$lt{'bb6'}</option>
+ <option value="angel5">$lt{'angel5'}</option>
+ <option value="webctce4">$lt{'webctce4'}</option>
</select>
<input type="hidden" name="folder" value="$imsfolder" />
</p>
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.118 loncom/interface/slotrequest.pm:1.119
--- loncom/interface/slotrequest.pm:1.118 Tue May 21 18:54:15 2013
+++ loncom/interface/slotrequest.pm Tue Feb 11 19:11:24 2014
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.118 2013/05/21 18:54:15 raeburn Exp $
+# $Id: slotrequest.pm,v 1.119 2014/02/11 19:11:24 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1211,11 +1211,11 @@
<td valign="top">
<table>
<tr>
- <td rowspan="2">Deleted slots:</td>
- <td><label>'.$show_radio.'Show</label></td>
+ <td rowspan="2">'.&mt('Deleted slots:').'</td>
+ <td><label>'.$show_radio.&mt('Show').'</label></td>
</tr>
<tr>
- <td><label>'.$hide_radio.'Hide</label></td>
+ <td><label>'.$hide_radio.&mt('Hide').'</label></td>
</tr>
</table>
</td>
Index: loncom/interface/spreadsheet/assesscalc.pm
diff -u loncom/interface/spreadsheet/assesscalc.pm:1.59 loncom/interface/spreadsheet/assesscalc.pm:1.60
--- loncom/interface/spreadsheet/assesscalc.pm:1.59 Fri Oct 12 13:56:38 2012
+++ loncom/interface/spreadsheet/assesscalc.pm Tue Feb 11 19:11:30 2014
@@ -1,5 +1,5 @@
#
-# $Id: assesscalc.pm,v 1.59 2012/10/12 13:56:38 raeburn Exp $
+# $Id: assesscalc.pm,v 1.60 2014/02/11 19:11:30 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -488,19 +488,19 @@
$r->print($tableheader);
#
# Print out template row
- $r->print('<tr><td>Template</td><td> </td>'.
+ $r->print('<tr><td>'.&mt('Template').'</td><td> </td>'.
$self->html_template_row($num_uneditable,$importcolor).
"</tr>\n");
#
# Print out summary/export row
- $r->print('<tr><td>Export</td><td>0</td>'.
+ $r->print('<tr><td>'.&mt('Export').'</td><td>0</td>'.
$self->html_export_row($exportcolor)."</tr>\n");
#
# Prepare to output rows
- $tableheader =<<"END";
-<table border="2">
-<tr><th>row</th><th>Item</th>
-END
+ $tableheader =
+ '<table border="2">'.
+ '<tr><th>'.&mt('Row').'</th>'.
+ '<th>'.&mt('Item').'</th>';
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
$tableheader.='<th bgcolor="'.$importcolor.'">';
More information about the LON-CAPA-cvs
mailing list