[Pieforms-commit] SF.net SVN: pieforms: [110] pieforms-php5/trunk/src/pieform/rules

[<ora...@us...>]

Revision: 110
          http://svn.sourceforge.net/pieforms/?rev=110&view=rev
Author:   oracleshinoda
Date:     2006-12-22 19:48:02 -0800 (Fri, 22 Dec 2006)

Log Message:
-----------
Updated all rules to use the new i18n api

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/rules/email.php
    pieforms-php5/trunk/src/pieform/rules/maxlength.php
    pieforms-php5/trunk/src/pieform/rules/minlength.php
    pieforms-php5/trunk/src/pieform/rules/validateoptions.php

Modified: pieforms-php5/trunk/src/pieform/rules/email.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/email.php	2006-12-23 03:47:04 UTC (rev 109)
+++ pieforms-php5/trunk/src/pieform/rules/email.php	2006-12-23 03:48:02 UTC (rev 110)
@@ -30,15 +30,24 @@
  * Currently, the check is [anything]@[anything]. Someone is welcome to write
  * something better, this was made just for testing.
  *
- * @param Pieform $form  The form the rule is being applied to
- * @param string  $value The e-mail address to check
- * @return string        The error message, if there is something wrong with
- *                       the address.
+ * @param Pieform $form    The form the rule is being applied to
+ * @param string  $value   The e-mail address to check
+ * @param array   $element The element to check
+ * @return string          The error message, if there is something wrong with
+ *                         the address.
  */
-function pieform_rule_email(Pieform $form, $value) {
+function pieform_rule_email(Pieform $form, $value, $element) {
     if (!preg_match('/^[a-z0-9\._%-]+@(?:[a-z0-9-]+\.)+[a-z]{2,4}$/', $value)) {
-        return $form->i18n('email');
+        return $form->i18n('rule', 'email', 'email', $element);
     }
 }
 
+function pieform_i18n_rule_email() {
+    return array(
+        'en.utf8' => array(
+            'email' => 'E-mail address is invalid'
+        )
+    );
+}
+
 ?>

Modified: pieforms-php5/trunk/src/pieform/rules/maxlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxlength.php	2006-12-23 03:47:04 UTC (rev 109)
+++ pieforms-php5/trunk/src/pieform/rules/maxlength.php	2006-12-23 03:48:02 UTC (rev 110)
@@ -35,8 +35,16 @@
  */
 function pieform_rule_maxlength(Pieform $form, $value, $element, $maxlength) {
     if (strlen($value) > $maxlength) {
-        return sprintf($form->i18n('maxlength'), $maxlength);
+        return sprintf($form->i18n('rule', 'maxlength', 'maxlength', $element), $maxlength);
     }
 }
 
+function pieform_i18n_rule_maxlength() {
+    return array(
+        'en.utf8' => array(
+            'maxlength' => 'This field must be at most %d characters long'
+        )
+    );
+}
+
 ?>

Modified: pieforms-php5/trunk/src/pieform/rules/minlength.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minlength.php	2006-12-23 03:47:04 UTC (rev 109)
+++ pieforms-php5/trunk/src/pieform/rules/minlength.php	2006-12-23 03:48:02 UTC (rev 110)
@@ -35,8 +35,16 @@
  */
 function pieform_rule_minlength(Pieform $form, $value, $element, $minlength) {
     if (strlen($value) < $minlength) {
-        return sprintf($form->i18n('minlength'), $minlength);
+        return sprintf($form->i18n('rule', 'minlength', 'minlength', $element), $minlength);
     }
 }
 
+function pieform_i18n_rule_minlength() {
+    return array(
+        'en.utf8' => array(
+            'minlength' => 'This field must be at least %d characters long', 
+        )
+    );
+}
+
 ?>

Modified: pieforms-php5/trunk/src/pieform/rules/validateoptions.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/validateoptions.php	2006-12-23 03:47:04 UTC (rev 109)
+++ pieforms-php5/trunk/src/pieform/rules/validateoptions.php	2006-12-23 03:48:02 UTC (rev 110)
@@ -42,9 +42,17 @@
     $allowedvalues = array_keys($element['options']);
     foreach ($field as $key) {
         if (!in_array($key, $allowedvalues)) {
-            return sprintf($form->i18n('validateoptions'), $key);
+            return sprintf($form->i18n('rule', 'validateoptions', 'validateoptions', $element), $key);
         }
     }
 }
 
+function pieform_rule_validateoptions_i18n() {
+    return array(
+        'en.utf8' => array(
+            'validateoptions' => 'The option "%s" is invalid'
+        )
+    );
+}
+
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.