loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

-version 1.96, 2003/04/19 15:34:06
+version 1.98, 2003/05/04 21:20:17
  Line 151  BEGIN {
  	    while (<$fh>) {
  		next if /^\#/;
  		chomp;
- 		my ($key,$val)=(split(/\s+/,$_,2));
+ 		my ($key,$two,$country,$three,$enc,$val)=(split(/\t/,$_));
- 		$language{$key}=$val;
+ 		$language{$key}=$val.' - '.$enc;
  	    }
  	}
      }
  Line 1347  sub languagedescription {
      return $language{shift(@_)};
  }
+ # ----------------------------------------------------------- Display Languages
+ # returns a hash with all desired display languages
+ #
+ sub display_languages {
+     my %languages=();
+     if ($ENV{'environment.languages'}) {
+ 	foreach (split(/\s*(\,|\;|\:)\s*/,$ENV{'environment.languages'})) {
+ 	    $languages{$_}=1;
+         }
+     }
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
+     if ($ENV{'form.displaylanguage'}) {
+ 	foreach (split(/\s*(\,|\;|\:)\s*/,$ENV{'form.displaylanguage'})) {
+ 	    $languages{$_}=1;
+         }
+     }
+     return %languages;
+ }
  # --------------------------------------------------------------- Copyright IDs
  sub copyrightids {
      return sort(keys(%cprtag));