--- loncom/localize/lonlocal.pm	2003/10/04 18:13:36	1.18
+++ 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.18 2003/10/04 18:13:36 www 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?
@@ -303,15 +305,16 @@ sub locallocaltime {
 	}
 	$year+=1900;
 	my $twelve=$twentyfour;
+	my $ampm;
 	if ($twelve>12) {
 	    $twelve-=12;
-	    $twelve.=$lh->maketext('date_pm');
+	    $ampm=$lh->maketext('date_pm');
 	} else {
-	    $twelve.=$lh->maketext('date_am');
+	    $ampm=$lh->maketext('date_am');
 	}
 	foreach 
 	('seconds','minutes','twentyfour','twelve','day','year',
-	 'month','weekday') {
+	 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
 	return $format;