better organization of locale file; i18n in more view files

5 files changed, 20 insertions, 21 deletions

diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js
index 9cefcfa77..ca9a29e34 100644
--- a/ui/app/accounts/import/json.js
+++ b/ui/app/accounts/import/json.js
@@ -26,8 +26,8 @@ JsonImportSubview.prototype.render = function () {
   return (
     h('div.new-account-import-form__json', [
 
-      h('p', 'Used by a variety of different clients'),
-      h('a.warning', { href: HELP_LINK, target: '_blank' }, 'File import not working? Click here!'),
+      h('p', t('usedByClients')),
+      h('a.warning', { href: HELP_LINK, target: '_blank' }, t('fileImportFail')),
 
       h(FileInput, {
         readAs: 'text',
@@ -42,7 +42,7 @@ JsonImportSubview.prototype.render = function () {
 
       h('input.new-account-import-form__input-password', {
         type: 'password',
-        placeholder: 'Enter password',
+        placeholder: t('enterPassword'),
         id: 'json-password-box',
         onKeyPress: this.createKeyringOnEnter.bind(this),
       }),
@@ -52,13 +52,13 @@ JsonImportSubview.prototype.render = function () {
         h('button.new-account-create-form__button-cancel', {
           onClick: () => this.props.goHome(),
         }, [
-          'CANCEL',
+          t('cancelCaps'),
         ]),
 
         h('button.new-account-create-form__button-create', {
           onClick: () => this.createNewKeychain.bind(this),
         }, [
-          'IMPORT',
+          t('importCaps'),
         ]),
 
       ]),
@@ -84,7 +84,7 @@ JsonImportSubview.prototype.createNewKeychain = function () {
   const { fileContents } = state
 
   if (!fileContents) {
-    const message = 'You must select a file to import.'
+    const message = t('needImportFile')
     return this.props.dispatch(actions.displayWarning(message))
   }
 
@@ -92,7 +92,7 @@ JsonImportSubview.prototype.createNewKeychain = function () {
   const password = passwordInput.value
 
   if (!password) {
-    const message = 'You must enter a password for the selected file.'
+    const message = t('needImportPassword')
     return this.props.dispatch(actions.displayWarning(message))
   }
 
diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js
index 43afbca87..d8aa1a3d8 100644
--- a/ui/app/accounts/import/private-key.js
+++ b/ui/app/accounts/import/private-key.js
@@ -32,7 +32,7 @@ PrivateKeyImportView.prototype.render = function () {
 
   return (
     h('div.new-account-import-form__private-key', [
-      h('span.new-account-create-form__instruction', 'Paste your private key string here:'),
+      h('span.new-account-create-form__instruction', t('pastePrivateKey')),
 
       h('input.new-account-import-form__input-password', {
         type: 'password',
@@ -45,13 +45,13 @@ PrivateKeyImportView.prototype.render = function () {
         h('button.new-account-create-form__button-cancel', {
           onClick: () => goHome(),
         }, [
-          'CANCEL',
+          t('cancelCaps'),
         ]),
 
         h('button.new-account-create-form__button-create', {
           onClick: () => this.createNewKeychain(),
         }, [
-          'IMPORT',
+          t('importCaps'),
         ]),
 
       ]),
diff --git a/ui/app/accounts/import/seed.js b/ui/app/accounts/import/seed.js
index b4a7c0afa..241200c6f 100644
--- a/ui/app/accounts/import/seed.js
+++ b/ui/app/accounts/import/seed.js
@@ -20,11 +20,10 @@ SeedImportSubview.prototype.render = function () {
       style: {
       },
     }, [
-      `Paste your seed phrase here!`,
+      t('pasteSeed'),
       h('textarea'),
       h('br'),
-      h('button', 'Submit'),
+      h('button', t('submit')),
     ])
   )
 }
-
diff --git a/ui/app/accounts/new-account/create-form.js b/ui/app/accounts/new-account/create-form.js
index 494726ae4..f9faa928c 100644
--- a/ui/app/accounts/new-account/create-form.js
+++ b/ui/app/accounts/new-account/create-form.js
@@ -21,13 +21,13 @@ class NewAccountCreateForm extends Component {
     return h('div.new-account-create-form', [
 
       h('div.new-account-create-form__input-label', {}, [
-        'Account Name',
+        t('accountName'),
       ]),
 
       h('div.new-account-create-form__input-wrapper', {}, [
         h('input.new-account-create-form__input', {
           value: this.state.newAccountName,
-          placeholder: 'E.g. My new account',
+          placeholder: t('sampleAccountName'),
           onChange: event => this.setState({ newAccountName: event.target.value }),
         }, []),
       ]),
@@ -37,13 +37,13 @@ class NewAccountCreateForm extends Component {
         h('button.new-account-create-form__button-cancel', {
           onClick: () => this.props.goHome(),
         }, [
-          'CANCEL',
+          t('cancelCaps'),
         ]),
 
         h('button.new-account-create-form__button-create', {
           onClick: () => this.props.createAccount(newAccountName),
         }, [
-          'CREATE',
+          t('createCaps'),
         ]),
 
       ]),
diff --git a/ui/app/accounts/new-account/index.js b/ui/app/accounts/new-account/index.js
index acf0dc6e4..1ed43ae08 100644
--- a/ui/app/accounts/new-account/index.js
+++ b/ui/app/accounts/new-account/index.js
@@ -42,10 +42,10 @@ AccountDetailsModal.prototype.render = function () {
   const { displayedForm, displayForm } = this.props
 
   return h('div.new-account', {}, [
-    
+
     h('div.new-account__header', [
 
-      h('div.new-account__title', 'New Account'),
+      h('div.new-account__title', t('newAccount')),
 
       h('div.new-account__tabs', [
 
@@ -55,7 +55,7 @@ AccountDetailsModal.prototype.render = function () {
             'new-account__tabs__unselected cursor-pointer': displayedForm !== 'CREATE',
           }),
           onClick: () => displayForm('CREATE'),
-        }, 'Create'),
+        }, t('createDen')),
 
         h('div.new-account__tabs__tab', {
           className: classnames('new-account__tabs__tab', {
@@ -63,7 +63,7 @@ AccountDetailsModal.prototype.render = function () {
             'new-account__tabs__unselected cursor-pointer': displayedForm !== 'IMPORT',
           }),
           onClick: () => displayForm('IMPORT'),
-        }, 'Import'),
+        }, t('import')),
 
       ]),