diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-03-06 01:02:27 -0300 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-03-06 01:02:27 -0300 |
| commit | 93b8fdc9e4c1c8e074a46a7f96674e812adf36ec (patch) | |
| tree | 12d98b2d7b8fc7e6251c4ee43a978ade37afeaab /web/react | |
| parent | 81ccfca2bfc91779d7bf00dbccb6f932d285a87c (diff) | |
| download | chat-93b8fdc9e4c1c8e074a46a7f96674e812adf36ec.tar.gz chat-93b8fdc9e4c1c8e074a46a7f96674e812adf36ec.tar.bz2 chat-93b8fdc9e4c1c8e074a46a7f96674e812adf36ec.zip | |
Fix for PLT-2218 & PLT-2222
- Also includes missing loc strings for frontend es.json
- Sort web [locale].json by id
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/admin_console/license_settings.jsx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/web/react/components/admin_console/license_settings.jsx b/web/react/components/admin_console/license_settings.jsx index fdbe912ef..d4dfa13f2 100644 --- a/web/react/components/admin_console/license_settings.jsx +++ b/web/react/components/admin_console/license_settings.jsx @@ -120,8 +120,7 @@ class LicenseSettings extends React.Component { expires: Utils.displayDate(parseInt(global.window.mm_license.ExpiresAt, 10)), ldap: global.window.mm_license.LDAP }} - defaultMessage='<div><p>This compiled release of Mattermost platform is provided under a <a href="http://mattermost.com" target="_blank">commercial license</a> - from Mattermost, Inc. based on your subscription level and is subject to the <a href="{terms}" target="_blank">Terms of Service.</a></p> + defaultMessage='<div><p>This compiled release of Mattermost platform is provided under a <a href="http://mattermost.com" target="_blank">commercial license</a> from Mattermost, Inc. based on your subscription level and is subject to the <a href="{terms}" target="_blank">Terms of Service.</a></p> <p>Your subscription details are as follows:</p> Name: {name}<br /> Company or organization name: {company}<br/> @@ -152,9 +151,7 @@ class LicenseSettings extends React.Component { <p className='help-text'> <FormattedHTMLMessage id='admin.licence.keyMigration' - defaultMessage='If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, - <a href="http://mattermost.com" target="_blank">disable all Enterprise Edition features on this server</a>. - This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.' + defaultMessage='If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href="http://mattermost.com" target="_blank">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.' /> </p> </div> |