diff --git a/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js index 8175b961..832fdaa8 100644 --- a/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js @@ -17,6 +17,7 @@ import { } from 'config/variables'; import type { Accounts } from 'flowtype'; +import l10nCommonMessages from 'views/common.messages'; import type { Props } from '../common'; import Row from '../Row'; import RowCoin from '../RowCoin'; @@ -133,7 +134,7 @@ const AccountMenu = (props: Props) => { isSelected={urlAccountIndex === account.index} borderTop={account.index === 0} > - + {balance && {balance}} {!balance && } @@ -211,7 +212,7 @@ const AccountMenu = (props: Props) => { - + diff --git a/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.messages.js b/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.messages.js index e3b4ddb9..4e94aa04 100644 --- a/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.messages.js +++ b/src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.messages.js @@ -3,15 +3,6 @@ import { defineMessages } from 'react-intl'; import type { Messages } from 'flowtype/npm/react-intl'; const definedMessages: Messages = defineMessages({ - TR_ACCOUNT_HASH: { - id: 'TR_ACCOUNT_HASH', - defaultMessage: 'Account #{number}', - description: 'Used in auto-generated account label', - }, - TR_LOADING_DOT_DOT_DOT: { - id: 'TR_LOADING_DOT_DOT_DOT', - defaultMessage: 'Loading...', - }, TR_TO_ADD_A_NEW_ACCOUNT_LAST: { id: 'TR_TO_ADD_A_NEW_ACCOUNT_LAST', defaultMessage: 'To add a new account, last account must have some transactions.', diff --git a/src/views/Wallet/views/Account/Send/ethereum/index.js b/src/views/Wallet/views/Account/Send/ethereum/index.js index 58e6c79a..21066967 100644 --- a/src/views/Wallet/views/Account/Send/ethereum/index.js +++ b/src/views/Wallet/views/Account/Send/ethereum/index.js @@ -23,7 +23,7 @@ import PendingTransactions from '../components/PendingTransactions'; import l10nMessages from './index.messages'; -import l10nSendMessages from '../common.messages'; +import l10nSendMessages from '../../common.messages'; import type { Props } from './Container'; // TODO: Decide on a small screen width for the whole app diff --git a/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js b/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js index 4437f807..76834cc1 100644 --- a/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js +++ b/src/views/Wallet/views/Account/Send/ripple/components/AdvancedForm/index.js @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl'; import styled from 'styled-components'; import colors from 'config/colors'; -import l10nSendMessages from 'views/Wallet/views/Account/Send/common.messages'; +import l10nSendMessages from 'views/Wallet/views/Account/common.messages'; import Input from 'components/inputs/Input'; import Tooltip from 'components/Tooltip'; import Icon from 'components/Icon'; diff --git a/src/views/Wallet/views/Account/Send/ripple/index.js b/src/views/Wallet/views/Account/Send/ripple/index.js index 3806cde1..e82ed306 100644 --- a/src/views/Wallet/views/Account/Send/ripple/index.js +++ b/src/views/Wallet/views/Account/Send/ripple/index.js @@ -19,7 +19,7 @@ import PendingTransactions from '../components/PendingTransactions'; import AdvancedForm from './components/AdvancedForm'; import l10nMessages from './index.messages'; -import l10nSendMessages from '../common.messages'; +import l10nSendMessages from '../../common.messages'; import type { Props } from './Container'; diff --git a/src/views/Wallet/views/Account/Summary/common.messages.js b/src/views/Wallet/views/Account/Summary/common.messages.js new file mode 100644 index 00000000..11fc6180 --- /dev/null +++ b/src/views/Wallet/views/Account/Summary/common.messages.js @@ -0,0 +1,36 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_SEE_FULL_TRANSACTION_HISTORY: { + id: 'TR_SEE_FULL_TRANSACTION_HISTORY', + defaultMessage: 'See full transaction history', + }, + TR_TOKENS: { + id: 'TR_TOKENS', + defaultMessage: 'Tokens', + }, + TR_INSERT_TOKEN_NAME: { + id: 'TR_INSERT_TOKEN_NAME', + defaultMessage: 'Insert token name, symbol or address to be able to send it.', + }, + TR_TYPE_IN_A_TOKEN_NAME: { + id: 'TR_TYPE_IN_A_TOKEN_NAME', + defaultMessage: 'Type in a token name or a token address.', + }, + TR_TOKEN_NOT_FOUND: { + id: 'TR_TOKEN_NOT_FOUND', + defaultMessage: 'Token not found', + }, + TR_ALREADY_USED: { + id: 'TR_ALREADY_USED', + defaultMessage: 'Already used', + }, + TR_HISTORY: { + id: 'TR_HISTORY', + defaultMessage: 'History', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/Wallet/views/Account/Summary/components/AddTokenMessage/index.js b/src/views/Wallet/views/Account/Summary/components/AddTokenMessage/index.js index 3c0e06c4..3bddfb13 100644 --- a/src/views/Wallet/views/Account/Summary/components/AddTokenMessage/index.js +++ b/src/views/Wallet/views/Account/Summary/components/AddTokenMessage/index.js @@ -1,9 +1,11 @@ /* @flow */ import styled from 'styled-components'; import React from 'react'; +import { FormattedMessage } from 'react-intl'; import { H2 } from 'components/Heading'; import P from 'components/Paragraph'; +import l10nMessages from './index.messages'; const Wrapper = styled.div` display: flex; @@ -54,8 +56,12 @@ const AddTokenMessage = () => ( -

Add your tokens

- Search for the token or add them manually by pasting token address into search input. +

+ +

+ + + ); export default AddTokenMessage; \ No newline at end of file diff --git a/src/views/Wallet/views/Account/Summary/components/AddTokenMessage/index.messages.js b/src/views/Wallet/views/Account/Summary/components/AddTokenMessage/index.messages.js new file mode 100644 index 00000000..4c937e22 --- /dev/null +++ b/src/views/Wallet/views/Account/Summary/components/AddTokenMessage/index.messages.js @@ -0,0 +1,16 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_ADD_YOUR_TOKENS: { + id: 'TR_ADD_YOUR_TOKENS', + defaultMessage: 'Add your tokens', + }, + TR_SEARCH_FOR_THE_TOKEN: { + id: 'TR_SEARCH_FOR_THE_TOKEN', + defaultMessage: 'Search for the token or add them manually by pasting token address into search input.', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/Wallet/views/Account/Summary/components/Balance/index.js b/src/views/Wallet/views/Account/Summary/components/Balance/index.js index b0974e6d..dafb432a 100644 --- a/src/views/Wallet/views/Account/Summary/components/Balance/index.js +++ b/src/views/Wallet/views/Account/Summary/components/Balance/index.js @@ -1,13 +1,15 @@ /* @flow */ import React, { PureComponent } from 'react'; +import { FormattedMessage } from 'react-intl'; import BigNumber from 'bignumber.js'; import styled from 'styled-components'; import Icon from 'components/Icon'; import colors from 'config/colors'; import ICONS from 'config/icons'; import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; - import type { Network, State as ReducersState } from 'flowtype'; +import l10nMessages from './index.messages'; + type Props = { network: Network, @@ -131,7 +133,7 @@ class AccountBalance extends PureComponent { {!this.state.isHidden && ( - + {fiatRate && ( ${fiat} )} @@ -139,7 +141,7 @@ class AccountBalance extends PureComponent { {fiatRate && ( - + ${fiatRateValue} 1.00 {network.symbol} diff --git a/src/views/Wallet/views/Account/Summary/components/Balance/index.messages.js b/src/views/Wallet/views/Account/Summary/components/Balance/index.messages.js new file mode 100644 index 00000000..b886cdcd --- /dev/null +++ b/src/views/Wallet/views/Account/Summary/components/Balance/index.messages.js @@ -0,0 +1,16 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_BALANCE: { + id: 'TR_BALANCE', + defaultMessage: 'Balance', + }, + TR_RATE: { + id: 'TR_RATE', + defaultMessage: 'Rate', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/Wallet/views/Account/Summary/ethereum/Container.js b/src/views/Wallet/views/Account/Summary/ethereum/Container.js index 18d18175..b2718ea8 100644 --- a/src/views/Wallet/views/Account/Summary/ethereum/Container.js +++ b/src/views/Wallet/views/Account/Summary/ethereum/Container.js @@ -1,6 +1,7 @@ /* @flow */ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; +import { injectIntl } from 'react-intl'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; import * as TokenActions from 'actions/TokenActions'; @@ -8,7 +9,9 @@ import * as TokenActions from 'actions/TokenActions'; import type { State, Dispatch } from 'flowtype'; import Summary from './index'; -type OwnProps = { } +type OwnProps = { + intl: any, +} type StateProps = { selectedAccount: $ElementType, @@ -25,7 +28,7 @@ type DispatchProps = { removeToken: typeof TokenActions.remove, } -export type Props = StateProps & DispatchProps; +export type Props = OwnProps & StateProps & DispatchProps; const mapStateToProps: MapStateToProps = (state: State): StateProps => ({ selectedAccount: state.selectedAccount, @@ -42,4 +45,4 @@ const mapDispatchToProps: MapDispatchToProps removeToken: bindActionCreators(TokenActions.remove, dispatch), }); -export default connect(mapStateToProps, mapDispatchToProps)(Summary); \ No newline at end of file +export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Summary)); \ No newline at end of file diff --git a/src/views/Wallet/views/Account/Summary/ethereum/index.js b/src/views/Wallet/views/Account/Summary/ethereum/index.js index 63f00a5d..4816e550 100644 --- a/src/views/Wallet/views/Account/Summary/ethereum/index.js +++ b/src/views/Wallet/views/Account/Summary/ethereum/index.js @@ -9,11 +9,14 @@ import ICONS from 'config/icons'; import colors from 'config/colors'; import Tooltip from 'components/Tooltip'; import Content from 'views/Wallet/components/Content'; +import { FormattedMessage } from 'react-intl'; +import l10nCommonMessages from 'views/common.messages'; import CoinLogo from 'components/images/CoinLogo'; import * as stateUtils from 'reducers/utils'; import Link from 'components/Link'; import { FONT_WEIGHT, FONT_SIZE } from 'config/variables'; +import l10nSummaryMessages from '../common.messages'; import AccountBalance from '../components/Balance'; import AddedToken from '../components/Token'; import AddTokenMessage from '../components/AddTokenMessage'; @@ -90,9 +93,16 @@ const AccountSummary = (props: Props) => { - Account #{parseInt(account.index, 10) + 1} + + + - See full transaction history + + + { fiat={props.fiat} /> -

Tokens

+

+ +

{ defaultOptions value={null} isMulti={false} - placeholder="Type in a token name or a token address" - loadingMessage={() => 'Loading...'} - noOptionsMessage={() => 'Token not found'} + placeholder={props.intl.formatMessage(l10nSummaryMessages.TR_TYPE_IN_A_TOKEN_NAME)} + loadingMessage={() => props.intl.formatMessage(l10nCommonMessages.TR_LOADING_DOT_DOT_DOT)} + noOptionsMessage={() => props.intl.formatMessage(l10nSummaryMessages.TR_TOKEN_NOT_FOUND)} onChange={(token) => { if (token.name) { const isAdded = tokens.find(t => t.symbol === token.symbol); @@ -134,7 +146,7 @@ const AccountSummary = (props: Props) => { formatOptionLabel={(option) => { const isAdded = tokens.find(t => t.symbol === option.symbol); if (isAdded) { - return `${option.name} (Already added)`; + return `${option.name} (${props.intl.formatMessage(l10nSummaryMessages.TR_ALREADY_USED)})`; } return option.name; }} diff --git a/src/views/Wallet/views/Account/Summary/ripple/index.js b/src/views/Wallet/views/Account/Summary/ripple/index.js index 17b752bb..d445a4eb 100644 --- a/src/views/Wallet/views/Account/Summary/ripple/index.js +++ b/src/views/Wallet/views/Account/Summary/ripple/index.js @@ -3,16 +3,16 @@ import styled from 'styled-components'; import React from 'react'; import { H2 } from 'components/Heading'; import BigNumber from 'bignumber.js'; -import Icon from 'components/Icon'; -import ICONS from 'config/icons'; import colors from 'config/colors'; -import Tooltip from 'components/Tooltip'; import Content from 'views/Wallet/components/Content'; +import { FormattedMessage } from 'react-intl'; +import l10nCommonMessages from 'views/common.messages'; import CoinLogo from 'components/images/CoinLogo'; import * as stateUtils from 'reducers/utils'; import Link from 'components/Link'; import { FONT_WEIGHT, FONT_SIZE } from 'config/variables'; +import l10nSummaryMessages from '../common.messages'; import AccountBalance from './components/Balance'; import type { Props } from './Container'; @@ -30,11 +30,6 @@ const H2Wrapper = styled.div` padding: 20px 0; `; -const StyledTooltip = styled(Tooltip)` - position: relative; - top: 2px; -`; - const AccountName = styled.div` display: flex; justify-content: center; @@ -47,15 +42,6 @@ const AccountTitle = styled.div` color: ${colors.WALLET_TITLE}; `; -const StyledIcon = styled(Icon)` - position: relative; - top: -7px; - - &:hover { - cursor: pointer; - } -`; - const AccountSummary = (props: Props) => { const device = props.wallet.selectedDevice; const { @@ -83,9 +69,18 @@ const AccountSummary = (props: Props) => { - Account #{parseInt(account.index, 10) + 1} + + + - { !account.empty && See full transaction history } + { !account.empty && ( + + + + ) } { /> { TMP_SHOW_HISTORY && ( -

History

- - - +

) } diff --git a/src/views/Wallet/views/Account/Send/common.messages.js b/src/views/Wallet/views/Account/common.messages.js similarity index 100% rename from src/views/Wallet/views/Account/Send/common.messages.js rename to src/views/Wallet/views/Account/common.messages.js diff --git a/src/views/Wallet/views/Acquire/index.js b/src/views/Wallet/views/Acquire/index.js index 4dfd980c..80624531 100644 --- a/src/views/Wallet/views/Acquire/index.js +++ b/src/views/Wallet/views/Acquire/index.js @@ -3,14 +3,17 @@ import React from 'react'; import styled from 'styled-components'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; +import { injectIntl } from 'react-intl'; + import colors from 'config/colors'; import Notification from 'components/Notification'; import * as TrezorConnectActions from 'actions/TrezorConnectActions'; - import type { State, Dispatch } from 'flowtype'; +import l10nMessages from './index.messages'; type Props = { - acquiring: boolean; + intl: any, + acquiring: boolean, acquireDevice: typeof TrezorConnectActions.acquire } @@ -24,15 +27,15 @@ const Wrapper = styled.div` const Acquire = (props: Props) => ( { props.acquireDevice(); }, @@ -43,11 +46,11 @@ const Acquire = (props: Props) => ( ); -export default connect( +export default injectIntl(connect( (state: State) => ({ acquiring: state.connect.acquiringDevice, }), (dispatch: Dispatch) => ({ acquireDevice: bindActionCreators(TrezorConnectActions.acquire, dispatch), }), -)(Acquire); +)(Acquire)); diff --git a/src/views/Wallet/views/Acquire/index.messages.js b/src/views/Wallet/views/Acquire/index.messages.js new file mode 100644 index 00000000..4fde9435 --- /dev/null +++ b/src/views/Wallet/views/Acquire/index.messages.js @@ -0,0 +1,20 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_DEVICE_USED_IN_OTHER: { + id: 'TR_DEVICE_USED_IN_OTHER', + defaultMessage: 'Device is used in other window', + }, + TR_USE_YOUR_DEVICE_IN_THIS_WINDOW: { + id: 'TR_USE_YOUR_DEVICE_IN_THIS_WINDOW', + defaultMessage: 'Do you want to use your device in this window?', + }, + TR_ACQUIRE_DEVICE: { + id: 'TR_ACQUIRE_DEVICE', + defaultMessage: 'Acquire device', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/Wallet/views/Bootloader/index.js b/src/views/Wallet/views/Bootloader/index.js index 2b10dfd9..4f2dde44 100644 --- a/src/views/Wallet/views/Bootloader/index.js +++ b/src/views/Wallet/views/Bootloader/index.js @@ -3,6 +3,9 @@ import styled from 'styled-components'; import { H1 } from 'components/Heading'; import P from 'components/Paragraph'; import { connect } from 'react-redux'; +import { FormattedMessage } from 'react-intl'; + +import l10nMessages from './index.messages'; const Wrapper = styled.div` display: flex; @@ -29,8 +32,8 @@ const StyledH1 = styled(H1)` const Bootloader = () => ( - Your device is in firmware update mode - Please re-connect it + + ); diff --git a/src/views/Wallet/views/Bootloader/index.messages.js b/src/views/Wallet/views/Bootloader/index.messages.js new file mode 100644 index 00000000..f728a9ed --- /dev/null +++ b/src/views/Wallet/views/Bootloader/index.messages.js @@ -0,0 +1,17 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_YOUR_DEVICE_IS_IN_FIRMWARE: { + id: 'TR_YOUR_DEVICE_IS_IN_FIRMWARE', + defaultMessage: 'Your device is in firmware update mode', + }, + TR_PLEASE_RECONNECT_IT: { + id: 'TR_PLEASE_RECONNECT_IT', + defaultMessage: 'Please re-connect it', + description: 'Call to action to re-connect Trezor device', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/Wallet/views/Dashboard/index.js b/src/views/Wallet/views/Dashboard/index.js index 7266057b..e3433086 100644 --- a/src/views/Wallet/views/Dashboard/index.js +++ b/src/views/Wallet/views/Dashboard/index.js @@ -11,7 +11,7 @@ import { H1 } from 'components/Heading'; import Paragraph from 'components/Paragraph'; import { FormattedMessage } from 'react-intl'; -import messages from './index.messages'; +import l10nMessages from './index.messages'; const Wrapper = styled.div` display: flex; @@ -54,8 +54,8 @@ const Dashboard = () => ( -

- +

+ diff --git a/src/views/Wallet/views/Dashboard/index.messages.js b/src/views/Wallet/views/Dashboard/index.messages.js index 0505d977..540e5995 100644 --- a/src/views/Wallet/views/Dashboard/index.messages.js +++ b/src/views/Wallet/views/Dashboard/index.messages.js @@ -3,13 +3,13 @@ import { defineMessages } from 'react-intl'; import type { Messages } from 'flowtype/npm/react-intl'; const definedMessages: Messages = defineMessages({ - title: { - id: 'dashboard.selectyourcoin.title', + TR_PLEASE_SELECT_YOUR: { + id: 'TR_PLEASE_SELECT_YOUR', defaultMessage: 'Please select your coin', description: 'Title of the dashboard component if coin was not selected', }, - body: { - id: 'dashboard.selectyourcoin.body', + TR_YOU_WILL_GAIN_ACCESS: { + id: 'TR_YOU_WILL_GAIN_ACCESS', defaultMessage: 'You will gain access to receiving & sending selected coin', description: 'Content of the dashboard component if coin was not selected', }, diff --git a/src/views/Wallet/views/FirmwareUpdate/index.js b/src/views/Wallet/views/FirmwareUpdate/index.js index f15bcfa4..4a636909 100644 --- a/src/views/Wallet/views/FirmwareUpdate/index.js +++ b/src/views/Wallet/views/FirmwareUpdate/index.js @@ -3,6 +3,7 @@ import React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; +import { FormattedMessage } from 'react-intl'; import styled from 'styled-components'; import { H1 } from 'components/Heading'; @@ -15,12 +16,14 @@ import { FONT_SIZE } from 'config/variables'; import * as deviceUtils from 'utils/device'; import * as RouterActions from 'actions/RouterActions'; +import l10nCommonMessages from 'views/common.messages'; import type { TrezorDevice, State, Dispatch, } from 'flowtype'; +import l10nMessages from './index.messages'; type Props = { device: ?TrezorDevice; @@ -127,13 +130,19 @@ const FirmwareUpdate = (props: Props) => ( -

It’s time to update your firmware

- Please use Bitcoin wallet interface to update your firmware. +

+ +

+ + + - + {deviceUtils.isDeviceAccessible(props.device) && ( - I’ll do that later. + )}
); diff --git a/src/views/Wallet/views/FirmwareUpdate/index.messages.js b/src/views/Wallet/views/FirmwareUpdate/index.messages.js new file mode 100644 index 00000000..4a4dea80 --- /dev/null +++ b/src/views/Wallet/views/FirmwareUpdate/index.messages.js @@ -0,0 +1,20 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_ITS_TIME_TO_UPDATE_FIRMWARE: { + id: 'TR_ITS_TIME_TO_UPDATE_FIRMWARE', + defaultMessage: 'It’s time to update your firmware', + }, + TR_PLEASE_USE_OLD_WALLET: { + id: 'TR_PLEASE_USE_OLD_WALLET', + defaultMessage: 'Please use Bitcoin wallet interface to update your firmware.', + }, + TR_I_WILL_DO_THAT_LATER: { + id: 'TR_I_WILL_DO_THAT_LATER', + defaultMessage: 'I’ll do that later.', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js index 12d1ea60..ffa343a7 100644 --- a/src/views/Wallet/views/Initialize/index.js +++ b/src/views/Wallet/views/Initialize/index.js @@ -4,6 +4,10 @@ import Button from 'components/Button'; import Paragraph from 'components/Paragraph'; import React from 'react'; import { connect } from 'react-redux'; +import { FormattedMessage } from 'react-intl'; + +import l10nCommonMessages from 'views/common.messages'; +import l10nMessages from './index.messages'; const Wrapper = styled.div` display: flex; @@ -28,10 +32,10 @@ const StyledParagraph = styled(Paragraph)` const Initialize = () => ( -

Your device is not initialized

- Please use Bitcoin wallet interface to start initialization process +

+ - +
diff --git a/src/views/Wallet/views/Initialize/index.messages.js b/src/views/Wallet/views/Initialize/index.messages.js new file mode 100644 index 00000000..d12dd3d5 --- /dev/null +++ b/src/views/Wallet/views/Initialize/index.messages.js @@ -0,0 +1,20 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_YOUR_DEVICE_IS_NOT_INITIALIZED: { + id: 'TR_YOUR_DEVICE_IS_NOT_INITIALIZED', + defaultMessage: 'Your device is not initialized', + }, + TR_PLEASE_USE_TO_START_INITIALIZATION: { + id: 'TR_PLEASE_USE_TO_START_INITIALIZATION', + defaultMessage: 'Please use Bitcoin wallet interface to start initialization process', + }, + TR_I_WILL_DO_THAT_LATER: { + id: 'TR_I_WILL_DO_THAT_LATER', + defaultMessage: 'I’ll do that later.', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/Wallet/views/Seedless/index.js b/src/views/Wallet/views/Seedless/index.js index bde5f915..b625afe5 100644 --- a/src/views/Wallet/views/Seedless/index.js +++ b/src/views/Wallet/views/Seedless/index.js @@ -3,6 +3,9 @@ import { H1 } from 'components/Heading'; import Paragraph from 'components/Paragraph'; import React from 'react'; import { connect } from 'react-redux'; +import { FormattedMessage } from 'react-intl'; + +import l10nMessages from './index.messages'; const Wrapper = styled.div` @@ -26,8 +29,8 @@ const StyledParagraph = styled(Paragraph)` const Seedless = () => ( -

Device is in seedless mode

- It's not suitable to use this service. +

+
); diff --git a/src/views/Wallet/views/Seedless/index.messages.js b/src/views/Wallet/views/Seedless/index.messages.js new file mode 100644 index 00000000..aa113dad --- /dev/null +++ b/src/views/Wallet/views/Seedless/index.messages.js @@ -0,0 +1,16 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_DEVICE_IS_INITIALIZED_IN_SEEDLESS_MODE: { + id: 'TR_DEVICE_IS_INITIALIZED_IN_SEEDLESS_MODE', + defaultMessage: 'Device is initialized in seedless mode and therefore not allowed to access wallet', + }, + TR_DEVICE_IS_IN_SEEDLESS: { + id: 'TR_DEVICE_IS_IN_SEEDLESS', + defaultMessage: 'Device is in seedless mode', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/Wallet/views/UnreadableDevice/index.js b/src/views/Wallet/views/UnreadableDevice/index.js index e00e8956..eed6197b 100644 --- a/src/views/Wallet/views/UnreadableDevice/index.js +++ b/src/views/Wallet/views/UnreadableDevice/index.js @@ -3,18 +3,21 @@ import React from 'react'; import styled from 'styled-components'; import Notification from 'components/Notification'; +import { injectIntl } from 'react-intl'; +import l10nMessages from './index.messages'; + const Wrapper = styled.div``; -const UnreadableDevice = () => ( +const UnreadableDevice = ({ intl }: { intl: any }) => ( ); -export default UnreadableDevice; +export default injectIntl(UnreadableDevice); diff --git a/src/views/Wallet/views/UnreadableDevice/index.messages.js b/src/views/Wallet/views/UnreadableDevice/index.messages.js new file mode 100644 index 00000000..88492906 --- /dev/null +++ b/src/views/Wallet/views/UnreadableDevice/index.messages.js @@ -0,0 +1,16 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_UNREADABLE_DEVICE: { + id: 'TR_UNREADABLE_DEVICE', + defaultMessage: 'Unreadable device', + }, + TR_PLEASE_INSTALL_TREZOR_BRIDGE: { + id: 'TR_PLEASE_INSTALL_TREZOR_BRIDGE', + defaultMessage: 'Please install Trezor Bridge', + }, +}); + +export default definedMessages; \ No newline at end of file diff --git a/src/views/common.messages.js b/src/views/common.messages.js index ae263012..2055d3a8 100644 --- a/src/views/common.messages.js +++ b/src/views/common.messages.js @@ -7,6 +7,11 @@ const definedMessages: Messages = defineMessages({ id: 'TR_DEVICE_SETTINGS', defaultMessage: 'Device settings', }, + TR_ACCOUNT_HASH: { + id: 'TR_ACCOUNT_HASH', + defaultMessage: 'Account #{number}', + description: 'Used in auto-generated account label', + }, TR_CLEAR: { id: 'TR_CLEAR', defaultMessage: 'Clear', @@ -21,6 +26,14 @@ const definedMessages: Messages = defineMessages({ defaultMessage: 'Address', description: 'Used as label for receive/send address input', }, + TR_LOADING_DOT_DOT_DOT: { + id: 'TR_LOADING_DOT_DOT_DOT', + defaultMessage: 'Loading...', + }, + TR_TAKE_ME_TO_BITCOIN_WALLET: { + id: 'TR_TAKE_ME_TO_BITCOIN_WALLET', + defaultMessage: 'Take me to the Bitcoin wallet', + }, }); export default definedMessages; \ No newline at end of file