diff options
author | Vijay A <avijayr@protonmail.com> | 2021-05-16 05:13:37 +0530 |
---|---|---|
committer | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-05-16 13:01:24 +0530 |
commit | 6f19bf95d0573f2d7d1c575d9c684653f59efe72 (patch) | |
tree | 8da1591207dbf19cf9939850e3c08d07fdd0cbf7 /src/containers | |
parent | Expose Chrome version in 'About' dialog. (diff) | |
download | ferdium-app-6f19bf95d0573f2d7d1c575d9c684653f59efe72.tar.gz ferdium-app-6f19bf95d0573f2d7d1c575d9c684653f59efe72.tar.zst ferdium-app-6f19bf95d0573f2d7d1c575d9c684653f59efe72.zip |
Fix for #1417: Mac Nomenclature for Menu Bar
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 831732940..ff22bc45a 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -12,6 +12,7 @@ import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; | |||
12 | import { | 12 | import { |
13 | DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS, | 13 | DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS, |
14 | } from '../../config'; | 14 | } from '../../config'; |
15 | import { isMac } from '../../environment'; | ||
15 | import { config as spellcheckerConfig } from '../../features/spellchecker'; | 16 | import { config as spellcheckerConfig } from '../../features/spellchecker'; |
16 | 17 | ||
17 | import { getSelectOptions } from '../../helpers/i18n-helpers'; | 18 | import { getSelectOptions } from '../../helpers/i18n-helpers'; |
@@ -45,7 +46,11 @@ const messages = defineMessages({ | |||
45 | }, | 46 | }, |
46 | enableSystemTray: { | 47 | enableSystemTray: { |
47 | id: 'settings.app.form.enableSystemTray', | 48 | id: 'settings.app.form.enableSystemTray', |
48 | defaultMessage: '!!!Always show Ferdi in system tray', | 49 | defaultMessage: '!!!Always show Ferdi in System Tray', |
50 | }, | ||
51 | enableMenuBar: { | ||
52 | id: 'settings.app.form.enableMenuBar', | ||
53 | defaultMessage: '!!!Always show Ferdi in Menu Bar', | ||
49 | }, | 54 | }, |
50 | reloadAfterResume: { | 55 | reloadAfterResume: { |
51 | id: 'settings.app.form.reloadAfterResume', | 56 | id: 'settings.app.form.reloadAfterResume', |
@@ -371,7 +376,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
371 | default: DEFAULT_APP_SETTINGS.startMinimized, | 376 | default: DEFAULT_APP_SETTINGS.startMinimized, |
372 | }, | 377 | }, |
373 | enableSystemTray: { | 378 | enableSystemTray: { |
374 | label: intl.formatMessage(messages.enableSystemTray), | 379 | label: intl.formatMessage(isMac ? messages.enableMenuBar : messages.enableSystemTray), |
375 | value: settings.all.app.enableSystemTray, | 380 | value: settings.all.app.enableSystemTray, |
376 | default: DEFAULT_APP_SETTINGS.enableSystemTray, | 381 | default: DEFAULT_APP_SETTINGS.enableSystemTray, |
377 | }, | 382 | }, |