diff options
author | 2019-04-12 19:05:59 +0200 | |
---|---|---|
committer | 2019-04-12 19:05:59 +0200 | |
commit | 821a3192801eb86a06373054e90150f73473d30c (patch) | |
tree | f7f3417d05108787636fbe8371f3babb40fe47f3 /src/lib/Menu.js | |
parent | add locale on signup (diff) | |
parent | link to in-app changelog on new update notification (diff) | |
download | ferdium-app-821a3192801eb86a06373054e90150f73473d30c.tar.gz ferdium-app-821a3192801eb86a06373054e90150f73473d30c.tar.zst ferdium-app-821a3192801eb86a06373054e90150f73473d30c.zip |
Merge branch 'feature/announcements' into develop
Diffstat (limited to 'src/lib/Menu.js')
-rw-r--r-- | src/lib/Menu.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index a4e41c17c..6bea67860 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -6,6 +6,7 @@ import { isMac, ctrlKey, cmdKey } from '../environment'; | |||
6 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index'; | 6 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index'; |
7 | import { workspaceActions } from '../features/workspaces/actions'; | 7 | import { workspaceActions } from '../features/workspaces/actions'; |
8 | import { gaEvent } from './analytics'; | 8 | import { gaEvent } from './analytics'; |
9 | import { announcementActions } from '../features/announcements/actions'; | ||
9 | 10 | ||
10 | const { app, Menu, dialog } = remote; | 11 | const { app, Menu, dialog } = remote; |
11 | 12 | ||
@@ -158,6 +159,10 @@ const menuItems = defineMessages({ | |||
158 | id: 'menu.app.about', | 159 | id: 'menu.app.about', |
159 | defaultMessage: '!!!About Franz', | 160 | defaultMessage: '!!!About Franz', |
160 | }, | 161 | }, |
162 | announcement: { | ||
163 | id: 'menu.app.announcement', | ||
164 | defaultMessage: '!!!What\'s new?', | ||
165 | }, | ||
161 | settings: { | 166 | settings: { |
162 | id: 'menu.app.settings', | 167 | id: 'menu.app.settings', |
163 | defaultMessage: '!!!Settings', | 168 | defaultMessage: '!!!Settings', |
@@ -348,8 +353,10 @@ const _templateFactory = intl => [ | |||
348 | click() { shell.openExternal('https://meetfranz.com'); }, | 353 | click() { shell.openExternal('https://meetfranz.com'); }, |
349 | }, | 354 | }, |
350 | { | 355 | { |
351 | label: intl.formatMessage(menuItems.changelog), | 356 | label: intl.formatMessage(menuItems.announcement), |
352 | click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); }, | 357 | click: () => { |
358 | announcementActions.show(); | ||
359 | }, | ||
353 | }, | 360 | }, |
354 | { | 361 | { |
355 | type: 'separator', | 362 | type: 'separator', |