diff options
author | 2021-09-12 19:10:13 +0200 | |
---|---|---|
committer | 2021-09-12 19:10:13 +0200 | |
commit | 2cb4834990192f6be41f6a0a73a3301b1304de30 (patch) | |
tree | 1569d379c5ab66042386b7d46133728ea2f47d26 | |
parent | docs: updated Changelog (diff) | |
download | ferdium-app-2cb4834990192f6be41f6a0a73a3301b1304de30.tar.gz ferdium-app-2cb4834990192f6be41f6a0a73a3301b1304de30.tar.zst ferdium-app-2cb4834990192f6be41f6a0a73a3301b1304de30.zip |
fix: no top menu at all (#1917)
-rw-r--r-- | CHANGELOG.md | 52 | ||||
-rw-r--r-- | src/lib/Menu.js | 7 |
2 files changed, 33 insertions, 26 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 33cd8e43c..2221aedda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -3,33 +3,37 @@ | |||
3 | ### Services | 3 | ### Services |
4 | 4 | ||
5 | - We now have native support for 212 recipes! 💖 @vraravam | 5 | - We now have native support for 212 recipes! 💖 @vraravam |
6 | * 'clockwise' (#692) | 6 | - 'clockwise' (#692) |
7 | * 'coinbase' (#697) | 7 | - 'coinbase' (#697) |
8 | * 'devRant' (#706) | 8 | - 'devRant' (#706) |
9 | * 'dialpad' (#695) | 9 | - 'dialpad' (#695) |
10 | * 'dingtalk' (fixes #416) (#686) | 10 | - 'dingtalk' (fixes #416) (#686) |
11 | * 'drive' (#698) | 11 | - 'drive' (#698) |
12 | * 'flock' (#688) | 12 | - 'flock' (#688) |
13 | * 'freshdesk' (#700) | 13 | - 'freshdesk' (#700) |
14 | * 'hey' (#701) | 14 | - 'hey' (#701) |
15 | * 'mewe' (fixes #484) (#684) | 15 | - 'mewe' (fixes #484) (#684) |
16 | * 'misskey' (#693) | 16 | - 'misskey' (#693) |
17 | * 'plek' (#699) | 17 | - 'plek' (#699) |
18 | * 'producthunt' (#687) | 18 | - 'producthunt' (#687) |
19 | * 'ritetag' (#702) | 19 | - 'ritetag' (#702) |
20 | * 'scrumpy' (#689) | 20 | - 'scrumpy' (#689) |
21 | * 'slowly' (fixes #297) (#690) | 21 | - 'slowly' (fixes #297) (#690) |
22 | * 'sococo' (#704) | 22 | - 'sococo' (#704) |
23 | * 'stackoverflow' (#707) | 23 | - 'stackoverflow' (#707) |
24 | * 'teamweek' (#694) | 24 | - 'teamweek' (#694) |
25 | * 'tixio' (#691) | 25 | - 'tixio' (#691) |
26 | * 'udemy' (fixes #464) (#696) | 26 | - 'udemy' (fixes #464) (#696) |
27 | * 'weekplan' (#705) | 27 | - 'weekplan' (#705) |
28 | * 'whereby' (#683) | 28 | - 'whereby' (#683) |
29 | * 'yandex-mail' (fixes #421) (#685) | 29 | - 'yandex-mail' (fixes #421) (#685) |
30 | - Add indirect count for 'teamleader' recipe. (#703) 💖 @vraravam | 30 | - Add indirect count for 'teamleader' recipe. (#703) 💖 @vraravam |
31 | - Merged 'github_enterprise' recipe into 'github' with the extra bits. 💖 @vraravam | 31 | - Merged 'github_enterprise' recipe into 'github' with the extra bits. 💖 @vraravam |
32 | 32 | ||
33 | ### Bug fixes | ||
34 | |||
35 | - fix broken menu due to referencing old intl value 💖 @mhatvan | ||
36 | |||
33 | # [v5.6.2-nightly.1](https://github.com/getferdi/ferdi/compare/v5.6.1...v5.6.2-nightly.1) (2021-09-12) | 37 | # [v5.6.2-nightly.1](https://github.com/getferdi/ferdi/compare/v5.6.1...v5.6.2-nightly.1) (2021-09-12) |
34 | 38 | ||
35 | ### Bug fixes | 39 | ### Bug fixes |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 2c24b696b..324838441 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -601,7 +601,10 @@ export default class FranzMenu { | |||
601 | type: 'question', | 601 | type: 'question', |
602 | message: intl.formatMessage(globalMessages.quit), | 602 | message: intl.formatMessage(globalMessages.quit), |
603 | detail: intl.formatMessage(globalMessages.quitConfirmation), | 603 | detail: intl.formatMessage(globalMessages.quitConfirmation), |
604 | buttons: [intl.formatMessage(globalMessages.yes), intl.formatMessage(globalMessages.no)], | 604 | buttons: [ |
605 | intl.formatMessage(globalMessages.yes), | ||
606 | intl.formatMessage(globalMessages.no), | ||
607 | ], | ||
605 | }); | 608 | }); |
606 | } | 609 | } |
607 | if (selection === yesButtonIndex) { | 610 | if (selection === yesButtonIndex) { |
@@ -857,7 +860,7 @@ export default class FranzMenu { | |||
857 | } else { | 860 | } else { |
858 | tpl[0].submenu = [ | 861 | tpl[0].submenu = [ |
859 | { | 862 | { |
860 | label: intl.formatMessage(menuItems.settings), | 863 | label: intl.formatMessage(globalMessages.settings), |
861 | accelerator: `${settingsShortcutKey()}`, | 864 | accelerator: `${settingsShortcutKey()}`, |
862 | click: () => { | 865 | click: () => { |
863 | this.actions.ui.openSettings({ path: 'app' }); | 866 | this.actions.ui.openSettings({ path: 'app' }); |