aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/settings/navigation
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-09-08 04:38:56 +0530
committerLibravatar Vijay A <avijayr@protonmail.com>2021-09-08 05:11:37 +0530
commitc875cb06d0badfb945a1784e90be2ee8fca0b7e1 (patch)
tree61fade08770c19dd9e4e9a7bbe2b92551a4db0d0 /src/components/settings/navigation
parentfix: black screen in macOS when closing to systray in fullscreen mode (#1883) (diff)
downloadferdium-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/navigation')
-rw-r--r--src/components/settings/navigation/SettingsNavigation.js7
1 files changed, 2 insertions, 5 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';
10import UIStore from '../../../stores/UIStore'; 10import UIStore from '../../../stores/UIStore';
11import SettingsStore from '../../../stores/SettingsStore'; 11import SettingsStore from '../../../stores/SettingsStore';
12import UserStore from '../../../stores/UserStore'; 12import UserStore from '../../../stores/UserStore';
13import globalMessages from '../../../i18n/globalMessages';
13 14
14const messages = defineMessages({ 15const 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"