Merge branch 'refs/heads/develop' into feature/form_error_msgs

Conflicts:
	system/language/english/form_validation_lang.php
	user_guide_src/source/libraries/form_validation.rst

Signed-off-by: Eric Roberts <eric@cryode.com>

1 files changed, 30 insertions, 27 deletions

diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php
index 3d77e5eda..47c6bbd76 100644
--- a/system/language/english/form_validation_lang.php
+++ b/system/language/english/form_validation_lang.php
@@ -5,9 +5,9 @@
  * An open source application development framework for PHP 5.2.4 or newer
  *
  * NOTICE OF LICENSE
- * 
+ *
  * Licensed under the Open Software License version 3.0
- * 
+ *
  * This source file is subject to the Open Software License (OSL 3.0) that is
  * bundled with this package in the files license.txt / license.rst.  It is
  * also available through the world wide web at this URL:
@@ -24,31 +24,34 @@
  * @since		Version 1.0
  * @filesource
  */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['required']			= 'The {field} field is required.';
-$lang['isset']				= 'The {field} field must have a value.';
-$lang['valid_email']		= 'The {field} field must contain a valid email address.';
-$lang['valid_emails']		= 'The {field} field must contain all valid email addresses.';
-$lang['valid_url']			= 'The {field} field must contain a valid URL.';
-$lang['valid_ip']			= 'The {field} field must contain a valid IP.';
-$lang['min_length']			= 'The {field} field must be at least {param} characters in length.';
-$lang['max_length']			= 'The {field} field cannot exceed {param} characters in length.';
-$lang['exact_length']		= 'The {field} field must be exactly {param} characters in length.';
-$lang['alpha']				= 'The {field} field may only contain alphabetical characters.';
-$lang['alpha_numeric']		= 'The {field} field may only contain alpha-numeric characters.';
-$lang['alpha_dash']			= 'The {field} field may only contain alpha-numeric characters, underscores, and dashes.';
-$lang['numeric']			= 'The {field} field must contain only numbers.';
-$lang['is_numeric']			= 'The {field} field must contain only numeric characters.';
-$lang['integer']			= 'The {field} field must contain an integer.';
-$lang['regex_match']		= 'The {field} field is not in the correct format.';
-$lang['matches']			= 'The {field} field does not match the {param} field.';
-$lang['is_unique'] 			= 'The {field} field must contain a unique value.';
-$lang['is_natural']			= 'The {field} field must contain an ordinary number greater or equal to zero.';
-$lang['is_natural_no_zero']	= 'The {field} field must contain an ordinary number greater than zero.';
-$lang['decimal']			= 'The {field} field must contain a decimal number.';
-$lang['less_than']			= 'The {field} field must contain a number less than {param}.';
-$lang['greater_than']		= 'The {field} field must contain a number greater than {param}.';
-
+$lang['required']				= 'The {field} field is required.';
+$lang['isset']					= 'The {field} field must have a value.';
+$lang['valid_email']			= 'The {field} field must contain a valid email address.';
+$lang['valid_emails']			= 'The {field} field must contain all valid email addresses.';
+$lang['valid_url']				= 'The {field} field must contain a valid URL.';
+$lang['valid_ip']				= 'The {field} field must contain a valid IP.';
+$lang['min_length']				= 'The {field} field must be at least {param} characters in length.';
+$lang['max_length']				= 'The {field} field cannot exceed {param} characters in length.';
+$lang['exact_length']			= 'The {field} field must be exactly {param} characters in length.';
+$lang['alpha']					= 'The {field} field may only contain alphabetical characters.';
+$lang['alpha_numeric']			= 'The {field} field may only contain alpha-numeric characters.';
+$lang['alpha_dash']				= 'The {field} field may only contain alpha-numeric characters, underscores, and dashes.';
+$lang['numeric']				= 'The {field} field must contain only numbers.';
+$lang['is_numeric']				= 'The {field} field must contain only numeric characters.';
+$lang['integer']				= 'The {field} field must contain an integer.';
+$lang['regex_match']			= 'The {field} field is not in the correct format.';
+$lang['matches']				= 'The {field} field does not match The {field} field.';
+$lang['differs']				= 'The {field} field must differ from The {field} field.';
+$lang['is_unique'] 				= 'The {field} field must contain a unique value.';
+$lang['is_natural']				= 'The {field} field must only contain digits.';
+$lang['is_natural_no_zero']		= 'The {field} field must only contain digits and must be greater than zero.';
+$lang['decimal']				= 'The {field} field must contain a decimal number.';
+$lang['less_than']				= 'The {field} field must contain a number less than {param}.';
+$lang['less_than_equal_to']		= 'The {field} field must contain a number less than or equal to {param}.';
+$lang['greater_than']			= 'The {field} field must contain a number greater than {param}.';
+$lang['greater_than_equal_to']	= 'The {field} field must contain a number greater than or equal to {param}.';
 
 /* End of file form_validation_lang.php */
-/* Location: ./system/language/english/form_validation_lang.php */
+/* Location: ./system/language/english/form_validation_lang.php */
\ No newline at end of file