From af0f6b1e655bba9fd42317b0332d7a314d673228 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 30 Mar 2017 15:07:09 -0300 Subject: [#932] Combines button label for account recovery forms with @deniscostadsc --- web-ui/app/locales/en_US/translation.json | 10 ++++------ web-ui/app/locales/pt_BR/translation.json | 12 +++++------- .../admin_recovery_code_form/admin_recovery_code_form.js | 2 +- .../admin_recovery_code_form.spec.js | 2 +- .../account_recovery/new_password_form/new_password_form.js | 2 +- .../new_password_form/new_password_form.spec.js | 2 +- .../user_recovery_code_form/user_recovery_code_form.js | 2 +- .../user_recovery_code_form/user_recovery_code_form.spec.js | 2 +- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/web-ui/app/locales/en_US/translation.json b/web-ui/app/locales/en_US/translation.json index 8116aba4..8607f590 100644 --- a/web-ui/app/locales/en_US/translation.json +++ b/web-ui/app/locales/en_US/translation.json @@ -89,23 +89,21 @@ "tip1": "The safest way to do this is in person.", "tip2": "You can call or text if you need to.", "tip3": "Don't ever ask for it via email.", - "input-label": "type here admin's backup code", - "button": "Next" + "input-label": "type here admin's backup code" }, "user-form": { "image-description": "User Recovery Code - Step 2 of 4", "title": "Remember your backup account?", "description": "When you created your account you received a message - it was sent by team@pixelated-project.org. You'll need the recovery code that is in it.", - "input-label": "type here your backup code", - "button": "Next" + "input-label": "type here your backup code" }, "new-password-form": { "image-description": "New Password - Step 3 of 4", "title": "Now, create a new password", "input-label1": "create new password", - "input-label2": "confirm your new password", - "button": "Next" + "input-label2": "confirm your new password" }, + "button-next": "Next", "back": "Back to previous step" }, "backup-account": { diff --git a/web-ui/app/locales/pt_BR/translation.json b/web-ui/app/locales/pt_BR/translation.json index d05fa05e..c4b3d9e7 100644 --- a/web-ui/app/locales/pt_BR/translation.json +++ b/web-ui/app/locales/pt_BR/translation.json @@ -88,24 +88,22 @@ "title": "Contate o administrador da sua conta e peça seu código", "tip1": "A maneira mais segura é fazer isso pessoalmente.", "tip2": "Você pode ligar ou mandar mensagem de texto se precisar.", - "tip3": "Nunca peça por email.", - "input-label": "digite aqui o código", - "button": "Próximo" + "tip3": "Nunca peça por e-mail.", + "input-label": "digite aqui o código" }, "user-form": { "image-description": "Código de Recuperação do Usuário - Passo 2 de 4", "title": "Lembra do seu e-mail de recuperação?", "description": "Quando você criou uma conta você recebeu uma mensagem do team@pixelated-project.org. Você precisará do código que está neste e-mail.", - "input-label": "digite aqui o código", - "button": "Próximo" + "input-label": "digite aqui o código" }, "new-password-form": { "image-description": "Nova Senha - Passo 3 de 4", "title": "Agora, crie uma nova senha", "input-label1": "digite a nova senha", - "input-label2": "confirme a nova senha", - "button": "Próximo" + "input-label2": "confirme a nova senha" }, + "button-next": "Próximo", "back": "Voltar ao passo anterior" }, "backup-account": { diff --git a/web-ui/src/account_recovery/admin_recovery_code_form/admin_recovery_code_form.js b/web-ui/src/account_recovery/admin_recovery_code_form/admin_recovery_code_form.js index 7a82a5d7..5b9da350 100644 --- a/web-ui/src/account_recovery/admin_recovery_code_form/admin_recovery_code_form.js +++ b/web-ui/src/account_recovery/admin_recovery_code_form/admin_recovery_code_form.js @@ -42,7 +42,7 @@ export const AdminRecoveryCodeForm = ({ t, next }) => (
  • {t('account-recovery.admin-form.tip3')}
    • - + ); diff --git a/web-ui/src/account_recovery/admin_recovery_code_form/admin_recovery_code_form.spec.js b/web-ui/src/account_recovery/admin_recovery_code_form/admin_recovery_code_form.spec.js index 85b75652..73c4c1e0 100644 --- a/web-ui/src/account_recovery/admin_recovery_code_form/admin_recovery_code_form.spec.js +++ b/web-ui/src/account_recovery/admin_recovery_code_form/admin_recovery_code_form.spec.js @@ -28,7 +28,7 @@ describe('AdminRecoveryCodeForm', () => { }); it('renders button for next step', () => { - expect(adminRecoveryCodeForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.admin-form.button'); + expect(adminRecoveryCodeForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.button-next'); }); it('submits form to next step', () => { diff --git a/web-ui/src/account_recovery/new_password_form/new_password_form.js b/web-ui/src/account_recovery/new_password_form/new_password_form.js index 94e08997..f1097b0b 100644 --- a/web-ui/src/account_recovery/new_password_form/new_password_form.js +++ b/web-ui/src/account_recovery/new_password_form/new_password_form.js @@ -40,7 +40,7 @@ export const NewPasswordForm = ({ t, previous }) => ( type='password' name='confirm-password' label={t('account-recovery.new-password-form.input-label2')} /> - + ); diff --git a/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js b/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js index ace238be..d2bd350c 100644 --- a/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js +++ b/web-ui/src/account_recovery/new_password_form/new_password_form.spec.js @@ -30,7 +30,7 @@ describe('NewPasswordForm', () => { }); it('renders submit button', () => { - expect(newPasswordForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.new-password-form.button'); + expect(newPasswordForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.button-next'); }); it('returns to previous step on link click', () => { diff --git a/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.js b/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.js index 0df40a6e..a4119885 100644 --- a/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.js +++ b/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.js @@ -41,7 +41,7 @@ export const UserRecoveryCodeForm = ({ t, previous, next }) => (

    {t('account-recovery.user-form.description')}

    - + ); diff --git a/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.spec.js b/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.spec.js index 6ecb22e4..e47f2e6c 100644 --- a/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.spec.js +++ b/web-ui/src/account_recovery/user_recovery_code_form/user_recovery_code_form.spec.js @@ -32,7 +32,7 @@ describe('UserRecoveryCodeForm', () => { }); it('renders submit button', () => { - expect(userRecoveryCodeForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.user-form.button'); + expect(userRecoveryCodeForm.find('SubmitButton').props().buttonText).toEqual('account-recovery.button-next'); }); it('submits form to next step', () => { -- cgit v1.2.3