[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 I18N.pm,1.9,1.10 Request.pm,1.55,1.56

[Teemu A. <in...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22537

Modified Files:
	I18N.pm Request.pm 
Log Message:
1) Changed logging in I18N to be less intrusive 2) I18N returns requested key itself with [_\d+] replaced if no translation is found and debugging is off 3) Improved logic in deciding the user language

Index: I18N.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/I18N.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** I18N.pm	18 Mar 2005 04:09:48 -0000	1.9
--- I18N.pm	23 Mar 2005 19:17:54 -0000	1.10
***************
*** 32,37 ****
      };
      if ( $@ ) {
!         $log->error( "Failed to translate '$key': $@" );;
!         return "Message error for '$key'";
      }
      $log->is_debug &&
--- 32,48 ----
      };
      if ( $@ ) {
!         if ( $log->is_debug ) {
!             $log->debug( "Failed to translate '$key': $@" );;
!             return "Message error for '$key'";
!         }
!         else {
!             my $iteration = 1;
!             while ( 1 ) {
!                 last unless $key =~ /\[_$iteration\]/;
!                 $key =~ s/\[_$iteration\]/$args[$iteration]/g;
!                 $iteration++;
!             }
!             return $key;
!         }
      }
      $log->is_debug &&

Index: Request.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Request.pm	23 Mar 2005 16:32:32 -0000	1.55
--- Request.pm	23 Mar 2005 19:17:55 -0000	1.56
***************
*** 383,406 ****
                           ? @{ $session_lang } : $session_lang;
      }
!     elsif ( my @param_lang = $self->param( $lang_config->{choice_param_name} ) ) {
          $log->is_debug &&
              $log->debug( "Added language from request parameter ",
                           "'$lang_config->{choice_param_name}'" );
!         push @lang, @param_lang;
!     }
!     else {
!         $log->is_debug &&
!             $log->debug( "Added default language: $lang_config->{default_language}" );
!         push @lang, $lang_config->{default_language};
      }
  
- 
      if ( my @browser_lang = $self->_find_browser_languages ) {
          $log->is_debug &&
              $log->debug( "Added language to head from browser: ",
                           join( ', ', @browser_lang ) );
!         unshift @lang, @browser_lang;
      }
  
      $self->{_user_language} = \@lang;
      $log->is_debug &&
--- 383,405 ----
                           ? @{ $session_lang } : $session_lang;
      }
! 
!     if ( my @param_lang = $self->param( $lang_config->{choice_param_name} ) ) {
          $log->is_debug &&
              $log->debug( "Added language from request parameter ",
                           "'$lang_config->{choice_param_name}'" );
!         unshift @lang, @param_lang;
      }
  
      if ( my @browser_lang = $self->_find_browser_languages ) {
          $log->is_debug &&
              $log->debug( "Added language to head from browser: ",
                           join( ', ', @browser_lang ) );
!         push @lang, @browser_lang;
      }
  
+     $log->is_debug &&
+         $log->debug( "Added default language: $lang_config->{default_language}" );
+     push @lang, $lang_config->{default_language};
+ 
      $self->{_user_language} = \@lang;
      $log->is_debug &&