Skip to content

LG-10996 Fix Spanish and French translation for Sign In #9429

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

Merged
kevinsmaster5 merged 2 commits into from
Oct 23, 2023
Merged

LG-10996 Fix Spanish and French translation for Sign In #9429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94dd52
Changelog: Bug Fixes, translations, Fixes Spanish and French translat…
kevinsmaster5 Oct 23, 2023
fbd84f2
French sign in translation
kevinsmaster5 Oct 23, 2023
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
4 changes: 2 additions & 2 deletions app/views/devise/sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%= render TabNavigationComponent.new(
label: t('account.login.tab_navigation'),
routes: [
{ text: t('links.next'), path: new_user_session_url },
{ text: t('links.sign_in'), path: new_user_session_url },
{ text: t('links.create_account'), path: sign_up_email_url },
],
class: 'margin-bottom-4',
Expand Down Expand Up @@ -47,7 +47,7 @@
},
},
) %>
<%= f.submit t('links.next'), full_width: true, wide: false %>
<%= f.submit t('links.sign_in'), full_width: true, wide: false %>
<% end %>
<% if @ial && desktop_device? %>
<div class='margin-x-neg-1 margin-top-205'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/sign_up/registrations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<%= render TabNavigationComponent.new(
label: t('account.login.tab_navigation'),
routes: [
{ text: t('links.next'), path: new_user_session_url },
{ text: t('links.sign_in'), path: new_user_session_url },
{ text: t('links.create_account'), path: sign_up_email_path },
],
class: 'margin-bottom-4',
Expand Down
2 changes: 1 addition & 1 deletion config/locales/links/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ en:
go_back: Go back
help: Help
new_tab: '(opens new tab)'
next: Sign in
passwords:
forgot: Forgot your password?
privacy_policy: Privacy & security
resend: Resend
reverify: Please verify your identity again.
sign_in: Sign in
sign_out: Sign out
two_factor_authentication:
send_another_code: Send another code
Expand Down
2 changes: 1 addition & 1 deletion config/locales/links/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ es:
go_back: Regresa
help: Ayuda
new_tab: (abrir nueva pestaña)
next: Siguiente
Copy link
Copy Markdown
Contributor

@aduth aduth Oct 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if we want to include it in scope here, but I discovered that we're referencing these labels in some places in support articles, so I assume we'd want to keep those in sync with the actual implementation. Might be a question to bring back to the team to discuss how we'd want to address this.

Example: https://github.com/18F/identity-site/blob/e6f6ada/content/_help/manage-your-account/change-your-phone-number._es.md#L17

passwords:
forgot: '¿Olvidó su contraseña?'
privacy_policy: Privacidad y seguridad
resend: Reenviar
reverify: Verifique su identidad nuevamente.
sign_in: Iniciar sesión
sign_out: Cerrar sesión
two_factor_authentication:
send_another_code: Enviar otro código
Expand Down
2 changes: 1 addition & 1 deletion config/locales/links/fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ fr:
go_back: Retourner
help: Aide
new_tab: '(ouvre un nouvel onglet)'
next: Suivant
passwords:
forgot: Vous avez oublié votre mot de passe?
privacy_policy: Confidentialité et sécurité
resend: Renvoyer
reverify: Veuillez vérifier votre identité de nouveau.
sign_in: Se connecter
sign_out: Déconnexion
Copy link
Copy Markdown
Contributor

@aduth aduth Oct 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably split this out to a separate ticket, but based on the prior conversation about verb forms of the translation, I think we'd want to revisit "Déconnexion" as well, since this reads to me as a noun.

two_factor_authentication:
send_another_code: Envoyer un autre code
Expand Down
2 changes: 1 addition & 1 deletion spec/features/visitors/password_recovery_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@

fill_in t('account.index.email'), with: @user.email
fill_in t('components.password_toggle.label'), with: 'NewVal!dPassw0rd'
click_button t('links.next')
click_button t('links.sign_in')
fill_in_code_with_last_phone_otp
click_submit_default
click_agree_and_continue
Expand Down
2 changes: 1 addition & 1 deletion spec/support/features/session_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def fill_in_bad_piv_cac_credentials_and_submit
def fill_in_credentials_and_submit(email, password)
fill_in t('account.index.email'), with: email
fill_in t('account.index.password'), with: password
click_button t('links.next')
click_button t('links.sign_in')
end

def continue_as(email = nil, password = VALID_PASSWORD)
Expand Down
2 changes: 1 addition & 1 deletion spec/views/sign_up/registrations/new.html.erb_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
render

expect(rendered).to have_link(
t('links.next'),
t('links.sign_in'),
href: new_user_session_url(request_id: nil),
)
end
Expand Down