diff options
Diffstat (limited to 'src/components/auth')
-rw-r--r-- | src/components/auth/ChangeServer.js | 8 | ||||
-rw-r--r-- | src/components/auth/Password.js | 9 | ||||
-rw-r--r-- | src/components/auth/SetupAssistant.js | 8 |
3 files changed, 11 insertions, 14 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'; | |||
9 | import Infobox from '../ui/Infobox'; | 9 | import Infobox from '../ui/Infobox'; |
10 | import { url, required } from '../../helpers/validation-helpers'; | 10 | import { url, required } from '../../helpers/validation-helpers'; |
11 | import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config'; | 11 | import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config'; |
12 | import globalMessages from '../../i18n/globalMessages'; | ||
12 | 13 | ||
13 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
14 | headline: { | 15 | headline: { |
@@ -31,11 +32,6 @@ const messages = defineMessages({ | |||
31 | id: 'changeserver.urlError', | 32 | id: 'changeserver.urlError', |
32 | defaultMessage: '!!!Enter a valid URL', | 33 | defaultMessage: '!!!Enter a valid URL', |
33 | }, | 34 | }, |
34 | submit: { | ||
35 | id: 'changeserver.submit', | ||
36 | defaultMessage: '!!!Submit', | ||
37 | }, | ||
38 | |||
39 | }); | 35 | }); |
40 | 36 | ||
41 | export default @observer class ChangeServer extends Component { | 37 | export default @observer class ChangeServer extends Component { |
@@ -120,7 +116,7 @@ export default @observer class ChangeServer extends Component { | |||
120 | <Button | 116 | <Button |
121 | type="submit" | 117 | type="submit" |
122 | className="auth__button" | 118 | className="auth__button" |
123 | label={intl.formatMessage(messages.submit)} | 119 | label={intl.formatMessage(globalMessages.submit)} |
124 | /> | 120 | /> |
125 | </form> | 121 | </form> |
126 | </div> | 122 | </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'; | |||
9 | import Button from '../ui/Button'; | 9 | import Button from '../ui/Button'; |
10 | import Link from '../ui/Link'; | 10 | import Link from '../ui/Link'; |
11 | import Infobox from '../ui/Infobox'; | 11 | import Infobox from '../ui/Infobox'; |
12 | import globalMessages from '../../i18n/globalMessages'; | ||
12 | 13 | ||
13 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
14 | headline: { | 15 | headline: { |
@@ -19,10 +20,6 @@ const messages = defineMessages({ | |||
19 | id: 'password.email.label', | 20 | id: 'password.email.label', |
20 | defaultMessage: '!!!Email address', | 21 | defaultMessage: '!!!Email address', |
21 | }, | 22 | }, |
22 | submitButtonLabel: { | ||
23 | id: 'password.submit.label', | ||
24 | defaultMessage: '!!!Submit', | ||
25 | }, | ||
26 | successInfo: { | 23 | successInfo: { |
27 | id: 'password.successInfo', | 24 | id: 'password.successInfo', |
28 | defaultMessage: '!!!Your new password was sent to your email address', | 25 | defaultMessage: '!!!Your new password was sent to your email address', |
@@ -112,7 +109,7 @@ export default @observer class Password extends Component { | |||
112 | <Button | 109 | <Button |
113 | className="auth__button is-loading" | 110 | className="auth__button is-loading" |
114 | buttonType="secondary" | 111 | buttonType="secondary" |
115 | label={`${intl.formatMessage(messages.submitButtonLabel)} ...`} | 112 | label={`${intl.formatMessage(globalMessages.submit)} ...`} |
116 | loaded={false} | 113 | loaded={false} |
117 | disabled | 114 | disabled |
118 | /> | 115 | /> |
@@ -120,7 +117,7 @@ export default @observer class Password extends Component { | |||
120 | <Button | 117 | <Button |
121 | type="submit" | 118 | type="submit" |
122 | className="auth__button" | 119 | className="auth__button" |
123 | label={intl.formatMessage(messages.submitButtonLabel)} | 120 | label={intl.formatMessage(globalMessages.submit)} |
124 | /> | 121 | /> |
125 | )} | 122 | )} |
126 | </form> | 123 | </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'; | |||
10 | import Modal from '../ui/Modal'; | 10 | import Modal from '../ui/Modal'; |
11 | import Infobox from '../ui/Infobox'; | 11 | import Infobox from '../ui/Infobox'; |
12 | import Appear from '../ui/effects/Appear'; | 12 | import Appear from '../ui/effects/Appear'; |
13 | import globalMessages from '../../i18n/globalMessages'; | ||
13 | 14 | ||
14 | import { CDN_URL } from '../../config'; | 15 | import { CDN_URL } from '../../config'; |
15 | 16 | ||
@@ -300,11 +301,14 @@ class SetupAssistant extends Component { | |||
300 | value={slackWorkspace} | 301 | value={slackWorkspace} |
301 | /> | 302 | /> |
302 | <div className={classes.modalActionContainer}> | 303 | <div className={classes.modalActionContainer}> |
303 | <Button type="submit" label="Save" /> | 304 | <Button |
305 | type="submit" | ||
306 | label={intl.formatMessage(globalMessages.save)} | ||
307 | /> | ||
304 | <Button | 308 | <Button |
305 | type="link" | 309 | type="link" |
306 | buttonType="secondary" | 310 | buttonType="secondary" |
307 | label="Cancel" | 311 | label={intl.formatMessage(globalMessages.cancel)} |
308 | className={classes.ctaCancel} | 312 | className={classes.ctaCancel} |
309 | onClick={() => this.setState({ slackWorkspace: '' })} | 313 | onClick={() => this.setState({ slackWorkspace: '' })} |
310 | /> | 314 | /> |