--- loncom/interface/lonnotify.pm 2012/12/17 15:06:39 1.39
+++ loncom/interface/lonnotify.pm 2017/01/18 21:07:31 1.42
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Sending messages
#
-# $Id: lonnotify.pm,v 1.39 2012/12/17 15:06:39 raeburn Exp $
+# $Id: lonnotify.pm,v 1.42 2017/01/18 21:07:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -220,8 +220,8 @@ sub print_display_option_form {
$output .= &Apache::lonhtmlcommon::row_title(&mt('Choose sender(s)'));
my %personnel = &Apache::lonnet::get_domain_roles($cdom,\@roles);
my @domcc = ();
- foreach my $server (keys %personnel) {
- foreach my $user (sort(keys %{$personnel{$server}})) {
+ foreach my $server (keys(%personnel)) {
+ foreach my $user (sort(keys(%{$personnel{$server}}))) {
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
unless (grep/^$uname:$udom$/,@domcc) {
my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname);
@@ -286,11 +286,11 @@ ENDSCRIPT
$output .= &Apache::loncommon::start_data_table();
if ($msgcount > 0) {
$output .= &Apache::loncommon::start_data_table_header_row().
- '
Date | '.
- 'Subject | '.
- 'Sender | '.
- 'Message | '.
- 'Recipients | '.
+ ''.&mt('Date').' | '.
+ ''.&mt('Subject').' | '.
+ ''.&mt('Sender').' | '.
+ ''.&mt('Message').' | '.
+ ''.&mt('Recipients').' | '.
&Apache::loncommon::end_data_table_header_row();
if (($env{'form.sortby'} eq 'date') || ($env{'form.sortby'} eq '') || (!defined($env{'form.sortby'})) || (($env{'form.sortby'} eq 'sender') && (@senders <= 1))) {
@@ -357,7 +357,7 @@ ENDSCRIPT
}
} else {
$output .= &Apache::loncommon::start_data_table_empty_row().
- 'No mail sent matching supplied criteria | '.
+ ''.&mt('No mail sent matching supplied criteria').' | '.
&Apache::loncommon::end_data_table_empty_row();
}
$output .= &Apache::loncommon::end_data_table();
@@ -410,7 +410,7 @@ sub print_selection_form {
my $allidlist = $idlist{$codetitles[0]};
$jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist);
$jscript .= $scripttext;
- $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles);
+ $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,\@codetitles);
}
}
my @standardnames = &Apache::loncommon::get_standard_codeitems();
@@ -645,7 +645,7 @@ function goBack(target) {
$output .= &Apache::loncommon::end_data_table();
if (@unmatched) {
$output .= '
'.&mt('Could not determine e-mail addresses for the following users:').'';
- foreach my $username (sort @unmatched) {
+ foreach my $username (sort(@unmatched)) {
$output .= '- '.$username.'
';
}
$output .= '
';
@@ -720,7 +720,7 @@ ENDSCRIPT
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();
} else {
- $output .= 'No mail sent - no recipients identified';
+ $output .= &mt('No mail sent - no recipients identified');
}
$output .= '
'.&mt('Send another e-mail').''."\n";
$output .= ''."\n".