From c1d5e9a9e630cc914fa0493beb88226576510ea7 Mon Sep 17 00:00:00 2001
From: Ari Autio <ari.autio@iki.fi>
Date: Wed, 1 Mar 2017 10:44:52 +0200
Subject: PLT-5571: Updated error messages related to url length, start, end
 and adjacent underscores (#5550)

---
 webapp/components/change_url_modal.jsx | 8 ++++----
 webapp/i18n/en.json                    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/components/change_url_modal.jsx b/webapp/components/change_url_modal.jsx
index 009a9b798..509517678 100644
--- a/webapp/components/change_url_modal.jsx
+++ b/webapp/components/change_url_modal.jsx
@@ -50,7 +50,7 @@ export default class ChangeUrlModal extends React.Component {
                 <span key='error1'>
                     <FormattedMessage
                         id='change_url.longer'
-                        defaultMessage='Must be longer than two characters'
+                        defaultMessage='URL must be two or more characters.'
                     />
                     <br/>
                 </span>
@@ -61,7 +61,7 @@ export default class ChangeUrlModal extends React.Component {
                 <span key='error2'>
                     <FormattedMessage
                         id='change_url.startWithLetter'
-                        defaultMessage='Must start with a letter or number'
+                        defaultMessage='URL must start with a letter or number.'
                     />
                     <br/>
                 </span>
@@ -72,7 +72,7 @@ export default class ChangeUrlModal extends React.Component {
                 <span key='error3'>
                     <FormattedMessage
                         id='change_url.endWithLetter'
-                        defaultMessage='Must end with a letter or number'
+                        defaultMessage='URL must end with a letter or number.'
                     />
                     <br/>
                 </span>);
@@ -82,7 +82,7 @@ export default class ChangeUrlModal extends React.Component {
                 <span key='error4'>
                     <FormattedMessage
                         id='change_url.noUnderscore'
-                        defaultMessage='Can not contain two underscores in a row.'
+                        defaultMessage='URL can not contain two underscores in a row.'
                     />
                     <br/>
                 </span>);
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 8200c041a..cb8529c6b 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1052,11 +1052,11 @@
   "calling_screen": "Calling",
   "center_panel.recent": "Click here to jump to recent messages. ",
   "change_url.close": "Close",
-  "change_url.endWithLetter": "Must end with a letter or number",
+  "change_url.endWithLetter": "URL must end with a letter or number.",
   "change_url.invalidUrl": "Invalid URL",
-  "change_url.longer": "Must be longer than two characters",
-  "change_url.noUnderscore": "Can not contain two underscores in a row.",
-  "change_url.startWithLetter": "Must start with a letter or number",
+  "change_url.longer": "URL must be two or more characters.",
+  "change_url.noUnderscore": "URL can not contain two underscores in a row.",
+  "change_url.startWithLetter": "URL must start with a letter or number.",
   "channelHeader.addToFavorites": "Add to Favorites",
   "channelHeader.removeFromFavorites": "Remove from Favorites",
   "channel_flow.alreadyExist": "A channel with that URL already exists",
-- 
cgit v1.2.3-1-g7c22