*** testenv.ori	Sun Apr 17 09:39:32 2005
--- testenv	Sun Apr 17 10:04:12 2005
***************
*** 347,353 ****
  
  
  # Turn off fatalsToBrowser while checking module loads, to avoid load errors in
! # browser in some environments.  
  $CGI::Carp::WRAP = $CGI::Carp::WRAP = 0;	# Avoid warnings...
  
  # Add to list of required modules if non-Unix, or MacOS X (detected by
--- 347,354 ----
  
  
  # Turn off fatalsToBrowser while checking module loads, to avoid load errors in
! # browser in some environments.   NOTE: CGI::Carp doesn't seem to work at all
! # in some environments.
  $CGI::Carp::WRAP = $CGI::Carp::WRAP = 0;	# Avoid warnings...
  
  # Add to list of required modules if non-Unix, or MacOS X (detected by
***************
*** 381,389 ****
  print "</td></tr>\n";
  
  # Do locale settings if TWiki.pm was found
  my $showLocales = 0;
  if ($twikiFound) {
!     if( eval 'TWiki::setupLocale()' ){	# Not in older TWiki.pm versions
  	# Ignore errors silently
  	$showLocales = 1;
      }
--- 382,392 ----
  print "</td></tr>\n";
  
  # Do locale settings if TWiki.pm was found
+ # HACK
  my $showLocales = 0;
  if ($twikiFound) {
!     eval 'TWiki::setupLocale()';	# Not in older TWiki.pm versions
!     if( not $@ ){	
  	# Ignore errors silently
  	$showLocales = 1;
      }