From 5ce665d4ef6f451d6c0501e8b3b11319421523a2 Mon Sep 17 00:00:00 2001 From: "Jason C. McDonald" Date: Fri, 26 Mar 2021 08:26:10 -0700 Subject: [PATCH] Discourse Community integration (#2263) * Discourse Community integration + Replace all Zendesk links with equivalent Discourse links. + 'Mailspring Help' menu option now points to /docs on Discourse. + Add 'Mailspring Community' to menu. + Remove old FAQ (same as new Mailspring Help). * Update Quick Start Guide link to better URL --- README.md | 7 ++--- .../lib/preferences-templates.tsx | 6 ++-- .../lib/tabs/preferences-identity.tsx | 29 ++++++++----------- .../lib/tabs/workspace-section.tsx | 4 ++- .../thread-search/lib/search-bar-util.ts | 2 +- .../lib/thread-sharing-popover.tsx | 2 +- app/menus/darwin.js | 2 +- app/menus/linux.js | 2 +- app/menus/win32.js | 2 +- app/src/browser/application.ts | 8 ++--- 10 files changed, 31 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 6d90ac557..a2dfaaead 100644 --- a/README.md +++ b/README.md @@ -98,10 +98,9 @@ modify and extend. Mailspring comes stock with a few beautiful themes, and there are many more which have been built by community developers. To start creating a theme, [clone the theme starter](https://github.com/Foundry376/Mailspring-Theme-Starter)! -If you are updating an existing Nylas theme for Mailspring here is a [step by -step tutorial](https://foundry376.zendesk.com/hc/en-us/articles/115001918391-How-do-I-update-an-N1-Nylas-Mail-theme-for-Mailspring-). -Notice: as part of the update process you will probably need to [import -mailspring base variables](https://github.com/Foundry376/Mailspring/issues/326#issuecomment-343757775). +If you are updating an existing Nylas theme for Mailspring here is a +[step by step tutorial](https://community.getmailspring.com/t/updating-an-n1-nylas-mail-theme-for-mailspring/195). +Notice: as part of the update process you will probably need to [import mailspring base variables](https://github.com/Foundry376/Mailspring/issues/326#issuecomment-343757775). You can share and browse Mailspring Themes, and discuss theme development with other developers, on our [Discourse](https://community.getmailspring.com/). diff --git a/app/internal_packages/composer-templates/lib/preferences-templates.tsx b/app/internal_packages/composer-templates/lib/preferences-templates.tsx index b6a67f14b..8d98c2a9e 100644 --- a/app/internal_packages/composer-templates/lib/preferences-templates.tsx +++ b/app/internal_packages/composer-templates/lib/preferences-templates.tsx @@ -12,7 +12,9 @@ interface ITemplate { path: string; name: string; } -const { Conversion: { convertFromHTML, convertToHTML } } = ComposerSupport; +const { + Conversion: { convertFromHTML, convertToHTML }, +} = ComposerSupport; interface TemplateEditorProps { template: ITemplate; @@ -82,7 +84,7 @@ class TemplateEditor extends React.Component<
{localizedReactFragment( 'Changes are saved automatically. View the %@ for tips and tricks.', - + {localized('Templates Guide')} )} diff --git a/app/internal_packages/preferences/lib/tabs/preferences-identity.tsx b/app/internal_packages/preferences/lib/tabs/preferences-identity.tsx index 25387bdab..f3cf9c032 100644 --- a/app/internal_packages/preferences/lib/tabs/preferences-identity.tsx +++ b/app/internal_packages/preferences/lib/tabs/preferences-identity.tsx @@ -48,8 +48,7 @@ class RefreshButton extends React.Component<{}, { refreshing: boolean }> { const ProTourFeatures = [ { - link: - 'https://foundry376.zendesk.com/hc/en-us/articles/115003340291--Add-reminders-to-sent-messages', + link: 'https://community.getmailspring.com/t/add-reminders-to-sent-messages/157', icon: `icon-composer-reminders.png`, title: localized(`Follow-up reminders`), text: localized( @@ -57,8 +56,7 @@ const ProTourFeatures = [ ), }, { - link: - 'https://foundry376.zendesk.com/hc/en-us/articles/115001881272--View-contact-and-company-profiles', + link: 'https://community.getmailspring.com/t/view-contact-and-company-profiles/159', icon: `toolbar-person-sidebar.png`, title: localized(`Rich contact profiles`), text: localized( @@ -67,7 +65,7 @@ const ProTourFeatures = [ }, { link: - 'https://foundry376.zendesk.com/hc/en-us/articles/115001875431--Enable-read-receipts-link-tracking-and-notifications', + 'https://community.getmailspring.com/t/read-receipts-link-tracking-and-activity-reports/162', icon: `icon-composer-eye.png`, title: localized(`Read Receipts`), text: localized( @@ -75,8 +73,7 @@ const ProTourFeatures = [ ), }, { - link: - 'https://foundry376.zendesk.com/hc/en-us/articles/115001875231--Reply-faster-with-email-templates', + link: 'https://community.getmailspring.com/t/reply-faster-with-email-templates/167', icon: `toolbar-templates.png`, title: localized(`Mail Templates`), text: localized( @@ -85,7 +82,7 @@ const ProTourFeatures = [ }, { link: - 'https://foundry376.zendesk.com/hc/en-us/articles/115001875431--Enable-read-receipts-link-tracking-and-notifications', + 'https://community.getmailspring.com/t/read-receipts-link-tracking-and-activity-reports/162', icon: `icon-composer-linktracking.png`, title: localized(`Link tracking`), text: localized( @@ -93,8 +90,7 @@ const ProTourFeatures = [ ), }, { - link: - 'https://foundry376.zendesk.com/hc/en-us/articles/115001882012--Schedule-messages-to-send-later', + link: 'https://community.getmailspring.com/t/schedule-messages-to-send-later/158', icon: `icon-composer-sendlater.png`, title: localized(`Send Later`), text: localized( @@ -102,8 +98,7 @@ const ProTourFeatures = [ ), }, { - link: - 'https://foundry376.zendesk.com/hc/en-us/articles/115001881272--View-contact-and-company-profiles', + link: 'https://community.getmailspring.com/t/view-contact-and-company-profiles/159', icon: `icon-composer-reminders.png`, title: localized(`Company overviews`), text: localized( @@ -111,8 +106,7 @@ const ProTourFeatures = [ ), }, { - link: - 'https://foundry376.zendesk.com/hc/en-us/articles/115001881232--Snooze-emails-to-handle-them-later', + link: 'https://community.getmailspring.com/t/snooze-emails-to-handle-them-later/161', icon: `toolbar-snooze.png`, title: localized(`Snooze messages`), text: localized( @@ -120,7 +114,8 @@ const ProTourFeatures = [ ), }, { - link: 'https://foundry376.zendesk.com/hc/en-us/articles/115002507891-Activity-Reports-In-Depth', + link: + 'https://community.getmailspring.com/t/read-receipts-link-tracking-and-activity-reports/162', icon: `icon-toolbar-activity.png`, title: localized(`Mailbox insights`), text: localized( @@ -128,7 +123,7 @@ const ProTourFeatures = [ ), }, { - link: 'https://foundry376.zendesk.com/hc/en-us/articles/360031102452', + link: 'https://community.getmailspring.com/t/automatically-translate-incoming-email/166', icon: `pro-feature-translation.png`, title: localized(`Automatic Translation`), text: localized( @@ -319,7 +314,7 @@ class PreferencesIdentity extends React.Component<{}, { identity: IIdentity }> { {`Mailspring ${planDisplayName}`}, - + {localized(`Help Center`)} )} diff --git a/app/internal_packages/preferences/lib/tabs/workspace-section.tsx b/app/internal_packages/preferences/lib/tabs/workspace-section.tsx index 07a986cc8..99d49090f 100644 --- a/app/internal_packages/preferences/lib/tabs/workspace-section.tsx +++ b/app/internal_packages/preferences/lib/tabs/workspace-section.tsx @@ -55,7 +55,9 @@ class DefaultMailClientItem extends React.Component<{}, DefaultMailClientItemSta style={{ marginBottom: 12 }} className="btn btn-small" onClick={() => - shell.openExternal('https://foundry376.zendesk.com/hc/en-us/articles/115002281851') + shell.openExternal( + 'https://community.getmailspring.com/t/choose-mailspring-as-the-default-mail-client-on-linux/191' + ) } > {localized('Use Mailspring as default mail client')} diff --git a/app/internal_packages/thread-search/lib/search-bar-util.ts b/app/internal_packages/thread-search/lib/search-bar-util.ts index b3df01429..019b28ff1 100644 --- a/app/internal_packages/thread-search/lib/search-bar-util.ts +++ b/app/internal_packages/thread-search/lib/search-bar-util.ts @@ -18,7 +18,7 @@ export const TokenAndTermRegexp = () => /(^|\s)(i[ns]?|s[iu]?[nb]?[cj]?e?c?t?|fr?o?m?|to?|ha?s?|be?f?o?r?e?|af?t?e?r?)(?::? ?$|: ?("[^"]*"?|[^\s]+))/gi; export const LearnMoreURL = - 'https://foundry376.zendesk.com/hc/en-us/articles/115002212931-Search-with-advanced-Gmail-style-queries'; + 'https://community.getmailspring.com/t/search-with-advanced-gmail-style-queries/153'; export const rankOfRole = role => { const rank = ['inbox', 'important', 'snoozed', 'sent', 'all', 'spam', 'trash'].indexOf(role); diff --git a/app/internal_packages/thread-sharing/lib/thread-sharing-popover.tsx b/app/internal_packages/thread-sharing/lib/thread-sharing-popover.tsx index 409ffb33f..73b162d15 100644 --- a/app/internal_packages/thread-sharing/lib/thread-sharing-popover.tsx +++ b/app/internal_packages/thread-sharing/lib/thread-sharing-popover.tsx @@ -144,7 +144,7 @@ export default class ThreadSharingPopover extends React.Component< )}
- + {localized('Learn More')}
diff --git a/app/menus/darwin.js b/app/menus/darwin.js index c01d8ac07..6c1d73cd0 100644 --- a/app/menus/darwin.js +++ b/app/menus/darwin.js @@ -268,7 +268,7 @@ module.exports = { { label: localized('Mailspring Help'), command: 'application:view-help' }, { type: 'separator' }, { label: localized('Getting Started Guide'), command: 'application:view-getting-started' }, - { label: localized('Frequently Asked Questions'), command: 'application:view-faq' }, + { label: localized('Mailspring Community'), command: 'application:view-community' }, ], }, ], diff --git a/app/menus/linux.js b/app/menus/linux.js index 3732dde64..b4510efb4 100644 --- a/app/menus/linux.js +++ b/app/menus/linux.js @@ -234,7 +234,7 @@ module.exports = { { label: localized('Mailspring Help'), command: 'application:view-help' }, { type: 'separator' }, { label: localized('Getting Started Guide'), command: 'application:view-getting-started' }, - { label: localized('Frequently Asked Questions'), command: 'application:view-faq' }, + { label: localized('Mailspring Community'), command: 'application:view-community' }, { type: 'separator' }, { label: localized('View License'), command: 'application:view-license' }, ], diff --git a/app/menus/win32.js b/app/menus/win32.js index 095caa467..9572c8688 100644 --- a/app/menus/win32.js +++ b/app/menus/win32.js @@ -212,7 +212,7 @@ module.exports = { label: localized('Getting Started Guide') + '...', command: 'application:view-getting-started', }, - { label: localized('Frequently Asked Questions') + '...', command: 'application:view-faq' }, + { label: localized('Mailspring Community') + '...', command: 'application:view-community' }, { type: 'separator' }, { label: localized('Sync New Mail Now'), command: 'window:sync-mail-now' }, { type: 'separator' }, diff --git a/app/src/browser/application.ts b/app/src/browser/application.ts index 0fff2ffa3..81a72bd29 100644 --- a/app/src/browser/application.ts +++ b/app/src/browser/application.ts @@ -394,19 +394,19 @@ export default class Application extends EventEmitter { }); this.on('application:view-help', () => { - const helpUrl = 'http://support.getmailspring.com/hc/en-us'; + const helpUrl = 'https://community.getmailspring.com/docs'; shell.openExternal(helpUrl); }); this.on('application:view-getting-started', () => { const helpUrl = - 'https://foundry376.zendesk.com/hc/en-us/sections/115000521592-Getting-Started'; + 'https://community.getmailspring.com/pub/quick-start-guide'; shell.openExternal(helpUrl); }); - this.on('application:view-faq', () => { + this.on('application:view-community', () => { const helpUrl = - 'https://foundry376.zendesk.com/hc/en-us/sections/115000521892-Frequently-Asked-Questions'; + 'https://community.getmailspring.com/'; shell.openExternal(helpUrl); });