Merge branch 'microweb10-registration_username_ajax_validation'

This commit is contained in:
rgarcia
2016-01-21 18:02:42 +01:00
9 changed files with 107 additions and 3 deletions

View File

@@ -116,6 +116,8 @@ en:
terms: By registering you accept the %{terms}
terms_link: terms and conditions of use
title: Register
username_is_available: "Username available"
username_is_not_available: "Username already in use"
username_label: Username
username_note: Name that appears next to your posts
success:

View File

@@ -116,8 +116,10 @@ es:
terms: Al registrarte aceptas las %{terms}
terms_link: condiciones de uso
title: Registrarse
username_is_available: "Nombre de usuario disponible"
username_is_not_available: "Nombre de usuario ya existente"
username_label: Nombre de usuario
username_note: Nombre que aparecerá en tus publicaciones
username_note: Nombre que aparecerá en tus publicacionesß
success:
back_to_index: Entendido, volver a la página principal
instructions_1_html: Por favor <b>revisa tu correo electrónico</b> - te hemos enviado un <b>enlace para confirmar tu cuenta</b>.

View File

@@ -19,7 +19,7 @@ Rails.application.routes.draw do
devise_scope :user do
patch '/user/confirmation', to: 'users/confirmations#update', as: :update_user_confirmation
get '/user/registrations/check_username', to: 'users/registrations#check_username'
get 'users/sign_up/success', to: 'users/registrations#success'
get 'users/registrations/delete_form', to: 'users/registrations#delete_form'
delete 'users/registrations', to: 'users/registrations#delete'