Changeset 25685

Timestamp:

12/02/08 16:54:11 (5 weeks ago)

Author:

kazuho

Message:

configurable submit label and reset label

Location:

lang/perl/HTML-AutoForm/trunk

Files:

• lib/HTML/AutoForm.pm (modified) (5 diffs)
• t/00-base.t (modified) (2 diffs)

lang/perl/HTML-AutoForm/trunk/lib/HTML/AutoForm.pm

@@ -23 +23 @@
 our $VERSION;
 our %Defaults;
+our %Lang_Defaults;
 our $DEFAULT_LANG;
 our $CLASS_PREFIX;
@@ -33 +34 @@
         fields       => undef, # need to be copied
         secure       => 1,
-    );
-    Class::Accessor::Lite->mk_accessors(keys %Defaults);
+        reset_label  => undef,
+    );
+    %Lang_Defaults = (
+        en => {
+            submit_label => 'Submit Form',
+            error_prefix => '',
+        },
+        ja => {
+            submit_label => 'フォームを投稿',
+            error_prefix => '※',
+        },
+    );
+    Class::Accessor::Lite->mk_accessors(
+        keys %Defaults,
+        keys %{$Lang_Defaults{en}},
+    );
     $DEFAULT_LANG = 'en';
     $CLASS_PREFIX = 'autoform';
@@ -48 +63 @@
     }
     my $self = bless {
+        %{$Lang_Defaults{$DEFAULT_LANG}},
         %Defaults,
         %args,
@@ -115 +131 @@
                             $CLASS_PREFIX,
                             '_error">',
-                            _escape_html('※' . $err->message),
+                            _escape_html($self->error_prefix . $err->message),
                             '</div>',
                         );
@@ -124 +140 @@
             }->($_)
         } @{$self->{fields}}),
-        $self->secure
-            ? (
-                '<input type="hidden" name="',
-                _escape_html($self->csrf_keyname),
-                '" value="',
-                # TODO: use a different id
-                _escape_html($csrf_token),
+        $self->secure ? (
+            '<input type="hidden" name="',
+            _escape_html($self->csrf_keyname),
+            '" value="',
+            # TODO: use a different id
+            _escape_html($csrf_token),
+            '" />',
+        ) : (),
+        $self->submit_label || $self->reset_label ? (
+            '<tr><th></th><td>',
+            $self->submit_label ? (
+                '<input class="',
+                $CLASS_PREFIX,
+                '_field_submit" type="submit" value="',
+                _escape_html($self->submit_label),
                 '" />',
             ) : (),
-        '<tr><th></th><td><input type="submit" value="投稿する" /></td></tr>',
+            $self->reset_label ? (
+                '<input class="',
+                $CLASS_PREFIX,
+                '_field_reset" type="reset" value="',
+                _escape_html($self->reset_label),
+                '" />',
+            ) : (),
+            '</td></tr>',
+        ) : (),
         '</table></form>',
     );

lang/perl/HTML-AutoForm/trunk/t/00-base.t

@@ -4 +4 @@
 
 use CGI;
-use Test::More tests => 67;
+use Test::More tests => 71;
 
 BEGIN { use_ok('HTML::AutoForm'); };
@@ -270 +270 @@
    'hidden render 1',
 );
+
+$form = HTML::AutoForm->new(
+    action => '/action',
+    fields => [
+        username => {
+            type     => 'text',
+            value    => 'defval',
+            required => 1,
+        },
+    ],
+    submit_label => 'Register Me!',
+);
+
+$ENV{REQUEST_METHOD} = 'GET';
+is($form->render(CGI->new(''), 'abcde'),
+   join('',
+        '<form action="/action" method="POST">',
+        '<table class="autoform_table">',
+        '<tr><th>Username</th><td><input class="autoform_field_text" name="username" type="text" value="defval" /></td></tr>',
+        '<input type="hidden" name="__autoform_csrf_key" value="abcde" />',
+        '<tr><th></th><td><input class="autoform_field_submit" type="submit" value="Register Me!" /></td></tr>',
+        '</table>',
+        '</form>',
+    ),
+   'form render',
+);
+
+$form->secure(undef);
+is($form->render(CGI->new(''), 'abcde'),
+   join('',
+        '<form action="/action">',
+        '<table class="autoform_table">',
+        '<tr><th>Username</th><td><input class="autoform_field_text" name="username" type="text" value="defval" /></td></tr>',
+        '<tr><th></th><td><input class="autoform_field_submit" type="submit" value="Register Me!" /></td></tr>',
+        '</table>',
+        '</form>',
+    ),
+   'form render',
+);
+
+$form->reset_label('Forget Me!');
+is($form->render(CGI->new(''), 'abcde'),
+   join('',
+        '<form action="/action">',
+        '<table class="autoform_table">',
+        '<tr><th>Username</th><td><input class="autoform_field_text" name="username" type="text" value="defval" /></td></tr>',
+        '<tr><th></th><td><input class="autoform_field_submit" type="submit" value="Register Me!" /><input class="autoform_field_reset" type="reset" value="Forget Me!" /></td></tr>',
+        '</table>',
+        '</form>',
+    ),
+   'form render',
+);
+
+$form->submit_label(undef);
+$form->reset_label(undef);
+is($form->render(CGI->new(''), 'abcde'),
+   join('',
+        '<form action="/action">',
+        '<table class="autoform_table">',
+        '<tr><th>Username</th><td><input class="autoform_field_text" name="username" type="text" value="defval" /></td></tr>',
+        '</table>',
+        '</form>',
+    ),
+   'form render',
+);