Merge remote branch 'loonies/issue/missing-error-messages' into 3.2/m…

…aster
ogyr · Jul 31, 2012 · a98307e · a98307e
2 parents b48ec62 + e9a3524
commit a98307e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 31 deletions.
diff --git a/messages/login.php b/messages/login.php
@@ -1,14 +1,18 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-// see /system/mesages/validation.php for the defaults for each rule. These can be overridden on a per-field basis.
-return array(
-      'username' => array(
-         'not_empty' => __('username.not_empty'),
-         'invalid'   => __('username.invalid'),
-      ),
-      'password' => array(
-         'not_empty' => __('password.not_empty'),
-         'invalid'   => __('password.invalid'),
-      ),
-);
-
+<?php defined('SYSPATH') or die('No direct script access.');
+
+// see /system/mesages/validation.php for the defaults for each rule. These can be overridden on a per-field basis.
+return array(
+    'username' => array(
+        'not_empty' => __('username.not_empty'),
+        'invalid'   => __('username.invalid'),
+    ),
+    'email' => array(
+        'not_empty' => __('email.not_empty'),
+        'invalid'   => __('email.invalid'),
+    ),
+    'password' => array(
+        'not_empty' => __('password.not_empty'),
+        'invalid'   => __('password.invalid'),
+    ),
+);
+
diff --git a/messages/register/user.php b/messages/register/user.php
@@ -1,17 +1,17 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-// see /system/messages/validation.php for the defaults for each rule. These can be overridden on a per-field basis.
-return array(
-    'username' => array(
-        'unique' => __('username.already.used'),
-    ),
-
-    'email' => array(
-        'email' => __('email.invalid'), // Workaround for Bug Report #3750
-        'unique' => __('email.already.used'),
-    ),
-    'password' => array(
-        'matches'      => __('password.confirm.different'),
-    ),
-);
-
+<?php defined('SYSPATH') or die('No direct script access.');
+
+// see /system/messages/validation.php for the defaults for each rule. These can be overridden on a per-field basis.
+return array(
+    'username' => array(
+        'unique' => __('username.already.used'),
+    ),
+
+    'email' => array(
+        'email' => __('email.invalid'), // Workaround for Bug Report #3750
+        'unique' => __('email.already.used'),
+    ),
+    'password' => array(
+        'matches'      => __('password.confirm.different'),
+    ),
+);
+