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 | |
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')
-rw-r--r-- | src/components/layout/Sidebar.js | 7 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.js | 6 | ||||
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 7 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 |
4 files changed, 6 insertions, 20 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 935966764..1ee7733b9 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -12,12 +12,9 @@ import { todosStore } from '../../features/todos'; | |||
12 | import { todoActions } from '../../features/todos/actions'; | 12 | import { todoActions } from '../../features/todos/actions'; |
13 | import AppStore from '../../stores/AppStore'; | 13 | import AppStore from '../../stores/AppStore'; |
14 | import SettingsStore from '../../stores/SettingsStore'; | 14 | import SettingsStore from '../../stores/SettingsStore'; |
15 | import globalMessages from '../../i18n/globalMessages'; | ||
15 | 16 | ||
16 | const messages = defineMessages({ | 17 | const messages = defineMessages({ |
17 | settings: { | ||
18 | id: 'sidebar.settings', | ||
19 | defaultMessage: '!!!Settings', | ||
20 | }, | ||
21 | addNewService: { | 18 | addNewService: { |
22 | id: 'sidebar.addNewService', | 19 | id: 'sidebar.addNewService', |
23 | defaultMessage: '!!!Add new service', | 20 | defaultMessage: '!!!Add new service', |
@@ -215,7 +212,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp | |||
215 | type="button" | 212 | type="button" |
216 | onClick={() => openSettings({ path: 'app' })} | 213 | onClick={() => openSettings({ path: 'app' })} |
217 | className="sidebar__button sidebar__button--settings" | 214 | className="sidebar__button sidebar__button--settings" |
218 | data-tip={`${intl.formatMessage(messages.settings)} (${settingsShortcutKey(false)})`} | 215 | data-tip={`${intl.formatMessage(globalMessages.settings)} (${settingsShortcutKey(false)})`} |
219 | > | 216 | > |
220 | <i className="mdi mdi-cog" /> | 217 | <i className="mdi mdi-cog" /> |
221 | { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE | 218 | { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE |
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index d59cbe228..e5892be5d 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -22,10 +22,6 @@ const messages = defineMessages({ | |||
22 | id: 'tabs.item.reload', | 22 | id: 'tabs.item.reload', |
23 | defaultMessage: '!!!Reload', | 23 | defaultMessage: '!!!Reload', |
24 | }, | 24 | }, |
25 | edit: { | ||
26 | id: 'tabs.item.edit', | ||
27 | defaultMessage: '!!!Edit', | ||
28 | }, | ||
29 | disableNotifications: { | 25 | disableNotifications: { |
30 | id: 'tabs.item.disableNotifications', | 26 | id: 'tabs.item.disableNotifications', |
31 | defaultMessage: '!!!Disable notifications', | 27 | defaultMessage: '!!!Disable notifications', |
@@ -205,7 +201,7 @@ class TabItem extends Component { | |||
205 | accelerator: `${cmdOrCtrlShortcutKey()}+R`, | 201 | accelerator: `${cmdOrCtrlShortcutKey()}+R`, |
206 | }, | 202 | }, |
207 | { | 203 | { |
208 | label: intl.formatMessage(messages.edit), | 204 | label: intl.formatMessage(globalMessages.edit), |
209 | click: () => | 205 | click: () => |
210 | openSettings({ | 206 | openSettings({ |
211 | path: `services/edit/${service.id}`, | 207 | path: `services/edit/${service.id}`, |
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 |