loncom/localize/lonlocal.pm - diff

Return to lonlocal.pm CVS log

Up to [LON-CAPA] / loncom / localize

-version 1.14, 2003/09/28 02:06:37
+version 1.17, 2003/10/02 17:35:57
  Line 225  sub current_encoding {
      }
  }
+ # =============================================================== Which locale?
+ # Refer to locale -a
+ #
+ sub current_locale {
+     if ($lh) {
+ 	my $enc=$lh->maketext('lang_locale');
+ 	return ($enc eq 'lang_locale'?'':$enc);
+     } else {
+ 	return undef;
+     }
+ }
  # ============================================================== Translate hash
  sub texthash {
- Line 265  sub get_language_handle {
+ Line 277  sub get_language_handle {
      if (&Apache::lonnet::mod_perl_version == 1) {
  	$r->content_languages([&current_language()]);
      }
-     setlocale(LC_ALL,&current_language.'.'.&current_encoding);
+ ###    setlocale(LC_ALL,&current_locale);
  }
+ # ==================== Normalize string (reduce fragility in the lexicon files)
+ # This normalizes a string to reduce fragility in the lexicon files of
+ # huge messages (such as are used by the helper), and allow useful
+ # formatting: reduce all consecutive whitespace to a single space,
+ # and remove all HTML
+ sub normalize_string {
+     my $s = shift;
+     $s =~ s/\s+/ /g;
+     $s =~ s/<[^>]+>//g;
+     return $s;
+ }
 ;
  __END__