--- loncom/localize/lonlocal.pm 2007/10/18 21:08:31 1.42 +++ loncom/localize/lonlocal.pm 2008/05/16 16:11:56 1.44 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.42 2007/10/18 21:08:31 albertel Exp $ +# $Id: lonlocal.pm,v 1.44 2008/05/16 16:11:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -182,7 +182,15 @@ sub mt (@) { # print LOG (@_[0]."\n"); # close(LOG); if ($lh) { - return $lh->maketext(@_); + if ($_[0] eq '') { + if (wantarray) { + return @_; + } else { + return $_[0]; + } + } else { + return $lh->maketext(@_); + } } else { if (wantarray) { return @_; @@ -289,7 +297,8 @@ sub locallocaltime { my $day = $dt->day_of_month(); my $mon = $dt->month()-1; my $year = $dt->year(); - my $wday = $dt->wday()-1; + my $wday = $dt->wday(); + if ($wday==7) { $wday=0; } my $month =(split(/\,/,$lh->maketext('date_months')))[$mon]; my $weekday=(split(/\,/,$lh->maketext('date_days')))[$wday]; if ($seconds<10) {