[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm /interface/statistics lonstudentassessment.pm /localize/localize de.pm es.pm zh.pm
bisitz
bisitz@source.lon-capa.org
Tue, 22 Sep 2009 14:29:02 -0000
This is a MIME encoded message
--bisitz1253629742
Content-Type: text/plain
bisitz Tue Sep 22 14:29:02 2009 EDT
Modified files:
/loncom/interface lonprintout.pm
/loncom/interface/statistics lonstudentassessment.pm
/loncom/localize/localize de.pm zh.pm es.pm
Log:
Localized various statistical printing texts
- Added &mt() calls
- Added missing phrases to de.pm, prepared phrases in zh.pm, updated phrases in es.pm
- Optimized some &mt() calls and adjusted corresponding translation file entries
- Consistent username:domain
--bisitz1253629742
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090922142902.txt"
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.560 loncom/interface/lonprintout.pm:1.561
--- loncom/interface/lonprintout.pm:1.560 Mon Aug 3 11:01:14 2009
+++ loncom/interface/lonprintout.pm Tue Sep 22 14:28:50 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.560 2009/08/03 11:01:14 foxr Exp $
+# $Id: lonprintout.pm,v 1.561 2009/09/22 14:28:50 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1086,9 +1086,9 @@
if ($selectionmade eq '4') {
if ($choice eq 'all_problems') {
- $assignment='Problems from the Whole Course';
+ $assignment=&mt('Problems from the Whole Course');
} else {
- $assignment='Resources from the Whole Course';
+ $assignment=&mt('Resources from the Whole Course');
}
} else {
$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.156 loncom/interface/statistics/lonstudentassessment.pm:1.157
--- loncom/interface/statistics/lonstudentassessment.pm:1.156 Mon Aug 10 16:32:32 2009
+++ loncom/interface/statistics/lonstudentassessment.pm Tue Sep 22 14:28:56 2009
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.156 2009/08/10 16:32:32 bisitz Exp $
+# $Id: lonstudentassessment.pm,v 1.157 2009/09/22 14:28:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -327,7 +327,7 @@
'</td>';
$Str .= '<td align="center"><b>'.&mt('Groups').'</b>'.
'</td>';
- $Str .= '<td align="center"><b>'.&mt('Student Data</b>').
+ $Str .= '<td align="center"><b>'.&mt('Student Data').'</b>'.
&Apache::loncommon::help_open_topic("Chart_Student_Data").
'</td>';
$Str .= '<td align="center"><b>'.&mt('Access Status').'</b>'.
@@ -546,7 +546,7 @@
summary_table => 1,
maximum_row => 0,
ignore_weight => 1,
- shortdesc => 'Number of Problem Parts completed successfully.',
+ shortdesc => 'Number of Problem Parts completed successfully',
longdesc => 'The Number of Problem Parts completed successfully and '.
'the maximum possible for each student',
},
@@ -554,7 +554,7 @@
sub HTMLifyOutputDataDescriptions {
my $Str = '';
- $Str .= "<h2>Output Data</h2>\n";
+ $Str .= "<h2>'.&mt('Output Data').'</h2>\n";
$Str .= "<dl>\n";
foreach my $option (@OutputDataOptions) {
$Str .= ' <dt>'.$option->{'name'}.'</dt>';
@@ -995,9 +995,9 @@
sub SingleStudentTotal {
return if (! defined($navmap));
my $student = &Apache::lonstatistics::current_student();
- my $Str = '<h3>'.&mt('Summary table for [_1] ([_2]@[_3])',
+ my $Str = '<h3>'.&mt('Summary table for [_1] ([_2])',
$student->{'fullname'},
- $student->{'username'},$student->{'domain'}).'</h3>';
+ $student->{'username'}.':'.$student->{'domain'}).'</h3>';
$Str .= $/;
$Str .= &Apache::loncommon::start_data_table()."\n";
$Str .=
@@ -1178,11 +1178,11 @@
#
# Put the date in there too
$excel_sheet->write($header_row,$cols_output++,
- 'Compiled on '.localtime(time),$format->{'h3'});
+ &mt('Compiled on [_1]',&Apache::lonlocal::locallocaltime(time)),$format->{'h3'});
#
$cols_output = 0;
$excel_sheet->write($description_row,$cols_output++,
- $chosen_output->{'shortdesc'},
+ &mt($chosen_output->{'shortdesc'}),
$format->{'b'});
#
$cols_output = 0;
@@ -1260,17 +1260,17 @@
$formula_data{$symb}->{'Excel:scorecol'}=$cols_output;
if ($chosen_output->{'base'} eq 'parts correct total') {
$excel_sheet->write($resource_name_row,$cols_output++,
- 'parts correct',
+ &mt('parts correct'),
$format->{'bold'});
} elsif ($chosen_output->{'sequence_sum'}) {
if ($chosen_output->{'correct'}) {
# Only reporting the number correct, so do not call it score
$excel_sheet->write($resource_name_row,$cols_output++,
- 'sum',
+ &mt('sum'),
$format->{'bold'});
} else {
$excel_sheet->write($resource_name_row,$cols_output++,
- 'score',
+ &mt('score'),
$format->{'bold'});
}
}
@@ -1280,7 +1280,7 @@
($first_data_row,$cols_output-1);
if ($chosen_output->{'sequence_max'}) {
$excel_sheet->write($resource_name_row,$cols_output,
- 'maximum',
+ &mt('maximum'),
$format->{'bold'});
$formula_data{$symb}->{'Excel:maxcell'} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
@@ -1294,11 +1294,11 @@
}
}
if ($chosen_output->{'grand_total'}) {
- $excel_sheet->write($resource_name_row,$cols_output++,'Total',
+ $excel_sheet->write($resource_name_row,$cols_output++,&mt('Total'),
$format->{'bold'});
}
if ($chosen_output->{'grand_maximum'}) {
- $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total',
+ $excel_sheet->write($resource_name_row,$cols_output++,&mt('Max. Total'),
$format->{'bold'});
}
$total_formula = $excel_sheet->store_formula($total_formula_string);
@@ -1389,17 +1389,17 @@
if ($chosen_output->{'summary_table'}) {
$cols_output = 0;
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Summary Table',$format->{'bold'});
+ &mt('Summary Table'),$format->{'bold'});
if ($chosen_output->{'maximum_row'}) {
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Maximum',$format->{'bold'});
+ &mt('Maximum'),$format->{'bold'});
}
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Average',$format->{'bold'});
+ &mt('Average'),$format->{'bold'});
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Median',$format->{'bold'});
+ &mt('Median'),$format->{'bold'});
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Std Dev',$format->{'bold'});
+ &mt('Std Dev'),$format->{'bold'});
my $row = $summary_header_row+1;
foreach my $seq (@sequences) {
my $symb = $seq->symb;
@@ -1713,23 +1713,23 @@
$sequence_row.='"",'x$count;
if ($chosen_output->{'sequence_sum'}) {
if($chosen_output->{'correct'}) {
- $resource_row .= '"sum",';
+ $resource_row .= '"'.&mt('sum').'",';
} else {
- $resource_row .= '"score",';
+ $resource_row .= '"'.&mt('score').'",';
}
}
if ($chosen_output->{'sequence_max'}) {
$sequence_row.= '"",';
- $resource_row .= '"maximum possible",';
+ $resource_row .= '"'.&mt('maximum possible').'",';
}
}
if ($chosen_output->{'grand_total'}) {
$sequence_row.= '"",';
- $resource_row.= '"Total",';
+ $resource_row.= '"'.&mt('Total').'",';
}
if ($chosen_output->{'grand_maximum'}) {
$sequence_row.= '"",';
- $resource_row.= '"Maximum",';
+ $resource_row.= '"'.&mt('Maximum').'",';
}
chomp($sequence_row);
chomp($resource_row);
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.325 loncom/localize/localize/de.pm:1.326
--- loncom/localize/localize/de.pm:1.325 Wed Sep 9 17:58:44 2009
+++ loncom/localize/localize/de.pm Tue Sep 22 14:29:01 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.325 2009/09/09 17:58:44 bisitz Exp $
+# $Id: de.pm,v 1.326 2009/09/22 14:29:01 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4193,6 +4193,12 @@
'without Formfields'
=> 'ohne Formularfelder',
+ 'Problems from the Whole Course'
+=> 'Aufgaben des gesamten Kurses',
+
+ 'Resources from the Whole Course'
+=> 'Ressourcen des gesamten Kurses',
+
'Parameter'
=> 'Parameter',
@@ -11168,8 +11174,8 @@
'Chart'
=> 'Chart',
- 'Student Data</b>'
-=> 'Studentische Daten</b>', # !
+ 'Student Data'
+=> 'Studentische Daten',
'HTML, with links'
=> 'HTML, mit Links',
@@ -11243,21 +11249,48 @@
'Show links in new window:'
=> 'Links in neuem Fenster öffnen:',
+ 'Summary Table'
+=> 'Zusammenfassende Tabelle',
+
'Summary Tables'
=> 'Zusammenfassende Tabellen',
- 'Summary table for [_1] ([_2]@[_3])'
-=> 'Zusammenfassende Tabelle für [_1] ([_2]@[_3])',
+ 'Summary table for [_1] ([_2])'
+=> 'Zusammenfassende Tabelle für [_1] ([_2])',
'Average'
=> 'Durchschnitt',
+ 'maximum'
+=> 'Maximum',
+
'Maximum'
=> 'Maximum',
+ 'Max. Total'
+=> 'Max. Gesamt',
+
+ 'Median'
+=> 'Median',
+
+ 'Std Dev'
+=> 'Std.-Abw.',
+
+ 'sum'
+=> 'Summe',
+
+ 'maximum possible'
+=> 'Maximal erreichbar',
+
+ 'parts correct'
+=> 'korrekte Teile',
+
'Return to the chart'
=> 'Zurück zum Chart',
+ 'Compiled on [_1]'
+=> 'Erstellt am [_1]',
+
"Click on a student's name or username to view their chart"
=> "Klicken Sie auf den Namen oder die Benutzerkennung eines/r Studenten/in, um dessen Chart anzuzeigen",
@@ -11754,7 +11787,7 @@
=> 'Parameter:',
'Total Score and Maximum Possible for each Sequence or Folder'
-=> 'Gesamtpunkte und maximal mögliche für jede Sequenz oder jedes Verzeichnis',
+=> 'Gesamtpunkte und maximal erreichbare für jede Sequenz oder jedes Verzeichnis',
'Score on each Problem Part'
=> 'Punkte je Aufgabenteil',
@@ -11762,7 +11795,7 @@
'Number of Tries before success on each Problem Part'
=> 'Anzahl notwendiger Versuche je Aufgabenteil',
- 'Number of Problem Parts completed successfully.'
+ 'Number of Problem Parts completed successfully'
=> 'Anzahl erfolgreich bearbeiteter Aufgabenteile',
'Unable to retrieve course information.'
@@ -15903,6 +15936,9 @@
'Score'
=> 'Punkte',
+ 'score'
+=> 'Punkte',
+
'Display Options'
=> 'Anzeige-Optionen',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.76 loncom/localize/localize/zh.pm:1.77
--- loncom/localize/localize/zh.pm:1.76 Tue Sep 8 12:46:59 2009
+++ loncom/localize/localize/zh.pm Tue Sep 22 14:29:01 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Chinese Simplified Localization Lexicon
#
-# $Id: zh.pm,v 1.76 2009/09/08 12:46:59 bisitz Exp $
+# $Id: zh.pm,v 1.77 2009/09/22 14:29:01 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4229,6 +4229,12 @@
'without Formfields'
=> '不带有格式字段',
+ 'Problems from the Whole Course'
+=> 'Aufgaben des gesamten Kurses',
+
+ 'Resources from the Whole Course'
+=> 'Ressourcen des gesamten Kurses',
+
'Parameter'
=> '参数',
@@ -11222,8 +11228,8 @@
'Chart'
=> '图表',
- 'Student Data</b>'
-=> '学生资料</b>', # !
+ 'Student Data'
+=> '学生资料',
'HTML, with links'
=> 'HTML格式，链接',
@@ -11297,21 +11303,48 @@
'Show links in new window:'
=> 'Links in neuem Fenster öffnen:',
+ 'Summary Table'
+=> 'Zusammenfassende Tabelle',
+
'Summary Tables'
=> 'Zusammenfassende Tabellen',
- 'Summary table for [_1] ([_2]@[_3])'
-=> 'Zusammenfassende Tabelle für [_1] ([_2]@[_3])',
+ 'Summary table for [_1] ([_2])'
+=> 'Zusammenfassende Tabelle für [_1] ([_2])',
'Average'
=> 'Durchschnitt',
+ 'maximum'
+=> 'Maximum',
+
'Maximum'
=> 'Maximum',
+ 'Max. Total'
+=> 'Max. Gesamt',
+
+ 'Median'
+=> 'Median',
+
+ 'Std Dev'
+=> 'Std.-Abw.',
+
+ 'sum'
+=> 'Summe',
+
+ 'maximum possible'
+=> 'Maximal erreichbar',
+
+ 'parts correct'
+=> 'korrekte Teile',
+
'Return to the chart'
=> 'Zurück zum Chart',
+ 'Compiled on [_1]'
+=> 'Erstellt am [_1]',
+
"Click on a student's name or username to view their chart"
=> "Klicken Sie auf den Namen oder die Benutzerkennung eines Studenten, um dessen Chart anzuzeigen",
@@ -11798,7 +11831,7 @@
'Number of Tries before success on each Problem Part'
=> 'Anzahl notwendiger Versuche je Aufgabenteil',
- 'Number of Problem Parts completed successfully.'
+ 'Number of Problem Parts completed successfully'
=> 'Anzahl erfolgreich bearbeiteter Aufgabenteile',
'Unable to retrieve course information.'
@@ -15992,6 +16025,9 @@
'Score'
=> 'Punkte',
+ 'score'
+=> 'Punkte',
+
'Display Options'
=> '显示选项',
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.18 loncom/localize/localize/es.pm:1.19
--- loncom/localize/localize/es.pm:1.18 Thu Sep 17 15:32:58 2009
+++ loncom/localize/localize/es.pm Tue Sep 22 14:29:01 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Spanish Localization Lexicon
#
-# $Id: es.pm,v 1.18 2009/09/17 15:32:58 ramirez Exp $
+# $Id: es.pm,v 1.19 2009/09/22 14:29:01 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4231,6 +4231,12 @@
'without Formfields'
=> 'sin formato de campos ',
+ 'Problems from the Whole Course'
+=> 'Problems from the Whole Course',
+
+ 'Resources from the Whole Course'
+=> 'Ressourcen des gesamten Kurses',
+
'Parameter'
=> 'Parámetro',
@@ -11416,8 +11422,8 @@
#=> 'Gráfico',
=> 'Cuadro',
- 'Student Data</b>'
-=> 'Datos de Estudiante</b>', # !
+ 'Student Data'
+=> 'Datos de Estudiante',
'HTML, with links'
=> 'HTML, con enlaces',
@@ -11494,8 +11500,8 @@
'Summary Tables'
=> 'Cuadros Sinópticos', #n.t.
- 'Summary table for [_1] ([_2]@[_3])'
-=> 'Cuadros Sinóptico para [_1] ([_2]@[_3])',
+ 'Summary table for [_1] ([_2])'
+=> 'Cuadros Sinóptico para [_1] ([_2])',
'Average'
=> 'Promedio',
@@ -11980,7 +11986,7 @@
'Number of Tries before success on each Problem Part'
=> 'Número de Intentos antes de acertar en cada Parte del Problema',
- 'Number of Problem Parts completed successfully.'
+ 'Number of Problem Parts completed successfully'
=> 'Número de Partes del Problema completadas exitosamente',
'Unable to retrieve course information.'
--bisitz1253629742--