Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New user Registration, Confirmation and session management workflow #160

Merged
merged 8 commits into from
Dec 14, 2016
Merged

New user Registration, Confirmation and session management workflow #160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7611364
Alter Users schema to match the latest requirements
danguita Dec 14, 2016
b3c5f47
Implement new user Registration, Session and Password recovery workflow
danguita Dec 14, 2016
c629f65
Catalan translations
Dec 14, 2016
8587e7f
Merge branch 'master' into 126-user-sign-up-workflow
Dec 14, 2016
af72602
Adjust year of birth range
Dec 14, 2016
2dc12e4
Get rid of duplicated login route
Dec 14, 2016
50084ad
Fix gender attribute translation
Dec 14, 2016
b445168
Fix confirmation year in test
Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix gender attribute translation
  • Loading branch information
Fernando Blat committed Dec 14, 2016
commit 50084adf585de999e1d040aac3f8aa8503063d68
2 changes: 1 addition & 1 deletion app/views/user/confirmations/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<div class="options options_cont">

<%= f.label :gender %>
<%= f.label :gender, t(".your_gender_is") %>
<i class="fa fa-question-circle tipsit" title="<%= t(".hints.gender") %>"></i>

<div class="pure-g">
Expand Down
2 changes: 1 addition & 1 deletion config/locales/user/models/ca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ ca:
password: La teva contraseña
password_confirmation: La teva contraseña, de nou
year_of_birth: Any de naiximent
gender: Eres...
gender: Genre
2 changes: 1 addition & 1 deletion config/locales/user/models/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ en:
password: Your password
password_confirmation: Your password, one more time
year_of_birth: Year of birth
gender: You are a...
gender: Gender
2 changes: 1 addition & 1 deletion config/locales/user/models/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ es:
password: Tu contraseña
password_confirmation: Tu contraseña, otra vez
year_of_birth: Año de nacimiento
gender: Eres...
gender: Género
1 change: 1 addition & 0 deletions config/locales/user/views/confirmations/ca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ ca:
male: Home
female: Dona
submit: Guardar
your_gender_is: "Eres..."
1 change: 1 addition & 0 deletions config/locales/user/views/confirmations/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ en:
male: Male
female: Female
submit: Save
your_gender_is: "You are..."
1 change: 1 addition & 0 deletions config/locales/user/views/confirmations/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ es:
male: Hombre
female: Mujer
submit: Guardar
your_gender_is: "Eres..."