From 5f51fa23ea79bd9b89703cb93a5e38a0f0a338bb Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 2 Mar 2017 13:29:32 +0100 Subject: [PATCH 1/4] Extract i18n strings in modals/* (#4706) * DeployContract formatting * PasswordManager i18n * SaveContract i18n * Transfer i18n * Verification i18n * Fix spacing on label --- .../modals/DeployContract/deployContract.js | 23 ++++--- .../modals/PasswordManager/passwordManager.js | 11 ++- js/src/modals/SaveContract/saveContract.js | 42 ++++++++--- js/src/modals/Transfer/Details/details.js | 69 ++++++++++++++++--- js/src/modals/Transfer/transfer.js | 56 ++++++++++++--- js/src/modals/Verification/Done/done.js | 13 +++- .../Verification/GatherData/gatherData.js | 10 ++- .../Verification/QueryCode/queryCode.js | 10 ++- .../SendConfirmation/sendConfirmation.js | 21 +++++- .../Verification/SendRequest/sendRequest.js | 29 ++++++-- js/src/modals/Verification/verification.js | 3 +- js/src/ui/Icons/index.js | 1 + 12 files changed, 230 insertions(+), 58 deletions(-) diff --git a/js/src/modals/DeployContract/deployContract.js b/js/src/modals/DeployContract/deployContract.js index 4e5a9ff85..9337b1430 100644 --- a/js/src/modals/DeployContract/deployContract.js +++ b/js/src/modals/DeployContract/deployContract.js @@ -150,15 +150,20 @@ class DeployContract extends Component { const title = realSteps ? null - : (deployError - ? - : + ) ); const waiting = realSteps @@ -195,9 +200,7 @@ class DeployContract extends Component { } return ( - + ); } diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js index 2f5541bf1..91ac9ebf2 100644 --- a/js/src/modals/PasswordManager/passwordManager.js +++ b/js/src/modals/PasswordManager/passwordManager.js @@ -117,8 +117,15 @@ class PasswordManager extends Component { { address } - Hint - { passwordHint || '-' } + + + diff --git a/js/src/modals/SaveContract/saveContract.js b/js/src/modals/SaveContract/saveContract.js index 242ba1593..7f45b6aa5 100644 --- a/js/src/modals/SaveContract/saveContract.js +++ b/js/src/modals/SaveContract/saveContract.js @@ -15,12 +15,11 @@ // along with Parity. If not, see . import React, { Component, PropTypes } from 'react'; - -import SaveIcon from 'material-ui/svg-icons/content/save'; -import ContentClear from 'material-ui/svg-icons/content/clear'; +import { FormattedMessage } from 'react-intl'; import { Button, Form, Input, Portal } from '~/ui'; import Editor from '~/ui/Editor'; +import { CancelIcon, SaveIcon } from '~/ui/Icons'; import { ERRORS, validateName } from '~/util/validation'; import styles from './saveContract.css'; @@ -46,13 +45,28 @@ export default class SaveContract extends Component { buttons={ this.renderDialogActions() } onClose={ this.onClose } open - title='save contract' + title={ + + } >
+ } + hint={ + + } value={ name } error={ nameError } onChange={ this.onChangeName } @@ -72,9 +86,14 @@ export default class SaveContract extends Component { renderDialogActions () { const cancelBtn = (