diff --git a/resources/original_messages.json b/resources/original_messages.json
index 9bb26568012..9d8440aa6fd 100644
--- a/resources/original_messages.json
+++ b/resources/original_messages.json
@@ -37,7 +37,7 @@
},
"cancel": {
"description": "The text on a button to cancel the current operation.",
- "message": "cancel"
+ "message": "Cancel"
},
"change_language_page_title": {
"description": "The menu item text and title of a page for a user to set the app language.",
@@ -59,6 +59,90 @@
"description": "A status message on a particular server that indicates the application is currently trying to connect to the labeled server.",
"message": "Connecting..."
},
+ "contact_page_title": {
+ "description": "The menu item text and title of a page for a user to contact the support team.",
+ "message": "Contact us"
+ },
+ "contact_view_exit_cannot_add_server": {
+ "description": "Message shown to users who are trying to contact support about an unsupported issue.",
+ "message": "The Outline team is not able to assist with adding a server. Please try the troubleshooting steps listed $START_OF_LINK$here$END_OF_LINK$ and then contact the person who gave you the access key to troubleshoot this issue.",
+ "placeholders": {
+ "END_OF_LINK": {
+ "content": "{closeLink}"
+ },
+ "START_OF_LINK": {
+ "content": "{openLink}"
+ }
+ }
+ },
+ "contact_view_exit_connection": {
+ "description": "Message shown to users who are trying to contact support about an unsupported issue.",
+ "message": "The Outline team is not able to assist with connecting to a server. Please try the troubleshooting steps listed $START_OF_LINK$hereEND_OF_LINK and then contact the person who gave you the access key to troubleshoot this issue.",
+ "placeholders": {
+ "END_OF_LINK": {
+ "content": "{closeLink}"
+ },
+ "START_OF_LINK": {
+ "content": "{openLink}"
+ }
+ }
+ },
+ "contact_view_exit_no_server": {
+ "description": "Message shown to users who are trying to contact support about an unsupported issue.",
+ "message": "The Outline team does not distribute free or paid access keys. $START_OF_LINK$Learn more about how to get an access key.END_OF_LINK",
+ "placeholders": {
+ "END_OF_LINK": {
+ "content": "{closeLink}"
+ },
+ "START_OF_LINK": {
+ "content": "{openLink}"
+ }
+ }
+ },
+ "contact_view_exit_open_ticket": {
+ "description": "Message shown to users who are trying to contact support again while having a pending support ticket open.",
+ "message": "We are currently experiencing high support volume and appreciate your patience. Please do not submit a new request for this concern. If you have additional information to provide, please reply to the initial email about this request."
+ },
+ "contact_view_intro": {
+ "description": "Introduction message to users who are looking to contact support.",
+ "message": "Tell us how we can help. Please explain your issue in detail and do not enter personal information that is not requested below."
+ },
+ "contact_view_issue_cannot_add_server": {
+ "description": "Item in a dropdown menu on our contact page to select the issue the user is trying to contact support about.",
+ "message": "I am having trouble adding a server using my access key"
+ },
+ "contact_view_issue_connection": {
+ "description": "Item in a dropdown menu on our contact page to select the issue the user is trying to contact support about.",
+ "message": "I am having trouble connecting to my Outline VPN server"
+ },
+ "contact_view_issue_general": {
+ "description": "Item in a dropdown menu on our contact page to select the issue the user is trying to contact support about.",
+ "message": "General feedback & suggestions"
+ },
+ "contact_view_issue_installation": {
+ "description": "Item in a dropdown menu on our contact page to select the issue the user is trying to contact support about.",
+ "message": "I am having trouble installing Outline"
+ },
+ "contact_view_issue_managing": {
+ "description": "Item in a dropdown menu on our contact page to select the issue the user is trying to contact support about.",
+ "message": "I need assistance managing my Outline VPN server or helping others connect to it"
+ },
+ "contact_view_issue_no_server": {
+ "description": "Item in a dropdown menu on our contact page to select the issue the user is trying to contact support about.",
+ "message": "I need an access key"
+ },
+ "contact_view_issue_performance": {
+ "description": "Item in a dropdown menu on our contact page to select the issue the user is trying to contact support about.",
+ "message": "My internet access is slow while connected to my Outline VPN server"
+ },
+ "contact_view_issue": {
+ "description": "Label of a Contact Support form input field.",
+ "message": "Outline issue"
+ },
+ "contact_view_open_ticket": {
+ "description": "Label for a Contact Support form asking if the user already has a pending ticket open with support.",
+ "message": "Do you have an open ticket for this issue?"
+ },
"data_collection": {
"description": "The text for a main menu item that takes the user to a webpage explaining the application's data collection policies.",
"message": "Data collection"
@@ -469,6 +553,50 @@
"description": "Status text showing that a form is progress of being submitted.",
"message": "Submitting..."
},
+ "support_form_access_key_source": {
+ "description": "Label of a Contact Support form input field.",
+ "message": "Where did you get your access key?"
+ },
+ "support_form_cloud_provider_aws": {
+ "description": "Item in a dropdown menu to select the cloud provider that the user is contacting support about.",
+ "message": "Amazon Web Services"
+ },
+ "support_form_cloud_provider_digitalocean": {
+ "description": "Item in a dropdown menu to select the cloud provider that the user is contacting support about.",
+ "message": "DigitalOcean"
+ },
+ "support_form_cloud_provider_gcloud": {
+ "description": "Item in a dropdown menu to select the cloud provider that the user is contacting support about.",
+ "message": "Google Cloud"
+ },
+ "support_form_cloud_provider_other": {
+ "description": "Item in a dropdown menu to select an unknown cloud provider that the user is contacting support about.",
+ "message": "Other"
+ },
+ "support_form_cloud_provider": {
+ "description": "Label of a Contact Support form input field.",
+ "message": "Cloud Provider"
+ },
+ "support_form_description": {
+ "description": "Label of a Contact Support form input field.",
+ "message": "Description of the issue"
+ },
+ "support_form_email_invalid": {
+ "description": "Error message shown to a user supplying an invalid email address on the Contact Support form.",
+ "message": "You have entered an invalid format."
+ },
+ "support_form_email": {
+ "description": "Label of a Contact Support form input field.",
+ "message": "Email"
+ },
+ "support_form_required_field": {
+ "description": "Text on a Contact Support form indicating that a field is required.",
+ "message": "Required field"
+ },
+ "support_form_subject": {
+ "description": "Label of a Contact Support form input field.",
+ "message": "Subject"
+ },
"terms": {
"description": "The text for a main menu item that takes the user to the applications Terms of Service.",
"message": "Terms"
diff --git a/src/www/messages/en.json b/src/www/messages/en.json
index 991e5decfa9..823cf34affd 100644
--- a/src/www/messages/en.json
+++ b/src/www/messages/en.json
@@ -10,9 +10,9 @@
"connected-server-state": "Connected",
"connecting-server-state": "Connecting...",
"contact-page-title": "Contact us",
- "contact-view-exit-cannot-add-server": "The Outline team is not able to assist with adding a server. Please try the troubleshooting steps listed {beginUrl}here{endUrl} and then contact the person who gave you the access key to troubleshoot this issue.",
- "contact-view-exit-connection": "The Outline team is not able to assist with connecting to a server. Please try the troubleshooting steps listed {beginUrl}here{endUrl} and then contact the person who gave you the access key to troubleshoot this issue.",
- "contact-view-exit-no-server": "The Outline team does not distribute free or paid access keys. {beginUrl}Learn more about how to get an access key.{endUrl}",
+ "contact-view-exit-cannot-add-server": "The Outline team is not able to assist with adding a server. Please try the troubleshooting steps listed {openLink}here{closeLink} and then contact the person who gave you the access key to troubleshoot this issue.",
+ "contact-view-exit-connection": "The Outline team is not able to assist with connecting to a server. Please try the troubleshooting steps listed {openLink}here{closeLink} and then contact the person who gave you the access key to troubleshoot this issue.",
+ "contact-view-exit-no-server": "The Outline team does not distribute free or paid access keys. {openLink}Learn more about how to get an access key.{closeLink}",
"contact-view-exit-open-ticket": "We are currently experiencing high support volume and appreciate your patience. Please do not submit a new request for this concern. If you have additional information to provide, please reply to the initial email about this request.",
"contact-view-intro": "Tell us how we can help. Please explain your issue in detail and do not enter personal information that is not requested below.",
"contact-view-issue-cannot-add-server": "I am having trouble adding a server using my access key",
diff --git a/src/www/views/contact_view/index.ts b/src/www/views/contact_view/index.ts
index 30bd41bb34e..c7286f5b564 100644
--- a/src/www/views/contact_view/index.ts
+++ b/src/www/views/contact_view/index.ts
@@ -183,9 +183,9 @@ export class ContactView extends LitElement {
// TODO: Consider moving this functionality to a more centralized place for re-use.
private localizeWithUrl(messageID: string, url: string): TemplateResult {
- const beginUrl = ``;
- const endUrl = '';
- return html` ${unsafeHTML(this.localize(messageID, 'beginUrl', beginUrl, 'endUrl', endUrl))} `;
+ const openLink = ``;
+ const closeLink = '';
+ return html` ${unsafeHTML(this.localize(messageID, 'openLink', openLink, 'closeLink', closeLink))} `;
}
private get renderIntroTemplate(): TemplateResult {