feature: final major round of translation polish

.eslintignore

@@ -1,3 +1,4 @@
 app/flow-typed/*
+app/translations/*
 dist/*
 __tests__/*

__tests__/components/NetworkConfigurationTooltip.test.js

@@ -14,8 +14,10 @@ import {
   EXPLORERS,
   MAIN_NETWORK_DEPRECATED_LABEL,
   MAIN_NETWORK_LABEL,
+  DEFAULT_LANGUAGE,
 } from '../../app/core/constants'
 import NetworkConfigurationTooltip from '../../app/components/NetworkConfigurationTooltip'
+import IntlWrapper from '../../app/components/Root/IntlWrapper'
 
 const { LOADED, LOADING } = progressValues
 
@@ -51,6 +53,7 @@ const initialState = {
       data: {
         theme: THEMES.LIGHT,
         blockExplorer: EXPLORERS.NEO_TRACKER,
+        language: DEFAULT_LANGUAGE,
       },
     },
   },
@@ -63,9 +66,11 @@ const networkConfigTooltipSetup = (
   const store = configureStore([thunk])(state)
   const wrapper = mount(
     <Provider store={store}>
-      <MemoryRouter initialEntries={['/']} keyLength={0}>
-        <NetworkConfigurationTooltip />
-      </MemoryRouter>
+      <IntlWrapper lang="en">
+        <MemoryRouter initialEntries={['/']} keyLength={0}>
+          <NetworkConfigurationTooltip />
+        </MemoryRouter>
+      </IntlWrapper>
     </Provider>,
   )
   return {

__tests__/components/__snapshots__/NetworkSwitch.test.js.snap

@@ -47,7 +47,7 @@ exports[`NetworkSwitch renders without crashing 1`] = `
       "confirmAndSend": "Confirm & Send",
       "confirmRemoveContact": "Please confirm removing contact",
       "confirmation": "Confirmation",
-      "confirmationRecipient": "{transferCount, number} {transferCount, plural, one {Recipient} other {Transfers}}",
+      "confirmationRecipient": "{transferCount, number} {transferCount, plural, one {Recipient} other {Recipients}}",
       "contactName": "Name",
       "contactWalletAddress": "Wallet Address",
       "contactsPageLabel": "Manage Contacts",
@@ -107,6 +107,9 @@ exports[`NetworkSwitch renders without crashing 1`] = `
       "modalActionCancel": "Cancel",
       "modalActionConfirm": "Confirm",
       "modifyDetails": "Modify Details",
+      "networkConfigTooltipAddress": "ADDRESS:",
+      "networkConfigTooltipPublicKey": "PUBLIC KEY:",
+      "networkConfigTooltipUpdateSettings": "Update Settings",
       "networkSettingsAutomatic": "AUTOMATIC",
       "networkSettingsCurrentLabel": "CURRENT NETWORK",
       "networkSettingsExplorerLabel": "BLOCK EXPLORER",
@@ -206,11 +209,11 @@ exports[`NetworkSwitch renders without crashing 1`] = `
       "sidebarTokenSale": "Token Sale",
       "sidebarWallet": "Wallet",
       "splitKeyLabel": "SPLIT KEY",
-      "tokenSaleDiclaimer2": "I understand that submitting NEO or GAS multiple times may result in a loss of funds or a delayed refund depending on the policy of the ICO company.",
-      "tokenSaleDiclaimer5": "I understand that City of Zion (CoZ) is not responsible for my usage of this feature, and I have consulted this software's licenses.",
       "tokenSaleDisclaimer1": "Please read and acknowledge these statements to continue",
+      "tokenSaleDisclaimer2": "I understand that submitting NEO or GAS multiple times may result in a loss of funds or a delayed refund depending on the policy of the ICO company.",
       "tokenSaleDisclaimer3": "I understand that some sales may only accept NEO or GAS, and I have verified which is accepted.",
       "tokenSaleDisclaimer4": "I understand that if I send NEO or GAS to a token sale that has already ended, I will lose my NEO/GAS and will not be refunded.",
+      "tokenSaleDisclaimer5": "I understand that City of Zion (CoZ) is not responsible for my usage of this feature, and I have consulted this software's licenses.",
       "tokenSalePageHeader": "Participate in Token Sale",
       "transactionFeeQuestion": "PRIORITIZE YOUR TRANSACTION WITH A FEE?",
       "transactionId": "Transaction ID:",
@@ -224,6 +227,7 @@ exports[`NetworkSwitch renders without crashing 1`] = `
       "walletCreationWalletPasswordConfirmPlaceholder": "Confirm Password",
       "walletCreationWalletPasswordLabel": "PASSPHRASE",
       "walletCreationWalletPasswordPlaceholder": "Password",
+      "walletImportedHeader": "Wallet Created!",
       "walletManagerNoLocalInfo": "It looks like you have no wallet information saved locally...",
       "walletManagerRemoveWallet": "Remove Wallet",
     }

__tests__/components/__snapshots__/News.test.js.snap

@@ -65,7 +65,7 @@ exports[`News renders without crashing 1`] = `
             "confirmAndSend": "Confirm & Send",
             "confirmRemoveContact": "Please confirm removing contact",
             "confirmation": "Confirmation",
-            "confirmationRecipient": "{transferCount, number} {transferCount, plural, one {Recipient} other {Transfers}}",
+            "confirmationRecipient": "{transferCount, number} {transferCount, plural, one {Recipient} other {Recipients}}",
             "contactName": "Name",
             "contactWalletAddress": "Wallet Address",
             "contactsPageLabel": "Manage Contacts",
@@ -125,6 +125,9 @@ exports[`News renders without crashing 1`] = `
             "modalActionCancel": "Cancel",
             "modalActionConfirm": "Confirm",
             "modifyDetails": "Modify Details",
+            "networkConfigTooltipAddress": "ADDRESS:",
+            "networkConfigTooltipPublicKey": "PUBLIC KEY:",
+            "networkConfigTooltipUpdateSettings": "Update Settings",
             "networkSettingsAutomatic": "AUTOMATIC",
             "networkSettingsCurrentLabel": "CURRENT NETWORK",
             "networkSettingsExplorerLabel": "BLOCK EXPLORER",
@@ -224,11 +227,11 @@ exports[`News renders without crashing 1`] = `
             "sidebarTokenSale": "Token Sale",
             "sidebarWallet": "Wallet",
             "splitKeyLabel": "SPLIT KEY",
-            "tokenSaleDiclaimer2": "I understand that submitting NEO or GAS multiple times may result in a loss of funds or a delayed refund depending on the policy of the ICO company.",
-            "tokenSaleDiclaimer5": "I understand that City of Zion (CoZ) is not responsible for my usage of this feature, and I have consulted this software's licenses.",
             "tokenSaleDisclaimer1": "Please read and acknowledge these statements to continue",
+            "tokenSaleDisclaimer2": "I understand that submitting NEO or GAS multiple times may result in a loss of funds or a delayed refund depending on the policy of the ICO company.",
             "tokenSaleDisclaimer3": "I understand that some sales may only accept NEO or GAS, and I have verified which is accepted.",
             "tokenSaleDisclaimer4": "I understand that if I send NEO or GAS to a token sale that has already ended, I will lose my NEO/GAS and will not be refunded.",
+            "tokenSaleDisclaimer5": "I understand that City of Zion (CoZ) is not responsible for my usage of this feature, and I have consulted this software's licenses.",
             "tokenSalePageHeader": "Participate in Token Sale",
             "transactionFeeQuestion": "PRIORITIZE YOUR TRANSACTION WITH A FEE?",
             "transactionId": "Transaction ID:",
@@ -242,6 +245,7 @@ exports[`News renders without crashing 1`] = `
             "walletCreationWalletPasswordConfirmPlaceholder": "Confirm Password",
             "walletCreationWalletPasswordLabel": "PASSPHRASE",
             "walletCreationWalletPasswordPlaceholder": "Password",
+            "walletImportedHeader": "Wallet Created!",
             "walletManagerNoLocalInfo": "It looks like you have no wallet information saved locally...",
             "walletManagerRemoveWallet": "Remove Wallet",
           }
@@ -685,6 +689,7 @@ exports[`News renders without crashing 1`] = `
                                 </Connect(withData(withProps(HeaderBar)))>
                                 <Panel
                                   className="newsPanel"
+                                  contentClassName="newsPanelContent"
                                   onScroll={[Function]}
                                   renderHeader={null}
                                 >
@@ -693,10 +698,10 @@ exports[`News renders without crashing 1`] = `
                                     onScroll={[Function]}
                                   >
                                     <Content
-                                      className="content"
+                                      className="content newsPanelContent"
                                     >
                                       <div
-                                        className="content content"
+                                        className="content content newsPanelContent"
                                       >
                                         <Loader>
                                           <div

__tests__/components/__snapshots__/Sidebar.test.js.snap

@@ -65,7 +65,7 @@ exports[`Sidebar renders without crashing 1`] = `
             "confirmAndSend": "Confirm & Send",
             "confirmRemoveContact": "Please confirm removing contact",
             "confirmation": "Confirmation",
-            "confirmationRecipient": "{transferCount, number} {transferCount, plural, one {Recipient} other {Transfers}}",
+            "confirmationRecipient": "{transferCount, number} {transferCount, plural, one {Recipient} other {Recipients}}",
             "contactName": "Name",
             "contactWalletAddress": "Wallet Address",
             "contactsPageLabel": "Manage Contacts",
@@ -125,6 +125,9 @@ exports[`Sidebar renders without crashing 1`] = `
             "modalActionCancel": "Cancel",
             "modalActionConfirm": "Confirm",
             "modifyDetails": "Modify Details",
+            "networkConfigTooltipAddress": "ADDRESS:",
+            "networkConfigTooltipPublicKey": "PUBLIC KEY:",
+            "networkConfigTooltipUpdateSettings": "Update Settings",
             "networkSettingsAutomatic": "AUTOMATIC",
             "networkSettingsCurrentLabel": "CURRENT NETWORK",
             "networkSettingsExplorerLabel": "BLOCK EXPLORER",
@@ -224,11 +227,11 @@ exports[`Sidebar renders without crashing 1`] = `
             "sidebarTokenSale": "Token Sale",
             "sidebarWallet": "Wallet",
             "splitKeyLabel": "SPLIT KEY",
-            "tokenSaleDiclaimer2": "I understand that submitting NEO or GAS multiple times may result in a loss of funds or a delayed refund depending on the policy of the ICO company.",
-            "tokenSaleDiclaimer5": "I understand that City of Zion (CoZ) is not responsible for my usage of this feature, and I have consulted this software's licenses.",
             "tokenSaleDisclaimer1": "Please read and acknowledge these statements to continue",
+            "tokenSaleDisclaimer2": "I understand that submitting NEO or GAS multiple times may result in a loss of funds or a delayed refund depending on the policy of the ICO company.",
             "tokenSaleDisclaimer3": "I understand that some sales may only accept NEO or GAS, and I have verified which is accepted.",
             "tokenSaleDisclaimer4": "I understand that if I send NEO or GAS to a token sale that has already ended, I will lose my NEO/GAS and will not be refunded.",
+            "tokenSaleDisclaimer5": "I understand that City of Zion (CoZ) is not responsible for my usage of this feature, and I have consulted this software's licenses.",
             "tokenSalePageHeader": "Participate in Token Sale",
             "transactionFeeQuestion": "PRIORITIZE YOUR TRANSACTION WITH A FEE?",
             "transactionId": "Transaction ID:",
@@ -242,6 +245,7 @@ exports[`Sidebar renders without crashing 1`] = `
             "walletCreationWalletPasswordConfirmPlaceholder": "Confirm Password",
             "walletCreationWalletPasswordLabel": "PASSPHRASE",
             "walletCreationWalletPasswordPlaceholder": "Password",
+            "walletImportedHeader": "Wallet Created!",
             "walletManagerNoLocalInfo": "It looks like you have no wallet information saved locally...",
             "walletManagerRemoveWallet": "Remove Wallet",
           }
@@ -659,9 +663,14 @@ exports[`Sidebar renders without crashing 1`] = `
                                     <Tooltip
                                       distance={-60}
                                       html={
-                                        <Connect(Connect(withData(withProps(Connect(withCall(Connect(withData(Connect(withData(Connect(withData(Connect(withData(Connect(withData(NetworkConfigurationTooltip))))))))))))))))
+                                        <Connect(withData(IntlWrapper))
                                           store={undefined}
-                                        />
+                                        >
+                                          <Connect(Connect(withData(withProps(Connect(withCall(Connect(withData(Connect(withData(Connect(withData(Connect(withData(Connect(withData(injectIntl(NetworkConfigurationTooltip)))))))))))))))))
+                                            store={undefined}
+                                          />
+
+                                        </Connect(withData(IntlWrapper))>
                                       }
                                       interactive={true}
                                       onShow={[Function]}
@@ -683,9 +692,14 @@ exports[`Sidebar renders without crashing 1`] = `
                                         hideDuration={375}
                                         hideOnClick={true}
                                         html={
-                                          <Connect(Connect(withData(withProps(Connect(withCall(Connect(withData(Connect(withData(Connect(withData(Connect(withData(Connect(withData(NetworkConfigurationTooltip))))))))))))))))
+                                          <Connect(withData(IntlWrapper))
                                             store={undefined}
-                                          />
+                                          >
+                                            <Connect(Connect(withData(withProps(Connect(withCall(Connect(withData(Connect(withData(Connect(withData(Connect(withData(Connect(withData(injectIntl(NetworkConfigurationTooltip)))))))))))))))))
+                                              store={undefined}
+                                            />
+
+                                          </Connect(withData(IntlWrapper))>
                                         }
                                         inertia={false}
                                         interactive={true}

app/components/Blockchain/Transaction/Transaction.scss

@@ -69,12 +69,12 @@
 }
 
 .historyButtonPlaceholder {
-  width: 90px;
+  width: 100px;
 }
 
 .confirmationsContainer {
-  max-width: 90px;
-  min-width: 90px;
+  max-width: 100px;
+  min-width: 100px;
   text-align: center;
   font-size: 12px;
   display: flex;
@@ -103,8 +103,8 @@
 }
 
 .transactionHistoryButton {
-  max-width: 90px;
-  min-width: 90px;
+  max-width: 100px;
+  min-width: 100px;
   background: transparent !important;
 
   svg {

app/components/LogoWithTooltipAndBlockHeight/LogoWithTooltipAndBlockHeight.jsx

@@ -7,6 +7,7 @@ import NetworkConfigurationTooltip from '../NetworkConfigurationTooltip'
 import LightLogoWithoutText from '../../assets/images/logo-without-text-black.png'
 import DarkLogoWithoutText from '../../assets/images/logo-without-text.png'
 import styles from '../../containers/App/Sidebar/Sidebar.scss'
+import IntlWrapper from '../Root/IntlWrapper'
 import { LIGHT_NETWORK_CONFIG_TOOLTIP } from '../../themes/Light'
 import { DARK_NETWORK_CONFIG_TOOLTIP } from '../../themes/Dark'
 
@@ -30,7 +31,11 @@ class LogoWithTooltipAndBlockHeight extends React.Component<Props> {
         distance={-60}
         theme="network-settings"
         onShow={() => this.handleOnShow()}
-        html={<NetworkConfigurationTooltip store={store} />}
+        html={
+          <IntlWrapper store={store}>
+            <NetworkConfigurationTooltip store={store} />{' '}
+          </IntlWrapper>
+        }
       >
         <div className={styles.logo} id="neon-logo-container">
           <img src={themeBasedLogo} id="neon-logo" alt="neon-logo" />

app/components/NetworkConfigurationTooltip/NetworkConfigurationTooltip.jsx

@@ -2,6 +2,7 @@
 import React from 'react'
 import classNames from 'classnames'
 import { HashRouter, Link } from 'react-router-dom'
+import { IntlShape } from 'react-intl'
 
 import { ROUTES } from '../../core/constants'
 import SettingsItem from '../Settings/SettingsItem'
@@ -24,13 +25,14 @@ type Props = {
   publicKey: string,
   selectedNode: string,
   explorer: string,
+  intl: IntlShape,
 }
 
 export default class NetworkConfigurationTooltip extends React.Component<
   Props,
 > {
   render() {
-    const { address, publicKey, theme } = this.props
+    const { address, publicKey, theme, intl } = this.props
     return (
       <section
         id="network-config-tooltip"
@@ -44,12 +46,20 @@ export default class NetworkConfigurationTooltip extends React.Component<
         <HashRouter>
           <div className={settingsStyles.innerContainer}>
             <div className={styles.addressInfo}>
-              <span>ADDRESS:</span>
+              <span>
+                {intl.formatMessage({
+                  id: 'networkConfigTooltipAddress',
+                })}
+              </span>
               <div className={styles.addressLink}> {address}</div>
             </div>
             {publicKey && (
               <div className={styles.publicKeyInfo}>
-                <span>PUBLIC KEY:</span>
+                <span>
+                  {intl.formatMessage({
+                    id: 'networkConfigTooltipPublicKey',
+                  })}
+                </span>
                 <div className={styles.publicKey}> {publicKey}</div>
               </div>
             )}
@@ -58,15 +68,17 @@ export default class NetworkConfigurationTooltip extends React.Component<
               to={ROUTES.NODE_SELECT}
               label={this.props.selectedNode || 'AUTOMATIC'}
               renderIcon={() => <NodeSelectIcon />}
-              title="NODE SELECTON"
+              title={intl.formatMessage({
+                id: 'networkSettingsNodeSelectLabel',
+              })}
               tooltip
               noBorderBottom
               onClick={() => undefined}
             />
             <div className={styles.tooltipItemBorder} />
             <SettingsItem
               renderIcon={() => <BlockExplorerIcon />}
-              title="BLOCK EXPLORER"
+              title={intl.formatMessage({ id: 'networkSettingsExplorerLabel' })}
               tooltip
               noBorderBottom
             >
@@ -81,7 +93,7 @@ export default class NetworkConfigurationTooltip extends React.Component<
 
             <SettingsItem
               renderIcon={() => <NeoLogo />}
-              title="CURRENT NETWORK"
+              title={intl.formatMessage({ id: 'networkSettingsCurrentLabel' })}
               tooltip
               noBorderBottom
             >
@@ -100,7 +112,9 @@ export default class NetworkConfigurationTooltip extends React.Component<
                   shouldCenterButtonLabelText
                   renderIcon={() => <CogIcon />}
                 >
-                  Update Settings
+                  {intl.formatMessage({
+                    id: 'networkConfigTooltipUpdateSettings',
+                  })}
                 </Button>
               </Link>
             </div>

app/components/NetworkConfigurationTooltip/index.js

@@ -3,6 +3,7 @@ import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import { compose } from 'recompose'
 import { withCall, withData } from 'spunky'
+import { injectIntl } from 'react-intl'
 
 import NetworkConfigurationTooltip from './NetworkConfigurationTooltip'
 import withExplorerData from '../../hocs/withExplorerData'
@@ -51,4 +52,5 @@ export default compose(
   withExplorerData(),
   withAuthData(),
   withThemeData(),
+  injectIntl,
 )(NetworkConfigurationTooltip)

app/components/Receive/ReceiveExplanation/styles.scss

@@ -24,7 +24,7 @@
     font-size: 16px;
 
     p {
-      margin: 24px 0;
+      margin: 12px 0;
     }
   }
 }