diff options
author | 2021-09-08 04:38:56 +0530 | |
---|---|---|
committer | 2021-09-08 05:11:37 +0530 | |
commit | c875cb06d0badfb945a1784e90be2ee8fca0b7e1 (patch) | |
tree | 61fade08770c19dd9e4e9a7bbe2b92551a4db0d0 /src/components/settings | |
parent | fix: black screen in macOS when closing to systray in fullscreen mode (#1883) (diff) | |
download | ferdium-app-c875cb06d0badfb945a1784e90be2ee8fca0b7e1.tar.gz ferdium-app-c875cb06d0badfb945a1784e90be2ee8fca0b7e1.tar.zst ferdium-app-c875cb06d0badfb945a1784e90be2ee8fca0b7e1.zip |
refactor: merge common i18n strings [skip ci]
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 7 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index 02cae6b69..0a5ace586 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -10,6 +10,7 @@ import { workspaceStore } from '../../../features/workspaces'; | |||
10 | import UIStore from '../../../stores/UIStore'; | 10 | import UIStore from '../../../stores/UIStore'; |
11 | import SettingsStore from '../../../stores/SettingsStore'; | 11 | import SettingsStore from '../../../stores/SettingsStore'; |
12 | import UserStore from '../../../stores/UserStore'; | 12 | import UserStore from '../../../stores/UserStore'; |
13 | import globalMessages from '../../../i18n/globalMessages'; | ||
13 | 14 | ||
14 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
15 | availableServices: { | 16 | availableServices: { |
@@ -32,10 +33,6 @@ const messages = defineMessages({ | |||
32 | id: 'settings.navigation.team', | 33 | id: 'settings.navigation.team', |
33 | defaultMessage: '!!!Manage Team', | 34 | defaultMessage: '!!!Manage Team', |
34 | }, | 35 | }, |
35 | settings: { | ||
36 | id: 'settings.navigation.settings', | ||
37 | defaultMessage: '!!!Settings', | ||
38 | }, | ||
39 | supportFerdi: { | 36 | supportFerdi: { |
40 | id: 'settings.navigation.supportFerdi', | 37 | id: 'settings.navigation.supportFerdi', |
41 | defaultMessage: '!!!About Ferdi', | 38 | defaultMessage: '!!!About Ferdi', |
@@ -159,7 +156,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e | |||
159 | className="settings-navigation__link" | 156 | className="settings-navigation__link" |
160 | activeClassName="is-active" | 157 | activeClassName="is-active" |
161 | > | 158 | > |
162 | {intl.formatMessage(messages.settings)} | 159 | {intl.formatMessage(globalMessages.settings)} |
163 | </Link> | 160 | </Link> |
164 | <Link | 161 | <Link |
165 | to="/settings/support" | 162 | to="/settings/support" |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 3d135a048..6a919b902 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -18,10 +18,6 @@ import { openPath } from '../../../helpers/url-helpers'; | |||
18 | import globalMessages from '../../../i18n/globalMessages'; | 18 | import globalMessages from '../../../i18n/globalMessages'; |
19 | 19 | ||
20 | const messages = defineMessages({ | 20 | const messages = defineMessages({ |
21 | headline: { | ||
22 | id: 'settings.app.headline', | ||
23 | defaultMessage: '!!!Settings', | ||
24 | }, | ||
25 | headlineGeneral: { | 21 | headlineGeneral: { |
26 | id: 'settings.app.headlineGeneral', | 22 | id: 'settings.app.headlineGeneral', |
27 | defaultMessage: '!!!General', | 23 | defaultMessage: '!!!General', |
@@ -275,7 +271,7 @@ export default @observer class EditSettingsForm extends Component { | |||
275 | return ( | 271 | return ( |
276 | <div className="settings__main"> | 272 | <div className="settings__main"> |
277 | <div className="settings__header"> | 273 | <div className="settings__header"> |
278 | <h1>{intl.formatMessage(messages.headline)}</h1> | 274 | <h1>{intl.formatMessage(globalMessages.settings)}</h1> |
279 | </div> | 275 | </div> |
280 | <div className="settings__body"> | 276 | <div className="settings__body"> |
281 | <form | 277 | <form |