Merge pull request #2573 from uProxy/ellePossibleHelp

Add helpful messages and links to feedback submission

Author: Elewis97

src/generic_ui/locales/en/messages.json

@@ -175,14 +175,38 @@
     "description": "Message helping make sure the user understands that personally identifiable information may be included in their feedback to uProxy.",
     "message": "Your feedback and email address will be sent to uProxy.org. Your logs, network information and email may include personally identifiable information."
   },
-  "THANK_YOU": {
+  "FEEDBACK_TITLE": {
     "description": "",
     "message": "Thank you!"
   },
+  "FEEDBACK_TITLE_4": {
+    "description": "",
+    "message": "Trouble signing in"
+  },
+  "FEEDBACK_TITLE_5": {
+    "description": "",
+    "message": "No friends to proxy from"
+  },
+  "FEEDBACK_TITLE_6": {
+    "description": "",
+    "message": "Can't start connection"
+  },
   "FEEDBACK_SUBMITTED": {
     "description": "User feedback was successfully submitted.",
     "message": "Your feedback has been submitted to the uProxy development team."
   },
+  "FEEDBACK_SUBMITTED_4": {
+    "description": "Trouble signing in feedback error.",
+    "message": "Login will fail if you try a social network that is blocked.  Thanks for your feedback! <uproxy-faq-link anchor='willUproxyWork'>Learn more.</uproxy-faq-link>"
+  },
+  "FEEDBACK_SUBMITTED_5": {
+    "description": "No friends feedback error.",
+    "message": "Consider using uProxy cloud servers.  Thanks for your feedback! <uproxy-faq-link anchor='whatAreCloudServers'>Learn more.</uproxy-faq-link>"
+  },
+  "FEEDBACK_SUBMITTED_6": {
+    "description": "Trouble connecting feedback error.",
+    "message": "Sometimes uProxy relies on port control to establish a connection, but that might not be available for your network.  Thanks for your feedback! <uproxy-faq-link anchor='whatIsPortControl'>Learn more.</uproxy-faq-link>"
+  },
   "EMAIL_INSTEAD_TITLE": {
     "description": "Title for error that appears if feedback submission failed.",
     "message": "Email feedback instead?"

src/generic_ui/polymer/feedback.ts

@@ -52,6 +52,27 @@ Polymer({
       browserInfo: navigator.userAgent,
       feedbackType: this.feedbackType
     }).then(() => {
+    var messages : {[key: number]: [string, string]} = {
+      0: ['FEEDBACK_SUBMITTED', 'FEEDBACK_TITLE'],
+      1: ['FEEDBACK_SUBMITTED', 'FEEDBACK_TITLE'],
+      2: ['FEEDBACK_SUBMITTED', 'FEEDBACK_TITLE'],
+      3: ['FEEDBACK_SUBMITTED', 'FEEDBACK_TITLE'],
+      4: ['FEEDBACK_SUBMITTED_4', 'FEEDBACK_TITLE_4'],
+      5: ['FEEDBACK_SUBMITTED_5', 'FEEDBACK_TITLE_5'],
+      6: ['FEEDBACK_SUBMITTED_6', 'FEEDBACK_TITLE_6'],
+      7: ['FEEDBACK_SUBMITTED', 'FEEDBACK_TITLE'],
+      8: ['FEEDBACK_SUBMITTED', 'FEEDBACK_TITLE']
+    };
+      // root.ts listens for open-dialog signals and shows a popup
+      // when it receives these events.
+      this.$.state.openDialog(dialogs.getMessageDialogDescription(
+          translator.i18n_t(messages[this.$.errorInput.selected][1]),
+          translator.i18n_t(messages[this.$.errorInput.selected][0]),
+          translator.i18n_t('DONE'))).then(() => {
+        this.fire('core-signal', { name: 'close-settings' });
+      }, () => {/*MT*/});
+      this.close();
+      this.$.sendingFeedbackDialog.close();
       // Reset the placeholders, which seem to be cleared after the
       // user types input in the input fields.
       this.$.emailInput.placeholder = ui.i18n_t('EMAIL_PLACEHOLDER');
@@ -66,16 +87,6 @@ Polymer({
       this.feedback = '';
       this.feedbackType = null;
       this.$.logCheckbox.checked = false;
-      // root.ts listens for open-dialog signals and shows a popup
-      // when it receives these events.
-      this.$.state.openDialog(dialogs.getMessageDialogDescription(
-          translator.i18n_t('THANK_YOU'),
-          translator.i18n_t('FEEDBACK_SUBMITTED'),
-          translator.i18n_t('DONE'))).then(() => {
-        this.fire('core-signal', { name: 'close-settings' });
-      }, () => {/*MT*/});
-      this.close();
-      this.$.sendingFeedbackDialog.close();
     }).catch((e :Error) => {
       this.$.state.openDialog(dialogs.getMessageDialogDescription(
           translator.i18n_t('EMAIL_INSTEAD_TITLE'),