pieforms-commit

[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.

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

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

Revision: 221
          http://pieforms.svn.sourceforge.net/pieforms/?rev=221&view=rev
Author:   oracleshinoda
Date:     2007-10-25 19:01:29 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
Added rules for ensuring that a value is at least or most a certain size.

Added Paths:
-----------
    pieforms-php5/trunk/src/pieform/rules/maxvalue.php
    pieforms-php5/trunk/src/pieform/rules/minvalue.php

Added: pieforms-php5/trunk/src/pieform/rules/maxvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxvalue.php	                        (rev 0)
+++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php	2007-10-26 02:01:29 UTC (rev 221)
@@ -0,0 +1,50 @@
+<?php
+/**
+ * This program is part of Pieforms
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * @package    pieform
+ * @subpackage rule
+ * @author     Nigel McNie <ni...@ca...>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
+ * @copyright  (C) 2006 Catalyst IT Ltd http://catalyst.net.nz
+ *
+ */
+
+/**
+ * Checks whether the given value is at most a certain size.
+ *
+ * @param Pieform $form      The form the rule is being applied to
+ * @param string  $value     The value to check
+ * @param array   $element   The element to check
+ * @param int     $maxvalue  The value to check for
+ * @return string            The error message, if the value is invalid.
+ */
+function pieform_rule_maxvalue(Pieform $form, $value, $element, $maxvalue) {
+    if ($value != '' && intval($value) > $maxvalue) {
+        return sprintf($form->i18n('rule', 'maxvalue', 'maxvalue', $element), $maxvalue);
+    }
+}
+
+function pieform_rule_maxvalue_i18n() {
+    return array(
+        'en.utf8' => array(
+            'maxvalue' => 'This value can not be larger than %d'
+        ),
+    );
+}
+
+?>

Added: pieforms-php5/trunk/src/pieform/rules/minvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minvalue.php	                        (rev 0)
+++ pieforms-php5/trunk/src/pieform/rules/minvalue.php	2007-10-26 02:01:29 UTC (rev 221)
@@ -0,0 +1,50 @@
+<?php
+/**
+ * This program is part of Pieforms
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * @package    pieform
+ * @subpackage rule
+ * @author     Nigel McNie <ni...@ca...>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
+ * @copyright  (C) 2006 Catalyst IT Ltd http://catalyst.net.nz
+ *
+ */
+
+/**
+ * Checks whether the given value is at least a certain size.
+ *
+ * @param Pieform $form      The form the rule is being applied to
+ * @param string  $value     The value to check
+ * @param array   $element   The element to check
+ * @param int     $maxlength The value to check for
+ * @return string            The error message, if the value is invalid.
+ */
+function pieform_rule_minvalue(Pieform $form, $value, $element, $minvalue) {
+    if ($value != '' && intval($value) < $minvalue) {
+        return sprintf($form->i18n('rule', 'minvalue', 'minvalue', $element), $minvalue);
+    }
+}
+
+function pieform_rule_minvalue_i18n() {
+    return array(
+        'en.utf8' => array(
+            'minvalue' => 'This value can not be smaller than %d'
+        ),
+    );
+}
+
+?>


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

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

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

Revision: 222
          http://pieforms.svn.sourceforge.net/pieforms/?rev=222&view=rev
Author:   oracleshinoda
Date:     2007-11-14 17:14:54 -0800 (Wed, 14 Nov 2007)

Log Message:
-----------
German translation for minvalue/maxvalue rules. Thanks to Heinz.

Modified Paths:
--------------
    pieforms-php5/trunk/src/pieform/rules/maxvalue.php
    pieforms-php5/trunk/src/pieform/rules/minvalue.php

Modified: pieforms-php5/trunk/src/pieform/rules/maxvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/maxvalue.php	2007-10-26 02:01:29 UTC (rev 221)
+++ pieforms-php5/trunk/src/pieform/rules/maxvalue.php	2007-11-15 01:14:54 UTC (rev 222)
@@ -44,6 +44,9 @@
         'en.utf8' => array(
             'maxvalue' => 'This value can not be larger than %d'
         ),
+        'de.utf8' => array(
+            'maxvalue' => 'Dieser Wert kann nicht größer als %d sein'
+        ),                                                           
     );
 }
 

Modified: pieforms-php5/trunk/src/pieform/rules/minvalue.php
===================================================================
--- pieforms-php5/trunk/src/pieform/rules/minvalue.php	2007-10-26 02:01:29 UTC (rev 221)
+++ pieforms-php5/trunk/src/pieform/rules/minvalue.php	2007-11-15 01:14:54 UTC (rev 222)
@@ -44,6 +44,9 @@
         'en.utf8' => array(
             'minvalue' => 'This value can not be smaller than %d'
         ),
+        'de.utf8' => array(
+            'minvalue' => 'Dieser Wert kann nicht kleiner als %d sein'
+        ),
     );
 }
 


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