diff options
author | frankiebee <frankie.diamond@gmail.com> | 2018-03-15 23:07:16 +0800 |
---|---|---|
committer | frankiebee <frankie.diamond@gmail.com> | 2018-03-15 23:07:16 +0800 |
commit | cd721f52cb29e5c43e69d7c6dfbf200c971973d8 (patch) | |
tree | bc8078c76dd76eb3de9310b578239b4ccb98ab53 /ui | |
parent | a087546148e5ecd10517cbbb3789d6c918e7f326 (diff) | |
parent | e2efc91aee64072c408ab509219dcbfb389c7609 (diff) | |
download | tangerine-wallet-browser-cd721f52cb29e5c43e69d7c6dfbf200c971973d8.tar tangerine-wallet-browser-cd721f52cb29e5c43e69d7c6dfbf200c971973d8.tar.gz tangerine-wallet-browser-cd721f52cb29e5c43e69d7c6dfbf200c971973d8.tar.bz2 tangerine-wallet-browser-cd721f52cb29e5c43e69d7c6dfbf200c971973d8.tar.lz tangerine-wallet-browser-cd721f52cb29e5c43e69d7c6dfbf200c971973d8.tar.xz tangerine-wallet-browser-cd721f52cb29e5c43e69d7c6dfbf200c971973d8.tar.zst tangerine-wallet-browser-cd721f52cb29e5c43e69d7c6dfbf200c971973d8.zip |
Merge branch 'master' into retry-tx-refractor
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/accounts/new-account/create-form.js | 2 | ||||
-rw-r--r-- | ui/app/components/shapeshift-form.js | 2 | ||||
-rw-r--r-- | ui/app/keychains/hd/restore-vault.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/accounts/new-account/create-form.js b/ui/app/accounts/new-account/create-form.js index eb34f7a2f..8ef842a2a 100644 --- a/ui/app/accounts/new-account/create-form.js +++ b/ui/app/accounts/new-account/create-form.js @@ -14,7 +14,7 @@ class NewAccountCreateForm extends Component { this.state = { newAccountName: '', - defaultAccountName: t('newAccountNumberName', newAccountNumber), + defaultAccountName: t('newAccountNumberName', [newAccountNumber]), } } diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index f75d6176e..3f8c17932 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -143,7 +143,7 @@ ShapeshiftForm.prototype.renderQrCode = function () { return h('div.shapeshift-form', {}, [ h('div.shapeshift-form__deposit-instruction', [ - t('depositCoin', depositCoin.toUpperCase()), + t('depositCoin', [depositCoin.toUpperCase()]), ]), h('div', depositAddress), diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js index 685094854..cb4088f61 100644 --- a/ui/app/keychains/hd/restore-vault.js +++ b/ui/app/keychains/hd/restore-vault.js @@ -147,7 +147,7 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () { // true if the string has more than a space between words. if (seed.split(' ').length > 1) { - this.warning = 'there can only a space between words' + this.warning = 'there can only be a space between words' this.props.dispatch(actions.displayWarning(this.warning)) return } |