fix after test-1

mattermost · Feb 9, 2017 · 5a8600d · 5a8600d
1 parent 4a7cebd
commit 5a8600d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/webapp/components/rename_channel_modal.jsx b/webapp/components/rename_channel_modal.jsx
@@ -28,7 +28,7 @@ const holders = defineMessages({
     },
     url: {
         id: 'rename_channel.url',
-        defaultMessage: 'Url'
+        defaultMessage: 'URL'
     },
     defaultError: {
         id: 'rename_channel.defaultError',
@@ -224,7 +224,7 @@ export class RenameChannelModal extends React.Component {
         }
 
         const fullUrl = TeamStore.getCurrentTeamUrl() + '/channels';
-        const shortUrl = getShortenedURL(fullUrl);
+        const shortUrl = getShortenedURL(fullUrl, 35);
         const urlTooltip = (
             <Tooltip id='urlTooltip'>{fullUrl}</Tooltip>
         );

diff --git a/webapp/utils/url.jsx b/webapp/utils/url.jsx
@@ -9,9 +9,10 @@ export function cleanUpUrlable(input) {
     return cleaned;
 }
 
-export function getShortenedURL(url = '') {
+export function getShortenedURL(url = '', getLength = 27) {
     if (url.length > 35) {
-        return url.substring(0, 10) + '...' + url.substring(url.length - 12, url.length) + '/';
+        const subLength = getLength - 14;
+        return url.substring(0, 10) + '...' + url.substring(url.length - subLength, url.length) + '/';
     }
     return url + '/';
 }