use string instead of object for LANGUAGE_HANDLE in ENV

gshank · Jul 30, 2012 · 055a33d · 055a33d
1 parent 6d7af78
commit 055a33d
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 19 deletions.
diff --git a/lib/HTML/FormHandler/Field.pm b/lib/HTML/FormHandler/Field.pm
@@ -1138,9 +1138,25 @@ sub language_handle {
         return;
     }
     return $self->get_language_handle if( $self->has_language_handle );
+    # if language handle isn't set use form language handle if possible
     return $self->form->language_handle if ( $self->has_form );
-    require HTML::FormHandler::I18N;
-    return $ENV{LANGUAGE_HANDLE} || HTML::FormHandler::I18N->get_handle;
+    # no form, no language handle. This should only happen when
+    # testing fields.
+    my $lh;
+    if ( $ENV{LANGUAGE_HANDLE} ) {
+        if ( blessed $ENV{LANGUAGE_HANDLE} ) {
+            $lh = $ENV{LANGUAGE_HANDLE};
+        }
+        else {
+            $lh = HTML::FormHandler::I18N->get_handle( $ENV{LANGUAGE_HANDLE} );
+        }
+    }
+    else {
+       require HTML::FormHandler::I18N;
+       $lh =  HTML::FormHandler::I18N->get_handle;
+    }
+    $self->set_language_handle($lh);
+    return $lh;
 }
 
 has 'localize_meth' => (

diff --git a/lib/HTML/FormHandler/TraitFor/I18N.pm b/lib/HTML/FormHandler/TraitFor/I18N.pm
@@ -16,9 +16,11 @@ etc.
 The builder for this attribute gets the Locale::Maketext language
 handle from the environment variable $ENV{LANGUAGE_HANDLE}:
 
-    $ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+    $ENV{LANGUAGE_HANDLE} = 'en_en';
 
 ...or creates a default language handler using L<HTML::FormHandler::I18N>.
+(Note that earlier versions required an actual object reference in ENV,
+which is a bad practice and no longer supported.)
 You can pass in an existing L<Locale::MakeText> subclass instance
 or create one in a builder.
 
@@ -68,7 +70,19 @@ sub _build_language_handle {
     if (!$self->isa('HTML::FormHandler') && $self->has_form) {
         return $self->form->language_handle();
     }
-    return $ENV{LANGUAGE_HANDLE} || HTML::FormHandler::I18N->get_handle;
+    my $lh;
+    if ( $ENV{LANGUAGE_HANDLE} ) {
+        if ( blessed $ENV{LANGUAGE_HANDLE} ) {
+            $lh = $ENV{LANGUAGE_HANDLE};
+        }
+        else {
+            $lh = HTML::FormHandler::I18N->get_handle( $ENV{LANGUAGE_HANDLE} );
+        }
+    }
+    else {
+       $lh =  HTML::FormHandler::I18N->get_handle;
+    }
+    return $lh;
 }
 
 sub _localize {

diff --git a/t/basic.t b/t/basic.t
@@ -3,7 +3,7 @@ use warnings;
 use Test::More;
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 use_ok('HTML::FormHandler');
 

diff --git a/t/compound/basic.t b/t/compound/basic.t
@@ -4,7 +4,7 @@ use lib 't/lib';
 
 use_ok( 'HTML::FormHandler::Field::Duration');
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 my $field = HTML::FormHandler::Field::Duration->new( name => 'duration' );
 $field->build_result;

diff --git a/t/errors/basic.t b/t/errors/basic.t
@@ -4,7 +4,7 @@ use Test::More;
 
 use_ok( 'HTML::FormHandler' );
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 {
    package My::Form;

diff --git a/t/fields/dates.t b/t/fields/dates.t
@@ -4,7 +4,7 @@ use Test::More;
 
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 #
 # DateMDY

diff --git a/t/fields/fields.t b/t/fields/fields.t
@@ -4,7 +4,7 @@ use warnings;
 use Test::More;
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 #
 # Boolean

diff --git a/t/render/compound2.t b/t/render/compound2.t
@@ -4,7 +4,7 @@ use Test::More;
 use HTML::FormHandler::Test;
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 {
     package MyApp::Form::Password;

diff --git a/t/render/errors.t b/t/render/errors.t
@@ -4,7 +4,7 @@ use Test::More;
 use HTML::FormHandler::Test;
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 {
     package Test::Form;
     use HTML::FormHandler::Moose;

diff --git a/t/result/errors.t b/t/result/errors.t
@@ -4,7 +4,7 @@ use Test::More;
 use HTML::FormHandler::Test;
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 {
     package Test::Form;

diff --git a/t/validation/dependency.t b/t/validation/dependency.t
@@ -1,7 +1,7 @@
 use Test::More;
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 use DateTime;
 

diff --git a/t/validation/filters.t b/t/validation/filters.t
@@ -8,7 +8,7 @@ use DateTime;
 use Scalar::Util qw(blessed);
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 {
    package My::Form;

diff --git a/t/validation/types.t b/t/validation/types.t
@@ -6,7 +6,7 @@ use Test::Exception;
 use HTML::FormHandler::Types (':all');
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 {
   package Test::Form;

diff --git a/xt/dfv.t b/xt/dfv.t
@@ -3,7 +3,7 @@ use warnings;
 use Test::More;
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 {
     package MyApp::Form::Test;

diff --git a/xt/locale.t b/xt/locale.t
@@ -74,7 +74,7 @@ $form->field('test_field')->clear_errors;
 dies_ok( sub { $form->field('test_field')->add_error('You are not authorized for this archive. See: [<a href="/help/auth">more information</a>],  [<a href="/need_auth">request authorization</a>]') }, 'dies on maketext error' );
 
 ################ Locale xx_xx set via ENV{LANGUAGE_HANDLE}
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('xx_xx');
+$ENV{LANGUAGE_HANDLE} = 'xx_xx';
 
 # create form w/ locale must work
 undef $form;

diff --git a/xt/posted.t b/xt/posted.t
@@ -3,7 +3,7 @@ use warnings;
 use Test::More;
 
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 {
     package Test::SingleBool;

diff --git a/xt/upload.t b/xt/upload.t
@@ -5,7 +5,7 @@ use HTML::FormHandler::Test;
 
 use_ok('HTML::FormHandler::Field::Upload');
 use HTML::FormHandler::I18N;
-$ENV{LANGUAGE_HANDLE} = HTML::FormHandler::I18N->get_handle('en_en');
+$ENV{LANGUAGE_HANDLE} = 'en_en';
 
 {
     package Mock::Upload;