Deprecate src/config/locales/i18n.js

src/components/Form/Accordion/Accordion.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import ValidationElement from 'components/Form/ValidationElement'
 import Branch from 'components/Form/Branch'
 import Show from 'components/Form/Show'

src/components/Form/Branch/Branch.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import Field from 'components/Form/Field'
 import Radio from 'components/Form/Radio'
 import RadioGroup from 'components/Form/RadioGroup'

src/components/Form/Comments/Comments.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import Textarea from '../Textarea'
 import ValidationElement from '../ValidationElement'
 

src/components/Form/Consent/Consent.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { updateApplication } from 'actions/ApplicationActions'
 import Modal from 'components/Form/Modal'
 
@@ -31,7 +31,7 @@ export class Consent extends React.Component {
           show={this.props.settings.consented !== 'Yes'}
           className="consent-content">
           <div>
-            <div className="consent-legal">{i18n.m2('consent.contents')}</div>
+            <div className="consent-legal">{i18n.m('consent.contents')}</div>
             <button
               name="consent"
               className="consent-acceptance"

src/components/Form/Country/Country.jsx

@@ -1,9 +1,10 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Show from '../Show'
 import Dropdown from '../Dropdown'
 import MultipleDropdown from '../MultipleDropdown'
+import countries from './countries'
 
 export default class Country extends ValidationElement {
   constructor(props) {
@@ -13,8 +14,7 @@ export default class Country extends ValidationElement {
       showComents: props.showComments
     }
 
-    this.countries = i18n.value('countries')
-
+    this.countries = countries
     this.update = this.update.bind(this)
     this.updateSingleCountry = this.updateSingleCountry.bind(this)
     this.updateMultipleCountries = this.updateMultipleCountries.bind(this)

src/config/locales/en/countries.js → src/components/Form/Country/countries.js

@@ -1,4 +1,4 @@
-export const countries = {
+const countries = {
   unitedStates: { value: 'United States', text: 'USA' },
   afghanistan: { value: 'Afghanistan', text: 'Afghanistan' },
   akrotiriSovereignBaseArea: {
@@ -331,3 +331,5 @@ export const countries = {
   zambia: { value: 'Zambia', text: 'Zambia' },
   zimbabwe: { value: 'Zimbabwe', text: 'Zimbabwe' }
 }
+
+export default countries

src/components/Form/Currency/Currency.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import Number from '../Number'
 
 /**

src/components/Form/DateControl/DateControl.jsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { i18n } from '../../../config'
 import ValidationElement from '../ValidationElement'
 import Number from '../Number'
 import Checkbox from '../Checkbox'

src/components/Form/EyeColor/EyeColor.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Svg from '../Svg'
 import Radio from '../Radio'

src/components/Form/Field/Field.jsx

@@ -5,7 +5,7 @@
 import React from 'react'
 import classnames from 'classnames'
 
-import { i18n } from 'config'
+import { i18n } from 'config/locales/i18n'
 
 import ValidationElement, { newGuid } from 'components/Form/ValidationElement'
 import Svg from 'components/Form/Svg'
@@ -19,8 +19,6 @@ const renderMessage = (id, messageString, titleString) => {
     && note.indexOf(noteId) > -1
   ) {
     note = ''
-  } else {
-    note = <em>{note}</em>
   }
 
   const messageId = `${id}.message`
@@ -30,17 +28,19 @@ const renderMessage = (id, messageString, titleString) => {
     && message.indexOf(messageId) > -1
   ) {
     message = ''
-  } else {
-    message = <span>{message}</span>
   }
 
   const title = titleString || i18n.t(`${id}.title`)
 
   return (
     <div key={newGuid()} data-i18n={id}>
       <h5 className="usa-alert-heading">{title}</h5>
-      {message}
-      {note}
+      {message && (
+        <span>{message}</span>
+      )}
+      {note && (
+        <em>{note}</em>
+      )}
     </div>
   )
 }
@@ -325,7 +325,6 @@ export default class Field extends ValidationElement {
 
   helpMessage() {
     const { help, helpMessage, helpTitle } = this.props
-
     if (this.state.helpActive && help) {
       return (
         <div className="usa-alert usa-alert-info" role="alert">

src/components/Form/ForeignBornDocuments/ForeignBornDocuments.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import ValidationElement from '../ValidationElement'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { alphaNumericRegEx } from '../../../validators/helpers'
 import RadioGroup from '../RadioGroup'
 import Radio from '../Radio'

src/components/Form/HairColor/HairColor.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Svg from '../Svg'
 import Radio from '../Radio'

src/components/Form/Height/Height.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Number from '../Number'
 

src/components/Form/Introduction/Introduction.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import * as formTypes from 'constants/formTypes'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { updateApplication } from '../../../actions/ApplicationActions'
 import { logout } from '../../../actions/AuthActions'
 import Branch from '../Branch'