--- loncom/interface/loncommon.pm 2003/09/17 16:50:58 1.119 +++ loncom/interface/loncommon.pm 2003/10/04 23:47:44 1.125 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.119 2003/09/17 16:50:58 www Exp $ +# $Id: loncommon.pm,v 1.125 2003/10/04 23:47:44 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,6 +80,7 @@ my $readit; # ----------------------------------------------- Filetypes/Languages/Copyright my %language; +my %supported_language; my %cprtag; my %fe; my %fd; my %category_extensions; @@ -146,8 +147,11 @@ BEGIN { while (<$fh>) { next if /^\#/; chomp; - my ($key,$two,$country,$three,$enc,$val)=(split(/\t/,$_)); + my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$_)); $language{$key}=$val.' - '.$enc; + if ($sup) { + $supported_language{$key}=$sup; + } } } } @@ -1505,7 +1509,10 @@ returns description of a specified langu =cut sub languagedescription { - return $language{shift(@_)}; + my $code=shift; + return ($supported_language{$code}?'* ':''). + $language{$code}. + ($supported_language{$code}?' ['.&mt('interface available').']':''); } =pod @@ -1661,7 +1668,6 @@ sub preferred_languages { push (@genlanguages,(split(/(\-|\_)/,$_))[0]); } } - &Apache::lonnet::logthis('Lang: '.join(',',@genlanguages)); return @genlanguages; } @@ -2322,6 +2328,14 @@ sub no_cache { #$r->header_out("Expires" => $date); } +sub content_type { + my ($r,$type,$charset) = @_; + unless ($charset) { + $charset=&Apache::lonlocal::current_encoding; + } + $r->content_type($type.($charset?'; charset='.$charset:'')); +} + =pod =item * add_to_env($name,$value)