[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface/statistics lonproblemstatistics.pm
raeburn
raeburn at source.lon-capa.org
Mon Dec 30 09:05:22 EST 2013
raeburn Mon Dec 30 14:05:22 2013 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface/statistics lonproblemstatistics.pm
Log:
- For 2.11
- Backport 1.123, 1.124.
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.122.2.1 loncom/interface/statistics/lonproblemstatistics.pm:1.122.2.2
--- loncom/interface/statistics/lonproblemstatistics.pm:1.122.2.1 Sat May 12 03:17:43 2012
+++ loncom/interface/statistics/lonproblemstatistics.pm Mon Dec 30 14:05:21 2013
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemstatistics.pm,v 1.122.2.1 2012/05/12 03:17:43 raeburn Exp $
+# $Id: lonproblemstatistics.pm,v 1.122.2.2 2013/12/30 14:05:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -73,6 +73,14 @@
## header for plots created with Graph.pm, both of which more than likely do
## not support localization.
##
+## Additional Notes:
+## Localization can be done and is done before passing the phrases
+## to the output.
+## This might conflict with special characters, e.g. German Umlaute or
+## chinese characters. Do not use such characters in this case.
+## If this failed, consider that the sequence and folder names
+## are also passed to the output and would fail the same way.
+##
#
#
##
@@ -84,7 +92,7 @@
## title yes any scalar This is what the user sees to identify
## the field. Passed through &mt().
## long_title yes any scalar Used as graph heading and in excel
-## output. NOT translated
+## output. Passed through &mt().
## align no (left|right|center) HTML cell contents alignment
## color yes html color HTML cell background color
## used to visually group statistics
@@ -274,7 +282,7 @@
sortable => 'yes',
graphable => 'yes',
long_title => 'Degree of Difficulty'.
- '[ 1 - ((#YES+#yes) / Tries) ]',
+ ' ~[ 1 - ((#YES+#yes) / Tries) ~]',
selectable => 'yes',
defaultselected => 'yes',
},
@@ -757,11 +765,11 @@
$count += scalar(@resources);
}
if ($count > 10) {
- $r->print('<h2>'.
- &mt('Compiling statistics for [_1] problems',$count).
- '</h2>');
+ $r->print('<p>'.
+ &mt('Compiling statistics for [quant,_1,problem]',$count).
+ '</p>');
if ($count > 30) {
- $r->print('<h3>'.&mt('This will take some time.').'</h3>');
+ $r->print('<p class="LC_info">'.&mt('This will take some time.').'</p>');
}
$r->rflush();
}
@@ -1005,15 +1013,15 @@
my $title; my $yaxis;
foreach my $field (@Fields) {
next if ($field->{'name'} ne $datafield);
- $title = $field->{'long_title'};
- $yaxis = $field->{'title'};
+ $title = &mt($field->{'long_title'});
+ $yaxis = &mt($field->{'title'});
last;
}
if ($title eq '' || $yaxis eq '') {
# datafield is something we do not know enough about to plot
- $r->print('<h3>'.
+ $r->print('<p class="LC_warning">'.
&mt('Unable to plot the requested statistic.').
- '</h3>');
+ '</p>');
return;
}
#
@@ -1040,7 +1048,7 @@
}
#
$r->print("<p>".&Apache::loncommon::DrawBarGraph($title,
- 'Problem Number',
+ &mt('Problem Number'),
$yaxis,
$max,
undef, # colors
@@ -1105,10 +1113,14 @@
my $diffdata .= '<data>'.join(',', at Labels).'</data>'.$/.
'<data>'.join(',', at Diff).'</data>'.$/;
#
- my $title = 'Degree of Discrimination\nand Degree of Difficulty';
+ my $title = &mt('Degree of Discrimination[_1]and Degree of Difficulty','\n');
if ($xmax > 50) {
- $title = 'Degree of Discrimination and Degree of Difficulty';
+ $title = &mt('Degree of Discrimination and Degree of Difficulty');
}
+ my %lt = &Apache::lonlocal::texthash(
+ 'alttag' => 'Degree of Discrimination and Degree of Difficulty Plot',
+ 'xlabel' => 'Problem Number',
+ );
#
$plot=<<"END";
<gnuplot
@@ -1120,7 +1132,7 @@
align="center"
border="on"
transparent="on"
- alttag="Degree of Discrimination and Degree of Difficulty Plot"
+ alttag="$lt{'alttag'}"
samples="100"
bgcolor="xffffff"
height="$height"
@@ -1131,7 +1143,7 @@
box="off" />
<title>$title</title>
<axis xmin="0" ymin="$ymin" xmax="$xmax" ymax="$ymax" color="x000000" />
- <xlabel>Problem Number</xlabel>
+ <xlabel>$lt{'xlabel'}</xlabel>
<curve
linestyle="linespoints"
name="DoDisc"
@@ -1193,11 +1205,16 @@
'<data>'.join(',', at Mean).'</data>'.$/.
'<data>'.join(',', at STD).'</data>'.$/;
#
- my $title = 'Mean and S.D. of Tries';
- if ($xmax > 25) {
- $title = 'Mean and Standard Deviation of Tries';
+ my $title = &mt('Mean and S.D. of Tries');
+ if ($xmax > 30) {
+ $title = &mt('Mean and Standard Deviation of Tries');
}
#
+ my %lt = &Apache::lonlocal::texthash(
+ 'alttag' => 'Mean and S.D of Tries Plot',
+ 'xlabel' => 'Problem Number',
+ 'ylabel' => 'Number of Tries',
+ );
$plot=<<"END";
<gnuplot
texfont="10"
@@ -1208,15 +1225,15 @@
align="center"
border="on"
transparent="on"
- alttag="Mean and S.D of Tries Plot"
+ alttag="$lt{'alttag'}"
samples="100"
bgcolor="xffffff"
height="$height"
width="$width">
<title>$title</title>
<axis xmin="0" ymin="0" xmax="$xmax" ymax="$ymax" color="x000000" />
- <xlabel>Problem Number</xlabel>
- <ylabel>Number of Tries</ylabel>
+ <xlabel>$lt{'xlabel'}</xlabel>
+ <ylabel>$lt{'ylabel'}</ylabel>
<curve
linestyle="yerrorbars"
name="S.D. Tries"
@@ -1241,6 +1258,7 @@
sub plot_dropdown {
my $current = '';
+ my $title;
#
if (defined($env{'form.plot'})) {
$current = $env{'form.plot'};
@@ -1256,7 +1274,7 @@
#
my $Str= "\n".'<select name="plot" size="1">';
$Str .= '<option name="none"></option>'."\n";
- $Str .= '<option name="none2">none</option>'."\n";
+ $Str .= '<option name="none2">'.&mt('none').'</option>'."\n";
foreach my $field (@Additional_Plots, at Fields) {
if (! exists($field->{'graphable'}) ||
$field->{'graphable'} ne 'yes') {
@@ -1264,9 +1282,11 @@
}
$Str .= '<option value="'.$field->{'name'}.'"';
if ($field->{'name'} eq $current) {
- $Str .= ' selected ';
+ $Str .= ' selected="selected"';
}
- $Str.= '>'.&mt($field->{'title'}).'</option>'."\n";
+ $title = &mt($field->{'long_title'});
+ $title = &mt($field->{'title'}) if (!$title);
+ $Str.= '>'.$title.'</option>'."\n";
}
$Str .= '</select>'."\n";
return $Str;
More information about the LON-CAPA-cvs
mailing list