[LON-CAPA-cvs] cvs: loncom /interface lonuserutils.pm /interface/spreadsheet Spreadsheet.pm /interface/statistics longradinganalysis.pm lonstudentassessment.pm lonstudentsubmissions.pm
bisitz
lon-capa-cvs-allow@mail.lon-capa.org
Fri, 12 Sep 2008 14:35:49 -0000
bisitz Fri Sep 12 10:35:49 2008 EDT
Modified files:
/loncom/interface/statistics longradinganalysis.pm
lonstudentassessment.pm
lonstudentsubmissions.pm
/loncom/interface lonuserutils.pm
/loncom/interface/spreadsheet Spreadsheet.pm
Log:
Wording: "CSV" (comma separated values) everywhere uppercase
Index: loncom/interface/statistics/longradinganalysis.pm
diff -u loncom/interface/statistics/longradinganalysis.pm:1.7 loncom/interface/statistics/longradinganalysis.pm:1.8
--- loncom/interface/statistics/longradinganalysis.pm:1.7 Fri Aug 18 11:15:38 2006
+++ loncom/interface/statistics/longradinganalysis.pm Fri Sep 12 10:35:45 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: longradinganalysis.pm,v 1.7 2006/08/18 15:15:38 raeburn Exp $
+# $Id: longradinganalysis.pm,v 1.8 2008/09/12 14:35:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -197,7 +197,7 @@
}
close($outputfile);
$r->print('<br />'.
- '<a href="'.$filename.'">'.&mt('Your csv file.')."</a>\n");
+ '<a href="'.$filename.'">'.&mt('Your CSV file.')."</a>\n");
} elsif ($env{'form.output'} eq 'excel') {
my ($excel_workbook,$excel_sheet,$filename,$format,$rows_output) =
&init_excel_output($r);
@@ -218,7 +218,7 @@
} else {
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row().
- '<th>Name (username)</th><th>Grades Assigned</th>'.
+ '<th>'.&mt('Name (username)').'</th><th>'.&mt('Grades Assigned').'</th>'.
&Apache::loncommon::end_data_table_header_row() );
foreach my $line (@output) {
$r->print(&Apache::loncommon::start_data_table_row().
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.146 loncom/interface/statistics/lonstudentassessment.pm:1.147
--- loncom/interface/statistics/lonstudentassessment.pm:1.146 Thu Dec 20 08:57:13 2007
+++ loncom/interface/statistics/lonstudentassessment.pm Fri Sep 12 10:35:45 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.146 2007/12/20 13:57:13 bisitz Exp $
+# $Id: lonstudentassessment.pm,v 1.147 2008/09/12 14:35:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1826,7 +1826,7 @@
#
# Tell the user where to get their csv file
$r->print('<br />'.
- '<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n");
+ '<a href="'.$filename.'">'.&mt('Your CSV file.').'</a>'."\n");
$r->rflush();
&csv_cleanup();
return;
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.47 loncom/interface/statistics/lonstudentsubmissions.pm:1.48
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.47 Thu Sep 11 10:47:23 2008
+++ loncom/interface/statistics/lonstudentsubmissions.pm Fri Sep 12 10:35:45 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.47 2008/09/11 14:47:23 bisitz Exp $
+# $Id: lonstudentsubmissions.pm,v 1.48 2008/09/12 14:35:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -928,7 +928,7 @@
time.'_'.rand(1000000000).'.csv';
unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
$r->log_error("Couldn't open $filename for output $!");
- $r->print(&mt('Problems occurred in writing the csv file. '
+ $r->print(&mt('Problems occurred in writing the CSV file. '
.'This error has been logged. '
.'Please alert your LON-CAPA administrator.'));
$outputfile = undef;
@@ -1046,9 +1046,9 @@
# Close the progress window
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
#
- # Tell the user where to get their csv file
+ # Tell the user where to get their CSV file
$r->print('<br />'.
- '<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n");
+ '<a href="'.$filename.'">'.&mt('Your CSV file.').'</a>'."\n");
$r->rflush();
return;
}
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.68 loncom/interface/lonuserutils.pm:1.69
--- loncom/interface/lonuserutils.pm:1.68 Fri Sep 12 09:39:26 2008
+++ loncom/interface/lonuserutils.pm Fri Sep 12 10:35:46 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.68 2008/09/12 13:39:26 droeschl Exp $
+# $Id: lonuserutils.pm,v 1.69 2008/09/12 14:35:46 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2244,7 +2244,7 @@
time.'_'.rand(1000000000).'.csv';
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
$r->log_error("Couldn't open $CSVfilename for output $!");
- $r->print(&mt('Problems occurred in writing the csv file. '
+ $r->print(&mt('Problems occurred in writing the CSV file. '
.'This error has been logged. '
.'Please alert your LON-CAPA administrator.'));
$CSVfile = undef;
Index: loncom/interface/spreadsheet/Spreadsheet.pm
diff -u loncom/interface/spreadsheet/Spreadsheet.pm:1.79 loncom/interface/spreadsheet/Spreadsheet.pm:1.80
--- loncom/interface/spreadsheet/Spreadsheet.pm:1.79 Thu Sep 11 10:47:22 2008
+++ loncom/interface/spreadsheet/Spreadsheet.pm Fri Sep 12 10:35:46 2008
@@ -1,5 +1,5 @@
#
-# $Id: Spreadsheet.pm,v 1.79 2008/09/11 14:47:22 bisitz Exp $
+# $Id: Spreadsheet.pm,v 1.80 2008/09/12 14:35:46 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1525,14 +1525,14 @@
my $csvdata = '';
my @Values;
#
- # Open the csv file
+ # Open the CSV file
my $filename = '/prtspool/'.
$env{'user.name'}.'_'.$env{'user.domain'}.'_'.
time.'_'.rand(1000000000).'.csv';
my $file;
unless ($file = Apache::File->new('>'.'/home/httpd'.$filename)) {
$r->log_error("Couldn't open $filename for output $!");
- $r->print(&mt('Problems occurred in writing the csv file. '
+ $r->print(&mt('Problems occurred in writing the CSV file. '
.'This error has been logged. '
.'Please alert your LON-CAPA administrator.'));
$r->print("<pre>\n".$csvdata."</pre>\n");
@@ -1547,7 +1547,7 @@
# Output the body of the spreadsheet
$self->csv_rows($connection,$file);
#
- # Close the csv file
+ # Close the CSV file
close($file);
$r->print('<br /><br />'.
'<a href="'.$filename.'">'.&mt('Your CSV spreadsheet.').'</a>'."\n");