PLT-5281 error messages contain a link to documentation about reserve…

…d words
mattermost · Feb 25, 2017 · 8f9530c · 8f9530c
1 parent 97cc0a0
commit 8f9530c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx
@@ -81,9 +81,9 @@ export default class TeamUrl extends React.Component {
         for (let index = 0; index < Constants.RESERVED_TEAM_NAMES.length; index++) {
             if (cleanedName.indexOf(Constants.RESERVED_TEAM_NAMES[index]) === 0) {
                 this.setState({nameError: (
-                    <FormattedMessage
+                    <FormattedHTMLMessage
                         id='create_team.team_url.taken'
-                        defaultMessage='URL is taken or contains a reserved word'
+                        defaultMessage='This URL <a href="https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url" target="_blank">starts with a reserved word</a> or is unavailable. Please try another.'
                     />)
                 });
                 return;
@@ -101,7 +101,7 @@ export default class TeamUrl extends React.Component {
                     this.setState({nameError: (
                         <FormattedMessage
                             id='create_team.team_url.unavailable'
-                            defaultMessage='This URL is unavailable. Please try another.'
+                            defaultMessage='This URL is taken or unavailable. Please try another.'
                         />)
                     });
                     this.setState({isLoading: false});

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
@@ -1217,9 +1217,9 @@
   "create_team.team_url.hint": "<li>Short and memorable is best</li><li>Use lowercase letters, numbers and dashes</li><li>Must start with a letter and can't end in a dash</li>",
   "create_team.team_url.regex": "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.",
   "create_team.team_url.required": "This field is required",
-  "create_team.team_url.taken": "URL is taken or contains a reserved word",
+  "create_team.team_url.taken": "This URL <a href=\"https://docs.mattermost.com/help/getting-started/creating-teams.html#team-url\" target=\"_blank\">starts with a reserved word</a> or is unavailable. Please try another.",
   "create_team.team_url.teamUrl": "Team URL",
-  "create_team.team_url.unavailable": "This URL is unavailable. Please try another.",
+  "create_team.team_url.unavailable": "This URL is taken or unavailable. Please try another.",
   "create_team.team_url.webAddress": "Choose the web address of your new team:",
   "custom_emoji.empty": "No custom emoji found",
   "custom_emoji.header": "Custom Emoji",

diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
@@ -1625,6 +1625,11 @@ label span {
     pointer-events: none;
 }
 
+// PLT-5281: link inside a localized message was not clickable because of the rule above
+label span a {
+    pointer-events: all;
+}
+
 @media screen and (-webkit-min-device-pixel-ratio: 0) {
     select,
     textarea,