Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions assets/app/vue/components/ServerSettingsCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const incomingServerDetails = computed(() =>
<tool-tip :alt="t('views.mail.sections.dashboard.whatIsImap')">
<i18n-t keypath="views.mail.sections.dashboard.whatIsImapContent" tag="span">
<template #supportUrl>
<a :href="WHAT_IS_IMAP_SUPPORT_URL" target="_blank">{{ t('views.mail.sections.dashboard.clickHere') }}</a>
<a :href="WHAT_IS_IMAP_SUPPORT_URL" target="_blank">{{ t('views.mail.sections.dashboard.whatIsImapArticleTitle') }}</a>
</template>
</i18n-t>
</tool-tip>
Expand All @@ -108,7 +108,7 @@ const incomingServerDetails = computed(() =>
<tool-tip :alt="t('views.mail.sections.dashboard.whatIsJmap')">
<i18n-t keypath="views.mail.sections.dashboard.whatIsJmapContent" tag="span">
<template #supportUrl>
<a :href="WHAT_IS_JMAP_SUPPORT_URL" target="_blank">{{ t('views.mail.sections.dashboard.clickHere') }}</a>
<a :href="WHAT_IS_JMAP_SUPPORT_URL" target="_blank">{{ t('views.mail.sections.dashboard.whatIsJmapArticleTitle') }}</a>
</template>
</i18n-t>
</tool-tip>
Expand Down Expand Up @@ -141,7 +141,7 @@ const incomingServerDetails = computed(() =>
<tool-tip :alt="t('views.mail.sections.dashboard.whatIsSmtp')">
<i18n-t keypath="views.mail.sections.dashboard.whatIsSmtpContent" tag="span">
<template #supportUrl>
<a :href="WHAT_IS_SMTP_SUPPORT_URL" target="_blank">{{ t('views.mail.sections.dashboard.clickHere') }}</a>
<a :href="WHAT_IS_SMTP_SUPPORT_URL" target="_blank">{{ t('views.mail.sections.dashboard.whatIsSmtpArticleTitle') }}</a>
</template>
</i18n-t>
</tool-tip>
Expand Down
10 changes: 5 additions & 5 deletions assets/app/vue/defines.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
export const APP_PASSWORD_SUPPORT_URL = 'https://support.tb.pro/hc/articles/46805020320275-Create-an-App-Password';
export const OTHER_APPS_SUPPORT_URL = 'https://support.tb.pro/hc/en-us/articles/45584951087635-Using-Thundermail-With-Other-Clients';
export const APP_PASSWORD_SUPPORT_URL = 'https://support.tb.pro/hc/articles/46805020320275-App-password-support';
export const OTHER_APPS_SUPPORT_URL = 'https://support.tb.pro/hc/articles/45584951087635-Using-Thundermail-with-other-clients';
export const WHAT_IS_IMAP_SUPPORT_URL = 'https://support.tb.pro/hc/articles/46108465880467-What-is-IMAP';
export const WHAT_IS_JMAP_SUPPORT_URL = 'https://support.tb.pro/hc/articles/46109214513939-What-is-JMAP';
export const WHAT_IS_SMTP_SUPPORT_URL = 'https://support.tb.pro/hc/articles/46106891841043-What-is-SMTP';
export const EMAIL_ALIASES_SUPPORT_URL = 'https://support.tb.pro/hc/articles/46804820453907';
export const EMAIL_ALIASES_CATCH_ALL_SUPPORT_URL = 'https://support.tb.pro/hc/articles/51338950680467';
export const EMAIL_ALIASES_SUPPORT_URL = 'https://support.tb.pro/hc/articles/46804820453907-Email-alises';
export const EMAIL_ALIASES_CATCH_ALL_SUPPORT_URL = 'https://support.tb.pro/hc/articles/51338950680467-Email-aliases-catchall';
export const DOWNLOAD_THUNDERBIRD_DESKTOP_URL = 'https://www.thunderbird.net/thunderbird/all?utm_campaign=main&utm_medium=tb_pro&utm_source=thundermail_dashboard&utm_content=desktop_download';
export const DOWNLOAD_THUNDERBIRD_MOBILE_URL = 'https://play.google.com/store/apps/details?id=net.thunderbird.android&referrer=utm_campaign%3Dmain%26utm_medium%3Dtb_pro%26utm_source%3Dthundermail_dashboard%26utm_content%3Dmobile_download';
export const IOS_SUPPORT_URL = 'https://support.tb.pro/hc/en-us/articles/51053665815827-Setting-Up-Thundermail-on-iOS';
export const IOS_SUPPORT_URL = 'https://support.tb.pro/hc/articles/51053665815827-Setting-Up-Thundermail-on-iOS';
export const STATUS_PAGE_URL = 'https://status.tb.pro/';
export const TERMS_OF_SERVICE_URL = 'https://tb.pro/terms/';
export const PRIVACY_POLICY_URL = 'https://tb.pro/privacy/';
Expand Down
20 changes: 11 additions & 9 deletions assets/app/vue/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,14 @@
"server": "SERVER:",
"port": "PORT:",
"whatIsSmtp": "What is SMTP?",
"whatIsSmtpContent": "SMTP stands for Simple Mail Transfer Protocol. It enables an email client (such as Thunderbird) to deliver messages to other email addresses through a mail server. For more information, {supportUrl}.",
"whatIsSmtpArticleTitle": "What is SMTP?",
"whatIsSmtpContent": "SMTP stands for Simple Mail Transfer Protocol. It enables an email client (such as Thunderbird) to deliver messages to other email addresses through a mail server. For more information, see {supportUrl}",
"whatIsImap": "What is IMAP?",
"whatIsImapContent": "IMAP stands for Internet Message Access Protocol. It allows an email client (such as Thunderbird) to access messages stored on a mail server. For more information, {supportUrl}.",
"whatIsImapArticleTitle": "What is IMAP?",
"whatIsImapContent": "IMAP stands for Internet Message Access Protocol. It allows an email client (such as Thunderbird) to access messages stored on a mail server. For more information, see {supportUrl}",
"whatIsJmap": "What is JMAP?",
"whatIsJmapContent": "JMAP stands for JSON Meta Application Protocol. It’s a robust way to receive and relay mail server messages in modern web-based or mobile environments. For more information, {supportUrl}.",
"clickHere": "click here",
"whatIsJmapArticleTitle": "What is JMAP?",
"whatIsJmapContent": "JMAP stands for JSON Meta Application Protocol. It’s a robust way to receive and relay mail server messages in modern web-based or mobile environments. For more information, see {supportUrl}",
"copyServer": "Copy server hostname to clipboard",
"copyPort": "Copy server port to clipboard"
},
Expand All @@ -165,15 +167,15 @@
"displayName": "Display name",
"appPassword": "App Password",
"appPasswords": "App Passwords",
"clickHere": "click here",
"close": "Close",
"change": "change",
"set": "Set",
"notSet": "Not set",
"changePasswordDescription": "Use this separate password to connect apps that can't use your regular Thundermail sign-in.",
"changePasswordDescriptionTwo": "Misplaced it? Create a new one.",
"createPasswordDescriptionTwo": "Once set, it can't be viewed or recovered.",
"createPasswordTooltip": "For security reasons, this password is never stored or shown again. For more information, {supportUrl}.",
"appPasswordArticleTitle": "Create an App Password",
"createPasswordTooltip": "For security reasons, this password is never stored or shown again. For more information, see {supportUrl}.",
"changePasswordTooltip": "Changing your app password will log you out of all current email clients.",
"changePasswordButtonLabel": "Change app password",
"createPasswordButtonLabel": "Create app password",
Expand Down Expand Up @@ -211,9 +213,9 @@
"newDisplayName": "New display name",
"displayNamePlaceholder": "Enter your display name",
"displayNameRequired": "Display name is required",
"emailAliasesLearnMore": "Learn more",
"emailAliasesCatchAllLearnMore": "support article",
"emailAliasSupportText": "{emailAliasesSupportLink} about how to setup email aliases. For catch-all aliases, check out this {emailAliasesCatchAllSupportLink}."
"emailAliasesArticleTitle": "Setting Up Email Aliases",
"emailAliasesCatchAllArticleTitle": "Setting Up a Catch-All Alias",
"emailAliasSupportText": "For help with aliases, see {emailAliasesSupportLink}. For catch-all aliases, see {emailAliasesCatchAllSupportLink}."
},
"customDomains": {
"customDomains": "Custom Domains",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const onCancelSetPassword = () => {
<tool-tip :alt="t('views.mail.sections.emailSettings.createPasswordTooltip')">
<i18n-t keypath="views.mail.sections.emailSettings.createPasswordTooltip" tag="span">
<template #supportUrl>
<a :href="APP_PASSWORD_SUPPORT_URL" target="_blank">{{ t('views.mail.sections.emailSettings.clickHere') }}</a>
<a :href="APP_PASSWORD_SUPPORT_URL" target="_blank">{{ t('views.mail.sections.emailSettings.appPasswordArticleTitle') }}</a>
</template>
</i18n-t>
</tool-tip>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ watch(selectedDomain, () => {
<i18n-t keypath="views.mail.sections.emailSettings.emailAliasSupportText" tag="p" class="email-alias-support-text">
<template #emailAliasesSupportLink>
<a :href="EMAIL_ALIASES_SUPPORT_URL" target="_blank" rel="noopener noreferrer">
{{ t('views.mail.sections.emailSettings.emailAliasesLearnMore') }}
{{ t('views.mail.sections.emailSettings.emailAliasesArticleTitle') }}
</a>
</template>
<template #emailAliasesCatchAllSupportLink>
<a :href="EMAIL_ALIASES_CATCH_ALL_SUPPORT_URL" target="_blank" rel="noopener noreferrer">
{{ t('views.mail.sections.emailSettings.emailAliasesCatchAllLearnMore') }}
{{ t('views.mail.sections.emailSettings.emailAliasesCatchAllArticleTitle') }}
</a>
</template>
</i18n-t>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ const onDeleteAliasError = (error: string) => {
<tool-tip id="catch-all-tooltip" :alt="t('views.mail.sections.emailSettings.catchAllTooltip')">
<i18n-t keypath="views.mail.sections.emailSettings.catchAllTooltip" tag="span">
<template #supportUrl>
<!-- Uncomment when a support article exists. -->
<!--<a href="" target="_blank">{{ t('views.mail.sections.emailSettings.clickHere') }}</a>-->
<!-- Add a supportUrl link when a support article exists. -->
</template>
</i18n-t>
</tool-tip>
Expand Down
Loading