Changeset 13946

Timestamp:

06/14/08 21:38:04 (5 years ago)

Author:

tomyhero

Message:

lang/perl/FormValidator::LazyWay? : test for append_error_message

Location:

lang/perl/FormValidator-LazyWay/branches/rebuild

Files:

• lib/FormValidator/LazyWay.pm (modified) (6 diffs)
• lib/FormValidator/LazyWay/Message.pm (modified) (3 diffs)
• t/lazyway-check-validation-block-append_error_message.t (added)

lang/perl/FormValidator-LazyWay/branches/rebuild/lib/FormValidator/LazyWay.pm

@@ -43 +43 @@
         sub { $self->_conv_profile(@_) },
 
+        # langをプロフィールにセット
+        sub { $self->_set_lang(@_) },
+
         # デフォルトセット
         sub { $self->_set_default(@_) },
@@ -75 +78 @@
 sub _append_error_message {
     my $self          = shift;
+    my $lang          = shift;
     my $level         = shift;
     my $field         = shift;
@@ -86 +90 @@
         $error_messages->{$field} = [];
     } 
-    push @{ $error_messages->{$field} }, $self->message->get( { lang => $self->lang , field => $field, label => $label , level => $level } );
+    push @{ $error_messages->{$field} }, $self->message->get( { lang => $lang , field => $field, label => $label , level => $level } );
+
 }
 
@@ -118 +123 @@
                     }
                     else {
-                        $self->_append_error_message( $level , $field , $storage , $validators->{$field}{label} , $error_messages);
+                        $self->_append_error_message( $profile->{lang} , $level , $field , $storage , $validators->{$field}{label} , $error_messages);
                         $is_invalid++;
                         last CHECK_ARRAYS;
@@ -142 +147 @@
                     }
                     else {
-                        $self->_append_error_message( $level , $field , $storage , $validators->{$field}{label} , $error_messages);
+                        $self->_append_error_message( $profile->{lang} , $level , $field , $storage , $validators->{$field}{label} , $error_messages);
                         $is_invalid++;
                     }
@@ -194 +199 @@
 
     return 1;
+}
+
+sub _set_lang {
+    my $self        = shift;
+    my $storage     = shift;
+    my $profile     = shift;
+
+    $profile->{lang} = $profile->{lang} || $self->message->lang;
 }
 

lang/perl/FormValidator-LazyWay/branches/rebuild/lib/FormValidator/LazyWay/Message.pm

@@ -29 +29 @@
                 for my $item ( @{ $self->rule->constraints->{$level}{$field} } ){
                     my $message =  $rule_message->{$lang}{ $item->{label} };
-                                foreach my $key ( keys %{$item->{args}}) {
-                                    my $regexp = '\$_\[' . $key . '\]';
-                                    my $value  = $item->{args}{$key};
-                                    $message =~ s/$regexp/$value/g;
-                                }
+                    foreach my $key ( keys %{$item->{args}}) {
+                        my $regexp = '\$_\[' . $key . '\]';
+                        my $value  = $item->{args}{$key};
+                        $message =~ s/$regexp/$value/g;
+                    }
                     $message_storage->{$lang}{$level}{$field}{$item->{label}} = $message;
                 }
@@ -39 +39 @@
         }
     }
-
     return $message_storage;
 }
@@ -46 +45 @@
     my $self = shift;
     my $params = shift;
-    return $self->message_storage->{$params->{lang}}{$params->{level}}{$params->{field}}{$params->{label}} ;
+    return $self->rule_message->{$params->{lang}}{$params->{level}}{$params->{field}}{$params->{label}} ;
 }