diff options
author | 2021-09-13 14:45:46 +0200 | |
---|---|---|
committer | 2021-09-13 14:45:46 +0200 | |
commit | 537697a6e9757f118d09d9e76362ba1ff617e2c6 (patch) | |
tree | bc55447115e385137684e84697a8c15d2199b8d5 /src/components/layout/AppLayout.js | |
parent | Bumped up version to: 5.6.3-nightly.0 [skip ci] (diff) | |
download | ferdium-app-537697a6e9757f118d09d9e76362ba1ff617e2c6.tar.gz ferdium-app-537697a6e9757f118d09d9e76362ba1ff617e2c6.tar.zst ferdium-app-537697a6e9757f118d09d9e76362ba1ff617e2c6.zip |
chore: upgrade intl dependencies (#1920)
Diffstat (limited to 'src/components/layout/AppLayout.js')
-rw-r--r-- | src/components/layout/AppLayout.js | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index e6e5d40fe..83e037083 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | import { defineMessages, intlShape } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | import { TitleBar } from 'electron-react-titlebar'; | 5 | import { TitleBar } from 'electron-react-titlebar'; |
6 | import injectSheet from 'react-jss'; | 6 | import injectSheet from 'react-jss'; |
7 | 7 | ||
@@ -27,20 +27,20 @@ function createMarkup(HTMLString) { | |||
27 | const messages = defineMessages({ | 27 | const messages = defineMessages({ |
28 | servicesUpdated: { | 28 | servicesUpdated: { |
29 | id: 'infobar.servicesUpdated', | 29 | id: 'infobar.servicesUpdated', |
30 | defaultMessage: '!!!Your services have been updated.', | 30 | defaultMessage: 'Your services have been updated.', |
31 | }, | 31 | }, |
32 | buttonReloadServices: { | 32 | buttonReloadServices: { |
33 | id: 'infobar.buttonReloadServices', | 33 | id: 'infobar.buttonReloadServices', |
34 | defaultMessage: '!!!Reload services', | 34 | defaultMessage: 'Reload services', |
35 | }, | 35 | }, |
36 | requiredRequestsFailed: { | 36 | requiredRequestsFailed: { |
37 | id: 'infobar.requiredRequestsFailed', | 37 | id: 'infobar.requiredRequestsFailed', |
38 | defaultMessage: '!!!Could not load services and user information', | 38 | defaultMessage: 'Could not load services and user information', |
39 | }, | 39 | }, |
40 | authRequestFailed: { | 40 | authRequestFailed: { |
41 | id: 'infobar.authRequestFailed', | 41 | id: 'infobar.authRequestFailed', |
42 | defaultMessage: | 42 | defaultMessage: |
43 | '!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.', | 43 | 'There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.', |
44 | }, | 44 | }, |
45 | }); | 45 | }); |
46 | 46 | ||
@@ -94,10 +94,6 @@ class AppLayout extends Component { | |||
94 | children: [], | 94 | children: [], |
95 | }; | 95 | }; |
96 | 96 | ||
97 | static contextTypes = { | ||
98 | intl: intlShape, | ||
99 | }; | ||
100 | |||
101 | render() { | 97 | render() { |
102 | const { | 98 | const { |
103 | classes, | 99 | classes, |
@@ -119,7 +115,7 @@ class AppLayout extends Component { | |||
119 | areRequiredRequestsLoading, | 115 | areRequiredRequestsLoading, |
120 | } = this.props; | 116 | } = this.props; |
121 | 117 | ||
122 | const { intl } = this.context; | 118 | const { intl } = this.props; |
123 | 119 | ||
124 | return ( | 120 | return ( |
125 | <ErrorBoundary> | 121 | <ErrorBoundary> |
@@ -213,4 +209,4 @@ class AppLayout extends Component { | |||
213 | } | 209 | } |
214 | } | 210 | } |
215 | 211 | ||
216 | export default AppLayout; | 212 | export default injectIntl(AppLayout); |