--- loncom/localize/lonlocal.pm	2003/10/02 17:35:57	1.17
+++ loncom/localize/lonlocal.pm	2003/10/08 17:43:37	1.20
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.17 2003/10/02 17:35:57 bowersj2 Exp $
+# $Id: lonlocal.pm,v 1.20 2003/10/08 17:43:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -210,8 +210,10 @@ sub mt (@) {
 # ============================================================== What language?
 
 sub current_language {
-    my $lang=$lh->maketext('language_code');
-    return ($lang eq 'language_code'?'en':$lang);
+    if ($lh) {
+	my $lang=$lh->maketext('language_code');
+	return ($lang eq 'language_code'?'en':$lang);
+    }
 }
 
 # ============================================================== What encoding?
@@ -280,6 +282,45 @@ sub get_language_handle {
 ###    setlocale(LC_ALL,&current_locale);
 }
 
+# ========================================================== Localize localtime
+
+sub locallocaltime {
+    my $thistime=shift;
+    if ((&current_language=~/^en/) || (!$lh)) {
+	return ''.localtime($thistime);
+    } else {
+	my $format=$lh->maketext('date_locale');
+	if ($format eq 'date_locale') {
+	    return ''.localtime($thistime);
+	}
+	my ($seconds,$minutes,$twentyfour,$day,$mon,$year,$wday,$yday,$isdst)=
+	    localtime($thistime);
+	my $month=(split(/\,/,$lh->maketext('date_months')))[$mon];
+	my $weekday=(split(/\,/,$lh->maketext('date_days')))[$wday];
+	if ($seconds<10) {
+	    $seconds='0'.$seconds;
+	}
+	if ($minutes<10) {
+	    $minutes='0'.$minutes;
+	}
+	$year+=1900;
+	my $twelve=$twentyfour;
+	my $ampm;
+	if ($twelve>12) {
+	    $twelve-=12;
+	    $ampm=$lh->maketext('date_pm');
+	} else {
+	    $ampm=$lh->maketext('date_am');
+	}
+	foreach 
+	('seconds','minutes','twentyfour','twelve','day','year',
+	 'month','weekday','ampm') {
+	    $format=~s/\$$_/eval('$'.$_)/gse;
+	}
+	return $format;
+    }
+}
+
 # ==================== Normalize string (reduce fragility in the lexicon files)
 
 # This normalizes a string to reduce fragility in the lexicon files of