From ebd5b3adce44a16213e5c1ec763a642899eba908 Mon Sep 17 00:00:00 2001 From: Tayane Fernandes Date: Tue, 7 Feb 2017 15:16:00 -0200 Subject: [#922] Add translation for Portuguese and English --- web-ui/app/js/account_recovery/i18n.js | 2 -- web-ui/app/js/account_recovery/page.js | 16 ++++++++-------- web-ui/app/locales/en_US/translation.json | 11 ++++++++++- web-ui/app/locales/pt_BR/translation.json | 11 ++++++++++- web-ui/test/spec/account_recovery/page.spec.js | 8 ++++---- 5 files changed, 32 insertions(+), 16 deletions(-) diff --git a/web-ui/app/js/account_recovery/i18n.js b/web-ui/app/js/account_recovery/i18n.js index 968f7a6b..9c6ad550 100644 --- a/web-ui/app/js/account_recovery/i18n.js +++ b/web-ui/app/js/account_recovery/i18n.js @@ -31,8 +31,6 @@ i18n .use(detector) .init({ fallbackLng: 'en_US', - ns: ['translation'], - defaultNS: 'translation', backend: { loadPath: 'assets/locales/{{lng}}/{{ns}}.json' } diff --git a/web-ui/app/js/account_recovery/page.js b/web-ui/app/js/account_recovery/page.js index 90cdb54f..a94c2c45 100644 --- a/web-ui/app/js/account_recovery/page.js +++ b/web-ui/app/js/account_recovery/page.js @@ -3,22 +3,22 @@ import { translate } from 'react-i18next' import 'scss/account_recovery/page.scss' -const Page = (props) => ( +export const Page = ({ t }) => (
- Esqueci minha senha! + {t('backup-account.image-description')}/
-

E se você esquecer sua senha?

-

Informe outro e-mail que você usa regularmente. Esse será o seu e-mail de recuperação.

-

Instruções para recuperar sua senha serão enviadas para esse e-mail, guarde com carinho.

+

{t('backup-account.title')}

+

{t('backup-account.paragraph1')}

+

{t('backup-account.paragraph2')}

- +
- +
- Voltar + {t('back-to-inbox')}
diff --git a/web-ui/app/locales/en_US/translation.json b/web-ui/app/locales/en_US/translation.json index 6e2cef80..db018db4 100644 --- a/web-ui/app/locales/en_US/translation.json +++ b/web-ui/app/locales/en_US/translation.json @@ -73,5 +73,14 @@ "trash": "Trash", "all": "All", "tags": "Tags" - } + }, + "backup-account": { + "image-description": "Forgot my password!", + "title": "What if you forget your password?", + "paragraph1": "You will need a backup account. Choose an alternative email address you use regularly.", + "paragraph2": "Instructions to recover your password will be sent to this email address, save it.", + "input-label": "Type your backup account", + "button": "Add Account" + }, + "back-to-inbox": "Back to my inbox" } diff --git a/web-ui/app/locales/pt_BR/translation.json b/web-ui/app/locales/pt_BR/translation.json index d1ab7245..87b2655e 100644 --- a/web-ui/app/locales/pt_BR/translation.json +++ b/web-ui/app/locales/pt_BR/translation.json @@ -73,5 +73,14 @@ "trash": "Lixeira", "all": "Todas", "tags": "Etiquetas" - } + }, + "backup-account": { + "image-description": "Esqueci minha senha!", + "title": "E se você esquecer sua senha?", + "paragraph1": "Informe outro e-mail que você usa regularmente. Esse será o seu e-mail de recuperação.", + "paragraph2": "Instruções para recuperar sua senha serão enviadas para esse e-mail, guarde com carinho.", + "input-label": "Digite seu e-mail de recuperação.", + "button": "Adicionar e-mail" + }, + "back-to-inbox": "Voltar" } diff --git a/web-ui/test/spec/account_recovery/page.spec.js b/web-ui/test/spec/account_recovery/page.spec.js index f550a51e..3e19f244 100644 --- a/web-ui/test/spec/account_recovery/page.spec.js +++ b/web-ui/test/spec/account_recovery/page.spec.js @@ -1,12 +1,12 @@ import {shallow} from 'enzyme' import expect from 'expect' import React from 'react' -import Page from '../../../app/js/account_recovery/page' +import { Page } from '../../../app/js/account_recovery/page' describe('Page', () => { - 'use strict'; it('renders backup email page title', () => { - const page = shallow(); - expect(page.find('h1').text()).toEqual('E se você esquecer sua senha?'); + const mockT = key => key; + const page = shallow(); + expect(page.find('h1').text()).toEqual('backup-account.title'); }); }); -- cgit v1.2.3