[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/I18N Initializer.pm,1.10,1.11

[Chris W. <la...@us...>]

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

Modified Files:
	Initializer.pm 
Log Message:
the I18N subclass is returned from a subroutine rather than in __DATA__


Index: Initializer.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/I18N/Initializer.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Initializer.pm	25 Jan 2005 04:03:20 -0000	1.10
--- Initializer.pm	2 Feb 2005 13:10:42 -0000	1.11
***************
*** 68,72 ****
  
      $TEMPLATE ||= Template->new();
!     $BASE_CLASS = join( '', <DATA> );
  
  MSGFILE:
--- 68,72 ----
  
      $TEMPLATE ||= Template->new();
!     $BASE_CLASS = $self->_get_lang_template();
  
  MSGFILE:
***************
*** 178,181 ****
--- 178,184 ----
      my @lang_class_pieces = @base_class_pieces;
  
+     # 'en' is always the default language no matter what your
+     # website's default language is
+ 
      unless ( $lang eq 'en' ) {
          push @base_class_pieces, 'en';
***************
*** 207,212 ****
                      $TEMPLATE->error();
      $log->is_debug &&
!         $log->debug( "Processed template okay. Now eval'ing class with ",
!                      "these contents: ", $gen_class );
      eval $gen_class;
      if ( $@ ) {
--- 210,215 ----
                      $TEMPLATE->error();
      $log->is_debug &&
!         $log->debug( "Class generated ok; now eval'ing class with\n",
!                      $gen_class );
      eval $gen_class;
      if ( $@ ) {
***************
*** 215,226 ****
      }
      $log->is_debug &&
!         $log->debug( "Evaluated class okay" );
      return $lang_class;
  }
  
! 1;
! 
! 
! __DATA__
  package [% lang_class %];
  
--- 218,227 ----
      }
      $log->is_debug &&
!         $log->debug( "Evaluated class $lang_class ok" );
      return $lang_class;
  }
  
! sub _get_lang_template {
!     return <<'TEMPLATE';
  package [% lang_class %];
  
***************
*** 234,244 ****
  
  %Lexicon = (
! [% FOREACH msg_key = messages.keys %]
    '[% msg_key %]' => qq{[% messages.$msg_key %]},
! [% END %]
  );
  
  1;
  
  __END__
  
--- 235,250 ----
  
  %Lexicon = (
! [% FOREACH msg_key = messages.keys -%]
    '[% msg_key %]' => qq{[% messages.$msg_key %]},
! [% END -%]
  );
  
  1;
  
+ TEMPLATE
+ }
+ 
+ 1;
+ 
  __END__