Merge pull request lynndylanhurley#417 from ponyesteves/master

Change default message for already in use error and added to english …
Jylth · Oct 25, 2015 · d03793b · d03793b
2 parents 4922d90 + 0252300
commit d03793b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/models/devise_token_auth/concerns/user.rb b/app/models/devise_token_auth/concerns/user.rb
@@ -233,7 +233,7 @@ def token_validation_response
   # only validate unique email among users that registered by email
   def unique_email_user
     if provider == 'email' and self.class.where(provider: 'email', email: email).count > 0
-      errors.add(:email, :already_in_use, default: "address is already in use")
+      errors.add(:email, :already_in_use)
     end
   end
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -27,4 +27,6 @@ en:
   errors:
     validate_sign_up_params: "Please submit proper sign up data in request body."
     validate_account_update_params: "Please submit proper account update data in request body."
-    not_email: "is not an email"
+    not_email: "is not an email"
+    message:
+      already_in_use: already in use
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -27,4 +27,6 @@ es:
   errors:
     validate_sign_up_params: "Los datos introducidos en la solicitud de acceso no son válidos."
     validate_account_update_params: "Los datos introducidos en la solicitud de actualización no son válidos."
-    not_email: "no es un correo electrónico"
+    not_email: "no es un correo electrónico"
+    messages:
+      already_in_use: ya ha sido ocupado