refactor: externalize english text

4 files changed, 13 insertions, 15 deletions

diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 7bab80280..8e8a7af32 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -9,6 +9,7 @@ import Button from '../ui/Button';
 import Infobox from '../ui/Infobox';
 import { url, required } from '../../helpers/validation-helpers';
 import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   headline: {
@@ -31,11 +32,6 @@ const messages = defineMessages({
     id: 'changeserver.urlError',
     defaultMessage: '!!!Enter a valid URL',
   },
-  submit: {
-    id: 'changeserver.submit',
-    defaultMessage: '!!!Submit',
-  },
-
 });
 
 export default @observer class ChangeServer extends Component {
@@ -120,7 +116,7 @@ export default @observer class ChangeServer extends Component {
           <Button
             type="submit"
             className="auth__button"
-            label={intl.formatMessage(messages.submit)}
+            label={intl.formatMessage(globalMessages.submit)}
           />
         </form>
       </div>
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index eafc48502..1be2097bd 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -9,6 +9,7 @@ import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Link from '../ui/Link';
 import Infobox from '../ui/Infobox';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   headline: {
@@ -19,10 +20,6 @@ const messages = defineMessages({
     id: 'password.email.label',
     defaultMessage: '!!!Email address',
   },
-  submitButtonLabel: {
-    id: 'password.submit.label',
-    defaultMessage: '!!!Submit',
-  },
   successInfo: {
     id: 'password.successInfo',
     defaultMessage: '!!!Your new password was sent to your email address',
@@ -112,7 +109,7 @@ export default @observer class Password extends Component {
             <Button
               className="auth__button is-loading"
               buttonType="secondary"
-              label={`${intl.formatMessage(messages.submitButtonLabel)} ...`}
+              label={`${intl.formatMessage(globalMessages.submit)} ...`}
               loaded={false}
               disabled
             />
@@ -120,7 +117,7 @@ export default @observer class Password extends Component {
             <Button
               type="submit"
               className="auth__button"
-              label={intl.formatMessage(messages.submitButtonLabel)}
+              label={intl.formatMessage(globalMessages.submit)}
             />
           )}
         </form>
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index 0f821d4fc..ded36bbe7 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -10,6 +10,7 @@ import { Badge } from '@meetfranz/ui';
 import Modal from '../ui/Modal';
 import Infobox from '../ui/Infobox';
 import Appear from '../ui/effects/Appear';
+import globalMessages from '../../i18n/globalMessages';
 
 import { CDN_URL } from '../../config';
 
@@ -300,11 +301,14 @@ class SetupAssistant extends Component {
                 value={slackWorkspace}
               />
               <div className={classes.modalActionContainer}>
-                <Button type="submit" label="Save" />
+                <Button
+                  type="submit"
+                  label={intl.formatMessage(globalMessages.save)}
+                />
                 <Button
                   type="link"
                   buttonType="secondary"
-                  label="Cancel"
+                  label={intl.formatMessage(globalMessages.cancel)}
                   className={classes.ctaCancel}
                   onClick={() => this.setState({ slackWorkspace: '' })}
                 />
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index b24055828..d59cbe228 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -11,6 +11,7 @@ import ms from 'ms';
 import { observable, autorun } from 'mobx';
 import ServiceModel from '../../../models/Service';
 import { cmdOrCtrlShortcutKey } from '../../../environment';
+import globalMessages from '../../../i18n/globalMessages';
 
 const IS_SERVICE_DEBUGGING_ENABLED = (
   localStorage.getItem('debug') || ''
@@ -259,7 +260,7 @@ class TabItem extends Component {
             detail: intl.formatMessage(messages.confirmDeleteService, {
               serviceName: service.name || service.recipe.name,
             }),
-            buttons: ['Yes', 'No'],
+            buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)],
           });
           if (selection === 0) {
             deleteService();