Moves the registrations controller to users/registrations

This is necessary because rails gets confused when it has a a “root”
registration_controller and another non-root one. The non-root one uses
the views from the root.
This commit is contained in:
kikito
2015-08-16 23:41:05 +02:00
parent 1f2f318e83
commit de73eac2d0
7 changed files with 114 additions and 113 deletions

View File

@@ -36,29 +36,30 @@ en:
title: "Forgot your password?"
email_label: "Email"
send_submit: "Send me reset password instructions"
registrations:
edit:
edit: "Edit"
email_label: "Email"
waiting_for: "Currently waiting confirmation for:"
leave_blank: "Leave blank if you don't want to change it"
password_label: "New password"
password_confirmation_label: "Confirm new password"
current_password_label: "Current password"
need_current: "We need your current password to confirm your changes"
update_submit: "Update"
back_link: "Back"
new:
title: "Sign up"
first_name_label: "First name"
last_name_label: "Last name"
nickname_label: "Nickname"
use_nickname_label: "Use nickname"
email_label: "Email"
password_label: "Password"
min_length: "(%{min} characters minimum)"
password_confirmation_label: "Confirm password"
submit: "Sign up"
users:
registrations:
edit:
edit: "Edit"
email_label: "Email"
waiting_for: "Currently waiting confirmation for:"
leave_blank: "Leave blank if you don't want to change it"
password_label: "New password"
password_confirmation_label: "Confirm new password"
current_password_label: "Current password"
need_current: "We need your current password to confirm your changes"
update_submit: "Update"
back_link: "Back"
new:
title: "Sign up"
first_name_label: "First name"
last_name_label: "Last name"
nickname_label: "Nickname"
use_nickname_label: "Use nickname"
email_label: "Email"
password_label: "Password"
min_length: "(%{min} characters minimum)"
password_confirmation_label: "Confirm password"
submit: "Sign up"
sessions:
new:
title: "Log in"

View File

@@ -36,29 +36,30 @@ es:
title: "¿Has olvidado tu contraseña?"
email_label: "Email"
send_submit: "Recibir instrucciones para recuperar mi contraseña"
registrations:
edit:
edit: "Editar"
email_label: "Email"
waiting_for: "Esperando confirmación de:"
leave_blank: "Dejar en blanco si no deseas cambiarla"
password_label: "Contraseña nueva"
password_confirmation_label: "Confirmar contraseña nueva"
current_password_label: "Contraseña actual"
need_current: "Necesitamos tu contraseña actual para confirmar los cambios"
update_submit: "Actualizar"
back_link: "Atrás"
new:
title: "Registrarse"
first_name_label: "Nombre"
last_name_label: "Apellidos"
nickname_label: "Pseudónimo"
use_nickname_label: "Usar pseudónimo"
email_label: "Email"
password_label: "Contraseña"
min_length: "(mínimo %{min} caracteres)"
password_confirmation_label: "Confirmar contraseña"
submit: "Registrarse"
users:
registrations:
edit:
edit: "Editar"
email_label: "Email"
waiting_for: "Esperando confirmación de:"
leave_blank: "Dejar en blanco si no deseas cambiarla"
password_label: "Contraseña nueva"
password_confirmation_label: "Confirmar contraseña nueva"
current_password_label: "Contraseña actual"
need_current: "Necesitamos tu contraseña actual para confirmar los cambios"
update_submit: "Actualizar"
back_link: "Atrás"
new:
title: "Registrarse"
first_name_label: "Nombre"
last_name_label: "Apellidos"
nickname_label: "Pseudónimo"
use_nickname_label: "Usar pseudónimo"
email_label: "Email"
password_label: "Contraseña"
min_length: "(mínimo %{min} caracteres)"
password_confirmation_label: "Confirmar contraseña"
submit: "Registrarse"
sessions:
new:
title: "Entrar"

View File

@@ -1,5 +1,5 @@
Rails.application.routes.draw do
devise_for :users, controllers: { registrations: 'registrations' }
devise_for :users, controllers: { registrations: 'users/registrations' }
# The priority is based upon order of creation: first created -> highest priority.
# See how all your routes lay out with "rake routes".