diff --git a/src/components/AccountPage/index.js b/src/components/AccountPage/index.js index 7b0f5101..6930a879 100644 --- a/src/components/AccountPage/index.js +++ b/src/components/AccountPage/index.js @@ -107,14 +107,14 @@ class AccountPage extends PureComponent { @@ -180,7 +180,7 @@ class AccountPage extends PureComponent { )} /> - + ) : ( diff --git a/src/components/AdvancedOptions/BitcoinKind.js b/src/components/AdvancedOptions/BitcoinKind.js index 4fb65c40..93de6bfd 100644 --- a/src/components/AdvancedOptions/BitcoinKind.js +++ b/src/components/AdvancedOptions/BitcoinKind.js @@ -19,8 +19,8 @@ export default translate()(({ isRBF, onChangeRBF, t }: Props) => ( @@ -32,7 +32,7 @@ export default translate()(({ isRBF, onChangeRBF, t }: Props) => ( diff --git a/src/components/AdvancedOptions/EthereumKind.js b/src/components/AdvancedOptions/EthereumKind.js index fe2faf83..5126104c 100644 --- a/src/components/AdvancedOptions/EthereumKind.js +++ b/src/components/AdvancedOptions/EthereumKind.js @@ -18,7 +18,7 @@ export default translate()(({ gasLimit, onChangeGasLimit, t }: Props) => ( diff --git a/src/components/AdvancedOptions/RippleKind.js b/src/components/AdvancedOptions/RippleKind.js index 0e4f5499..44b3c3c0 100644 --- a/src/components/AdvancedOptions/RippleKind.js +++ b/src/components/AdvancedOptions/RippleKind.js @@ -18,7 +18,7 @@ export default translate()(({ tag, onChangeTag, t }: Props) => ( diff --git a/src/components/BalanceSummary/BalanceInfos.js b/src/components/BalanceSummary/BalanceInfos.js index bcf29524..fec8e7b6 100644 --- a/src/components/BalanceSummary/BalanceInfos.js +++ b/src/components/BalanceSummary/BalanceInfos.js @@ -47,7 +47,7 @@ export function BalanceSincePercent(props: BalanceSinceProps) { fontSize={7} withIcon /> - {t(`time:since.${since}`)} + {t(`app:time.since.${since}`)} ) } @@ -65,7 +65,7 @@ export function BalanceSinceDiff(props: Props) { val={totalBalance - sinceBalance} withIcon /> - {t(`time:since.${since}`)} + {t(`app:time.since.${since}`)} ) } @@ -97,7 +97,7 @@ function BalanceInfos(props: Props) { return ( - {t('dashboard:totalBalance')} + {t('app:dashboard.totalBalance')} { {accountName} ) : ( - t('currentAddress:label') + t('app:currentAddress') )} diff --git a/src/components/DashboardPage/AccountsOrder.js b/src/components/DashboardPage/AccountsOrder.js index a28f7063..0e2e20e0 100644 --- a/src/components/DashboardPage/AccountsOrder.js +++ b/src/components/DashboardPage/AccountsOrder.js @@ -154,11 +154,11 @@ class AccountsOrder extends Component { return [ { key: 'name', - label: t('accountsOrder:name'), + label: t('app:dashboard.accountsOrder.name'), }, { key: 'balance', - label: t('accountsOrder:balance'), + label: t('app:dashboard.accountsOrder.balance'), }, ].map(item => ({ ...item, @@ -203,7 +203,7 @@ class AccountsOrder extends Component { value={sortItems.find(item => item.key === orderAccounts)} > - {t('common:sortBy')} + {t('app:common.sortBy')} { fontSize={4} horizontal > - {t(`accountsOrder:${this.getCurrentValue() || 'balance'}`)} + + {t(`app:dashboard.accountsOrder.${this.getCurrentValue() || 'balance'}`)} + diff --git a/src/components/DashboardPage/EmptyState.js b/src/components/DashboardPage/EmptyState.js index 6cb66302..0d3726ca 100644 --- a/src/components/DashboardPage/EmptyState.js +++ b/src/components/DashboardPage/EmptyState.js @@ -43,8 +43,8 @@ class EmptyState extends PureComponent { height="157" /> - {t('emptyState:dashboard.title')} - {t('emptyState:dashboard.desc')} + {t('app:emptyState.dashboard.title')} + {t('app:emptyState.dashboard.desc')} diff --git a/src/components/DashboardPage/index.js b/src/components/DashboardPage/index.js index 8ec63080..e77dbccf 100644 --- a/src/components/DashboardPage/index.js +++ b/src/components/DashboardPage/index.js @@ -104,7 +104,7 @@ class DashboardPage extends PureComponent { {t(timeFrame)} - {t('dashboard:summary', { count: totalAccounts })} + {t('app:dashboard.summary', { count: totalAccounts })} @@ -136,7 +136,7 @@ class DashboardPage extends PureComponent { - {t('sidebar:accounts')} + {t('app:sidebar.accounts')} @@ -170,7 +170,7 @@ class DashboardPage extends PureComponent { )} diff --git a/src/components/DeviceConnect/index.js b/src/components/DeviceConnect/index.js index fc6a6af3..4ef5f9af 100644 --- a/src/components/DeviceConnect/index.js +++ b/src/components/DeviceConnect/index.js @@ -220,7 +220,7 @@ class DeviceConnect extends PureComponent { {hasMultipleDevices && ( - {t('deviceConnect:step1.choose', { count: devices.length })} + {t('app:deviceConnect.step1.choose', { count: devices.length })} {devices.map(d => { diff --git a/src/components/ExchangePage/ExchangeCard.js b/src/components/ExchangePage/ExchangeCard.js index 7a6fdeaa..8e5a7fba 100644 --- a/src/components/ExchangePage/ExchangeCard.js +++ b/src/components/ExchangePage/ExchangeCard.js @@ -30,7 +30,7 @@ export default function ExchangeCard({ t, card }: { t: T, card: CardType }) { {desc} - {t('exchange:visitWebsite')} + {t('app:exchange.visitWebsite')} diff --git a/src/components/ExchangePage/index.js b/src/components/ExchangePage/index.js index 5aeb0afc..d550003c 100644 --- a/src/components/ExchangePage/index.js +++ b/src/components/ExchangePage/index.js @@ -40,7 +40,7 @@ class ExchangePage extends PureComponent { return ( - {t('exchange:title')} + {t('app:exchange.title')} {cards.map(card => )} diff --git a/src/components/ExportLogsBtn.js b/src/components/ExportLogsBtn.js index 71276c49..f79c0ef7 100644 --- a/src/components/ExportLogsBtn.js +++ b/src/components/ExportLogsBtn.js @@ -51,7 +51,7 @@ class ExportLogsBtn extends Component<{ const { t } = this.props return ( ) } diff --git a/src/components/FeesField/GenericContainer.js b/src/components/FeesField/GenericContainer.js index f0e76a8a..7ee48b13 100644 --- a/src/components/FeesField/GenericContainer.js +++ b/src/components/FeesField/GenericContainer.js @@ -11,7 +11,7 @@ export default translate()( ({ help, children, t }: { help: string, children: React$Node, t: * }) => ( diff --git a/src/components/GenuineCheckModal/index.js b/src/components/GenuineCheckModal/index.js index 8ede689b..b055606e 100644 --- a/src/components/GenuineCheckModal/index.js +++ b/src/components/GenuineCheckModal/index.js @@ -36,7 +36,7 @@ class GenuineCheck extends PureComponent { return ( - {t('genuinecheck:modal.title')} + {t('app:genuinecheck.modal.title')} { (this._input = input)} onBlur={this.handleBlur} onFocus={this.handleFocus} diff --git a/src/components/IsUnlocked.js b/src/components/IsUnlocked.js index 562898b9..136b1066 100644 --- a/src/components/IsUnlocked.js +++ b/src/components/IsUnlocked.js @@ -127,20 +127,20 @@ class IsUnlocked extends Component {
- {t('common:lockScreen.title')} + {t('app:common.lockScreen.title')} - {t('common:lockScreen.subTitle')} + {t('app:common.lockScreen.subTitle')}
- {t('common:lockScreen.description')} + {t('app:common.lockScreen.description')}
diff --git a/src/components/MainSideBar/index.js b/src/components/MainSideBar/index.js index b425f7e8..b8a0688d 100644 --- a/src/components/MainSideBar/index.js +++ b/src/components/MainSideBar/index.js @@ -77,7 +77,7 @@ class MainSideBar extends PureComponent { const addAccountButton = ( ) @@ -86,9 +86,9 @@ class MainSideBar extends PureComponent { - + { hasNotif={updateStatus === 'downloaded'} /> { {accounts.map(account => ( { - {t('manager:allApps')} + {t('app:manager.allApps')} ( - {t('manager:apps.help')} + {t('app:manager.apps.help')} )} > diff --git a/src/components/ManagerPage/FinalFirmwareUpdate.js b/src/components/ManagerPage/FinalFirmwareUpdate.js index defaac39..0cec51f2 100644 --- a/src/components/ManagerPage/FinalFirmwareUpdate.js +++ b/src/components/ManagerPage/FinalFirmwareUpdate.js @@ -41,7 +41,7 @@ class FirmwareUpdate extends PureComponent { return ( - {t('manager:firmwareUpdate')} + {t('app:manager.firmwareUpdate')} diff --git a/src/components/ManagerPage/ManagerApp.js b/src/components/ManagerPage/ManagerApp.js index 8322814c..84735592 100644 --- a/src/components/ManagerPage/ManagerApp.js +++ b/src/components/ManagerPage/ManagerApp.js @@ -65,7 +65,7 @@ function ManagerApp(props: Props) { + ) diff --git a/src/components/ManagerPage/UpdateFirmwareButton.js b/src/components/ManagerPage/UpdateFirmwareButton.js index 87d9352f..25bde360 100644 --- a/src/components/ManagerPage/UpdateFirmwareButton.js +++ b/src/components/ManagerPage/UpdateFirmwareButton.js @@ -22,10 +22,10 @@ const UpdateFirmwareButton = ({ t, firmware, installFirmware }: Props) => firmware ? ( - {t('manager:latestFirmware', { version: firmware.name })} + {t('app:manager.latestFirmware', { version: firmware.name })} ) : null diff --git a/src/components/ManagerPage/Workflow.js b/src/components/ManagerPage/Workflow.js index ce649a8d..b44a12c6 100644 --- a/src/components/ManagerPage/Workflow.js +++ b/src/components/ManagerPage/Workflow.js @@ -156,10 +156,10 @@ class Workflow extends PureComponent { color="black" style={{ marginBottom: 10 }} > - {t('manager:plugYourDevice:title')} + {t('app:manager.plugYourDevice:title')} - {t('manager:plugYourDevice:desc')} + {t('app:manager.plugYourDevice:desc')} diff --git a/src/components/ManagerPage/index.js b/src/components/ManagerPage/index.js index 8a22b980..df97c45c 100644 --- a/src/components/ManagerPage/index.js +++ b/src/components/ManagerPage/index.js @@ -40,10 +40,10 @@ class ManagerPage extends PureComponent { - {t('manager:title')} + {t('app:manager.title')} - {t('manager:subtitle')} + {t('app:manager.subtitle')} diff --git a/src/components/Onboarding/OnboardingFooter.js b/src/components/Onboarding/OnboardingFooter.js index bab707fd..c04eb55f 100644 --- a/src/components/Onboarding/OnboardingFooter.js +++ b/src/components/Onboarding/OnboardingFooter.js @@ -35,10 +35,10 @@ const OnboardingFooter = ({ }: Props) => ( ) diff --git a/src/components/Onboarding/steps/GenuineCheck.js b/src/components/Onboarding/steps/GenuineCheck.js index 0cfe4dec..f4452c20 100644 --- a/src/components/Onboarding/steps/GenuineCheck.js +++ b/src/components/Onboarding/steps/GenuineCheck.js @@ -49,12 +49,12 @@ class GenuineCheck extends PureComponent { const { t } = this.props return [ { - label: t('common:yes'), + label: t('app:common.yes'), key: 'yes', pass: true, }, { - label: t('common:no'), + label: t('app:common.no'), key: 'no', pass: false, }, @@ -254,7 +254,7 @@ export function GenuineCheckFail({ redoGenuineCheck() }} > - {t('common:back')} + {t('app:common.back')} diff --git a/src/components/OperationsList/DateCell.js b/src/components/OperationsList/DateCell.js index fad5efa6..c15f8d50 100644 --- a/src/components/OperationsList/DateCell.js +++ b/src/components/OperationsList/DateCell.js @@ -29,7 +29,7 @@ class DateCell extends PureComponent { return ( - {t(`operationsList:${operation.type}`)} + {t(`app:operation.type.${operation.type}`)} diff --git a/src/components/OperationsList/index.js b/src/components/OperationsList/index.js index 80497d5c..d1cadcc9 100644 --- a/src/components/OperationsList/index.js +++ b/src/components/OperationsList/index.js @@ -139,7 +139,7 @@ export class OperationsList extends PureComponent { ))} {!groupedOperations.completed ? ( - {t('operationsList:showMore')} + {t('app:common.showMore')} ) : ( diff --git a/src/components/RequestAmount/index.js b/src/components/RequestAmount/index.js index 605676c6..772f81ba 100644 --- a/src/components/RequestAmount/index.js +++ b/src/components/RequestAmount/index.js @@ -170,7 +170,7 @@ export class RequestAmount extends PureComponent { {withMax && ( )} diff --git a/src/components/SelectAccount/index.js b/src/components/SelectAccount/index.js index b041ffd7..50220742 100644 --- a/src/components/SelectAccount/index.js +++ b/src/components/SelectAccount/index.js @@ -66,7 +66,7 @@ const RawSelectAccount = ({ accounts, onChange, value, t, ...props }: Props) => options={options} renderValue={renderOption} renderOption={renderOption} - placeholder={t('common:selectAccount')} + placeholder={t('app:common.selectAccount')} onChange={onChange} /> ) diff --git a/src/components/SelectCurrency/index.js b/src/components/SelectCurrency/index.js index e6ae33a6..3d23dd91 100644 --- a/src/components/SelectCurrency/index.js +++ b/src/components/SelectCurrency/index.js @@ -39,7 +39,7 @@ const SelectCurrency = ({ onChange, value, t, placeholder, currencies, ...props renderOption={renderOption} renderValue={renderOption} options={options} - placeholder={placeholder || t('common:selectCurrency')} + placeholder={placeholder || t('app:common.selectCurrency')} onChange={item => onChange(item ? item.currency : null)} {...props} /> diff --git a/src/components/SettingsPage/DisablePasswordModal.js b/src/components/SettingsPage/DisablePasswordModal.js index 86f87428..906d64eb 100644 --- a/src/components/SettingsPage/DisablePasswordModal.js +++ b/src/components/SettingsPage/DisablePasswordModal.js @@ -71,24 +71,26 @@ class DisablePasswordModal extends PureComponent { render={({ onClose }) => ( - {t('password:disablePassword.title')} + {t('app:password.disablePassword.title')} - {t('password:disablePassword.desc')} + {t('app:password.disablePassword.desc')} {isPasswordEnabled && ( )} @@ -97,7 +99,7 @@ class DisablePasswordModal extends PureComponent { diff --git a/src/components/SettingsPage/PasswordForm.js b/src/components/SettingsPage/PasswordForm.js index 29b3e7cd..ca9e86b3 100644 --- a/src/components/SettingsPage/PasswordForm.js +++ b/src/components/SettingsPage/PasswordForm.js @@ -40,24 +40,24 @@ class PasswordForm extends PureComponent { {isPasswordEnabled && ( )} - + { 0 && - t('password:errorMessageNotMatchingPassword') + t('app:password.errorMessageNotMatchingPassword') } /> diff --git a/src/components/SettingsPage/PasswordModal.js b/src/components/SettingsPage/PasswordModal.js index d3f6c3ed..94d2f0a2 100644 --- a/src/components/SettingsPage/PasswordModal.js +++ b/src/components/SettingsPage/PasswordModal.js @@ -83,20 +83,20 @@ class PasswordModal extends PureComponent { render={({ onClose }) => ( {isPasswordEnabled ? ( - {t('password:changePassword.title')} + {t('app:password.changePassword.title')} ) : ( - {t('password:setPassword.title')} + {t('app:password.setPassword.title')} )} {isPasswordEnabled - ? t('password:changePassword.subTitle') - : t('password:setPassword.subTitle')} + ? t('app:password.changePassword.subTitle') + : t('app:password.setPassword.subTitle')} {isPasswordEnabled - ? t('password:changePassword.desc') - : t('password:setPassword.desc')} + ? t('app:password.changePassword.desc') + : t('app:password.setPassword.desc')} { diff --git a/src/components/SettingsPage/index.js b/src/components/SettingsPage/index.js index 43c5476f..87c40d09 100644 --- a/src/components/SettingsPage/index.js +++ b/src/components/SettingsPage/index.js @@ -52,22 +52,22 @@ class SettingsPage extends PureComponent { this._items = [ { key: 'display', - label: props.t('settings:tabs.display'), + label: props.t('app:settings.tabs.display'), value: p => () => , }, { key: 'currencies', - label: props.t('settings:tabs.currencies'), + label: props.t('app:settings.tabs.currencies'), value: p => () => , }, { key: 'profile', - label: props.t('settings:tabs.profile'), + label: props.t('app:settings.tabs.profile'), value: p => () => , }, { key: 'about', - label: props.t('settings:tabs.about'), + label: props.t('app:settings.tabs.about'), value: p => () => , }, ] @@ -116,7 +116,7 @@ class SettingsPage extends PureComponent { return ( - {t('settings:title')} + {t('app:settings.title')} diff --git a/src/components/SettingsPage/sections/About.js b/src/components/SettingsPage/sections/About.js index 54674256..13e972f2 100644 --- a/src/components/SettingsPage/sections/About.js +++ b/src/components/SettingsPage/sections/About.js @@ -28,28 +28,28 @@ class SectionAbout extends PureComponent {
} - title={t('settings:tabs.about')} + title={t('app:settings.tabs.about')} desc="Lorem ipsum dolor sit amet" /> diff --git a/src/components/SettingsPage/sections/Currencies.js b/src/components/SettingsPage/sections/Currencies.js index 500641db..f0969f69 100644 --- a/src/components/SettingsPage/sections/Currencies.js +++ b/src/components/SettingsPage/sections/Currencies.js @@ -96,7 +96,7 @@ class TabCurrencies extends PureComponent {
} - title={t('settings:tabs.currencies')} + title={t('app:settings.tabs.currencies')} desc="Lorem ipsum dolor sit amet" renderRight={ // TODO this should only be the subset of currencies of the app @@ -127,8 +127,8 @@ class TabCurrencies extends PureComponent { ) : null} {defaults.confirmationsNb ? ( { const { t } = this.props return [ { - label: t('common:eastern'), + label: t('app:common.eastern'), key: 'eastern', }, { - label: t('common:western'), + label: t('app:common.western'), key: 'western', }, ] @@ -145,13 +145,13 @@ class TabProfile extends PureComponent {
} - title={t('settings:tabs.display')} + title={t('app:settings.tabs.display')} desc="Lorem ipsum dolor sit amet" /> { options={languages} /> - + { onChange={this.handleChangeName} renderLeft={} onFocus={e => this.handleFocus(e, 'accountName')} - error={accountNameError && t('account:settings.accountName.error')} + error={accountNameError && t('app:account.settings.accountName.error')} /> - {t('account:settings.unit.title')} - {t('account:settings.unit.desc')} + {t('app:account.settings.unit.title')} + {t('app:account.settings.unit.desc')}