--- loncom/interface/lonwhatsnew.pm 2008/04/30 23:52:00 1.77 +++ loncom/interface/lonwhatsnew.pm 2008/12/12 15:49:54 1.80.2.1 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.77 2008/04/30 23:52:00 raeburn Exp $ +# $Id: lonwhatsnew.pm,v 1.80.2.1 2008/12/12 15:49:54 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -169,19 +169,19 @@ sub display_main_box { degdiff => 'Degree of difficulty', numstudents => 'Total number of students with submissions', ); - my %versions = &Apache::lonlocal::texthash ( + my %versions = ( -1 => "version changes since start of $lctype", 2592000 => 'version changes since last month', 604800 => 'version changes since last week', 86400 => 'version changes since yesterday', ); - my %newroles = &Apache::lonlocal::texthash ( + my %newroles = ( -1 => "roles which have become active since start of $lctype", 2592000 => 'roles which have become active since last month', 604800 => 'roles which have become active since last week', 86400 => 'roles which have become active since yesterday', ); - my %oldroles = &Apache::lonlocal::texthash ( + my %oldroles = ( -1 => "roles which expired since start of $lctype", 2592000 => 'roles which expired since last month', 604800 => 'roles which expired since last week', @@ -352,10 +352,8 @@ sub display_actions_box { } $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.' .' ' - .&mt('Currently: [_1]',$currinit) - .'.  ' -# &mt('Change for just this '.$lctype.'',$refpage).' '. -# &mt('or for all your courses.',$refpage).'
'); + .&mt('Currently: [_1].',''.$currinit.'') + .'  ' .&mt('Change for just [_1]this course[_2]' .' or for all [_3]your courses[_2].' ,'' @@ -402,13 +400,13 @@ sub display_actions_box { ); if ($timediff{'versions'} == -1) { - $headings{'versionchanges'} = 'Resources in '.$lctype.' with version changes since start of '.$lctype; + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since start of '.$lctype); } elsif ($timediff{'versions'} == 2592000) { - $headings{'versionchanges'} = 'Resources in '.$lctype.' with version changes since last month'; + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last month'); } elsif ($timediff{'versions'} == 604800) { - $headings{'versionchanges'} = 'Resources in '.$lctype.' with version changes since last week'; + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last week'); } elsif ($timediff{'versions'} == 86400) { - $headings{'versionchanges'} = 'Resources in '.$lctype.' with version changes since yesterday'; + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since yesterday'); } $timediff{'oldroles'} = $display_settings{$cid.':oldroleinterval'}; @@ -416,13 +414,13 @@ sub display_actions_box { $interval{'oldroles'} = $interval_titles->{'oldroles'}->{$timediff{'oldroles'}}; if ($timediff{'oldroles'} == -1) { - $headings{'oldroles'} = 'Roles for which access to '.$lctype.' has expired since start of '.$lctype; + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since start of '.$lctype); } elsif ($timediff{'oldroles'} == 2592000) { - $headings{'oldroles'} = 'Roles for which access to '.$lctype.' has expired since last month'; + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last month'); } elsif ($timediff{'oldroles'} == 604800) { - $headings{'oldroles'} = 'Roles for which access to '.$lctype.' has expired since last week'; + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last week'); } elsif ($timediff{'oldroles'} == 86400) { - $headings{'oldroles'} = 'Roles for which access to '.$lctype.' has expired since yesterday'; + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since yesterday'); } $timediff{'newroles'} = $display_settings{$cid.':newroleinterval'}; @@ -430,13 +428,13 @@ sub display_actions_box { $interval{'newroles'} = $interval_titles->{'newroles'}->{$timediff{'newroles'}}; if ($timediff{'newroles'} == -1) { - $headings{'newroles'} = 'Roles for which access to '.$lctype.' has become available since start of '.$lctype; + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since start of '.$lctype); } elsif ($timediff{'newroles'} == 2592000) { - $headings{'newroles'} = 'Roles for which access to '.$lctype.' has become available since last month'; + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last month'); } elsif ($timediff{'newroles'} == 604800) { - $headings{'newroles'} = 'Roles for which access to '.$lctype.' has become available since last week'; + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last week'); } elsif ($timediff{'newroles'} == 86400) { - $headings{'newroles'} = 'Roles for which access to '.$lctype.' has become available since yesterday'; + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since yesterday'); } my $now = time; @@ -464,9 +462,9 @@ sub display_actions_box { } $headings{'abovethreshold'} = - &mt('Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2]
and total number of '.$stulabel{$crstype}.' with submissions ≥ [_3]', + &mt('(Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2]) [_3] and total number of '.$stulabel{$crstype}.' with submissions ≥ [_4]', $threshold{'av_attempts'},$threshold{'degdiff'}, - $threshold{'numstudents'}); + '
',$threshold{'numstudents'}); my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles'); @@ -637,12 +635,12 @@ sub display_interval_config { '. &mt('Display:').' -         - ' + (' ' x7). + ' '); @@ -1222,8 +1220,8 @@ sub getactivated { if (ref($changes{$chg}) eq 'HASH') { my $timestamp = $changes{$chg}{'exe_time'}; if ($timestamp) { - if ($rolechgtime > -1) { - if ($now - $rolechgtime < $timestamp) { + if ($rolechgtime > 0) { + if ($timestamp < $rolechgtime) { last; } } @@ -1563,7 +1561,6 @@ sub display_versionchanges { 'revd' => 'Last revised', 'newv' => 'New version', 'veru' => 'Version used', - 'noup' => 'No', ); if (keys(%{$changed}) > 0) { $r->print(''. @@ -1586,8 +1583,8 @@ sub display_versionchanges { $$changed{$item}{'version'}.''); } } else { - $r->print(''.$lt{'noup'}. - ' '.$interval.''); + $r->print('' + .&mt('No '.$interval).''); } return; } @@ -1601,7 +1598,6 @@ sub display_rolechanges { 'role' => 'Role', 'sec' => 'Section', 'status' => 'Status', - 'norc' => 'There are no ', ); if ($chgcount) { $r->print(''. @@ -1644,8 +1640,8 @@ sub display_rolechanges { } } } else { - $r->print(''.$lt{'norc'}. - ' '.$interval.''); + $r->print('' + .&mt('There are no '.$interval).''); } return; }