Updated Kohana to r4724

2 files changed, 24 insertions, 2 deletions

diff --git a/system/messages/core.php b/system/messages/core.php
index 4bf6ee8c..64f897e8 100644
--- a/system/messages/core.php
+++ b/system/messages/core.php
@@ -8,7 +8,6 @@ $messages = array
 		E_PAGE_NOT_FOUND     => __('Page Not Found'),    // __('The requested page was not found. It may have moved, been deleted, or archived.'),
 		E_DATABASE_ERROR     => __('Database Error'),    // __('A database error occurred while performing the requested procedure. Please review the database error below for more information.'),
 		E_RECOVERABLE_ERROR  => __('Recoverable Error'), // __('An error was detected which prevented the loading of this page. If this problem persists, please contact the website administrator.'),
-
 		E_ERROR              => __('Fatal Error'),
 		E_COMPILE_ERROR      => __('Fatal Error'),
 		E_CORE_ERROR         => __('Fatal Error'),
@@ -29,4 +28,10 @@ $messages = array
 	'driver'             => 'driver',
 	'model'              => 'model',
 	'view'               => 'view',
-);
\ No newline at end of file
+);
+
+// E_DEPRECATED is only defined in PHP >= 5.3.0
+if (defined('E_DEPRECATED'))
+{
+	$messages['errors'][E_DEPRECATED] = __('Deprecated');
+}
\ No newline at end of file
diff --git a/system/messages/validation/default.php b/system/messages/validation/default.php
new file mode 100644
index 00000000..2c59fa06
--- /dev/null
+++ b/system/messages/validation/default.php
@@ -0,0 +1,17 @@
+<?php defined('SYSPATH') or die('No direct script access.');

+

+$messages = array(

+	'required'      => 'The :field field is required',

+	'length'        => 'The :field field must be between :param1 and :param2 characters long',

+	'depends_on'    => 'The :field field requires the :param1 field',

+	'matches'       => 'The :field field must be the same as :param1',

+	'email'         => 'The :field field must be a valid email address',

+	'decimal'       => 'The :field field must be a decimal with :param1 places',

+	'digit'         => 'The :field field must be a digit',

+	'in_array'      => 'The :field field must be one of the available options',

+	'alpha_numeric' => 'The :field field must consist only of alphabetical or numeric characters',

+	'alpha_dash '   => 'The :field field must consist only of alphabetical, numeric, underscore and dash characters',

+	'numeric '      => 'The :field field must be a valid number',

+	'url'           => 'The :field field must be a valid url',

+	'phone'         => 'The :field field must be a valid phone number',

+);