Merge release branch commits

webapp/components/about_build_modal.jsx

@@ -24,7 +24,7 @@ export default class AboutBuildModal extends React.Component {
         let title = (
             <FormattedMessage
                 id='about.teamEditiont0'
-                defaultMessage='Team Edition T0'
+                defaultMessage='Team Edition'
             />
         );
 
@@ -33,14 +33,14 @@ export default class AboutBuildModal extends React.Component {
             title = (
                 <FormattedMessage
                     id='about.teamEditiont1'
-                    defaultMessage='Team Edition T1'
+                    defaultMessage='Enterprise Edition'
                 />
             );
             if (license.IsLicensed === 'true') {
                 title = (
                     <FormattedMessage
                         id='about.enterpriseEditione1'
-                        defaultMessage='Enterprise Edition E1'
+                        defaultMessage='Enterprise Edition'
                     />
                 );
                 licensee = (

webapp/components/admin_console/license_settings.jsx

@@ -105,36 +105,27 @@ class LicenseSettings extends React.Component {
         let licenseType;
         let licenseKey;
 
+        const issued = Utils.displayDate(parseInt(global.window.mm_license.IssuedAt, 10)) + ' ' + Utils.displayTime(parseInt(global.window.mm_license.IssuedAt, 10), true);
+        const startsAt = Utils.displayDate(parseInt(global.window.mm_license.StartsAt, 10));
+        const expiresAt = Utils.displayDate(parseInt(global.window.mm_license.ExpiresAt, 10));
+
         if (global.window.mm_license.IsLicensed === 'true') {
-            edition = (
+            // Note: DO NOT LOCALISE THESE STRINGS. Legally we can not since the license is in English.
-                <FormattedMessage
+            edition = 'Mattermost Enterprise Edition. Enterprise features on this server have been unlocked with a license key and a valid subscription.';
-                    id='admin.license.enterpriseEdition'
-                    defaultMessage='Mattermost Enterprise Edition. Designed for enterprise-scale communication.'
-                />
-            );
             licenseType = (
-                <FormattedHTMLMessage
+                <div>
-                    id='admin.license.enterpriseType'
+                    <p>
-                    values={{
+                        {'This software is offered under a commercial license.\n\nSee ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system.\n\nYour subscription details are as follows:'}
-                        terms: global.window.mm_config.TermsOfServiceLink,
+                    </p>
-                        name: global.window.mm_license.Name,
+                    {`Name: ${global.window.mm_license.Name}`}<br/>
-                        company: global.window.mm_license.Company,
+                    {`Company or organization name: ${global.window.mm_license.Company}`}<br/>
-                        users: global.window.mm_license.Users,
+                    {`Number of users: ${global.window.mm_license.Users}`}<br/>
-                        issued: Utils.displayDate(parseInt(global.window.mm_license.IssuedAt, 10)) + ' ' + Utils.displayTime(parseInt(global.window.mm_license.IssuedAt, 10), true),
+                    {`License issued: ${issued}`}<br/>
-                        start: Utils.displayDate(parseInt(global.window.mm_license.StartsAt, 10)),
+                    {`Start date of license: ${startsAt}`}<br/>
-                        expires: Utils.displayDate(parseInt(global.window.mm_license.ExpiresAt, 10)),
+                    {`Expiry date of license: ${expiresAt}`}<br/>
-                        ldap: global.window.mm_license.LDAP
+                    <br/>
-                    }}
+                    {'See also '}<a href='https://about.mattermost.com/enterprise-edition-terms/'>{'Enterprise Edition Terms of Service'}</a>{' and '}<a href='https://about.mattermost.com/privacy/'>{'Privacy Policy.'}</a>
-                    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>
+                </div>
-                    <p>Your subscription details are as follows:</p>
-                    Name: {name}<br />
-                    Company or organization name: {company}<br/>
-                    Number of users: {users}<br/>
-                    License issued: {issued}<br/>
-                    Start date of license: {start}<br/>
-                    Expiry date of license: {expires}<br/>
-                    LDAP: {ldap}<br/></div>'
-                />
             );
 
             licenseKey = (
@@ -162,20 +153,15 @@ class LicenseSettings extends React.Component {
                 </div>
             );
         } else {
+            // Note: DO NOT LOCALISE THESE STRINGS. Legally we can not since the license is in English.
             edition = (
-                <FormattedMessage
+                <p>
-                    id='admin.license.teamEdition'
+                    {'Mattermost Enterprise Edition. Unlock enterprise features in this software through the purchase of a subscription from '}
-                    defaultMessage='Mattermost Team Edition. Designed for teams from 5 to 50 users.'
+                    <a href='https://mattermost.com/'>{'https://mattermost.com/'}</a>
-                />
+                </p>
             );
 
-            licenseType = (
+            licenseType = 'This software is offered under a commercial license.\n\nSee ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system.';
-                <FormattedHTMLMessage
-                    id='admin.license.teamType'
-                    defaultMessage='<span><p>This compiled release of Mattermost platform is offered under an MIT license.</p>
-                    <p>See MIT-COMPILED-LICENSE.txt in your root install directory for details. See NOTICES.txt for information about open source software used in this system.</p></span>'
-                />
-            );
 
             let fileName;
             if (this.state.fileName) {

webapp/i18n/en.json

@@ -1,12 +1,12 @@
 {
   "about.close": "Close",
   "about.date": "Build Date:",
-  "about.enterpriseEditione1": "Enterprise Edition E1",
+  "about.enterpriseEditione1": "Enterprise Edition",
   "about.hash": "Build Hash:",
   "about.licensed": "Licensed by:",
   "about.number": "Build Number:",
-  "about.teamEditiont0": "Team Edition T0",
+  "about.teamEditiont0": "Team Edition",
-  "about.teamEditiont1": "Team Edition T1",
+  "about.teamEditiont1": "Enterprise Edition",
   "about.title": "About Mattermost",
   "about.version": "Version:",
   "access_history.title": "Access History",
@@ -230,15 +230,9 @@
   "admin.ldap.usernameAttrTitle": "Username Attribute:",
   "admin.licence.keyMigration": "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.",
   "admin.license.chooseFile": "Choose File",
-  "admin.license.edition": "Edition: ",
-  "admin.license.enterpriseEdition": "Mattermost Enterprise Edition. Designed for enterprise-scale communication.",
-  "admin.license.enterpriseType": "<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/>Number of users: {users}<br/>License issued: {issued}<br/>Start date of license: {start}<br/>Expiry date of license: {expires}<br/>LDAP: {ldap}<br/></div>",
-  "admin.license.key": "License Key: ",
   "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server",
   "admin.license.noFile": "No file uploaded",
   "admin.license.removing": "Removing License...",
-  "admin.license.teamEdition": "Mattermost Team Edition. Designed for teams from 5 to 50 users.",
-  "admin.license.teamType": "<span><p>This compiled release of Mattermost platform is offered under an MIT license.</p><p>See MIT-COMPILED-LICENSE.txt in your root install directory for details. See NOTICES.txt for information about open source software used in this system.</p></span>",
   "admin.license.title": "Edition and License",
   "admin.license.type": "License: ",
   "admin.license.upload": "Upload",

webapp/i18n/es.json

@@ -230,15 +230,9 @@
   "admin.ldap.usernameAttrTitle": "Atributo Usuario:",
   "admin.licence.keyMigration": "Si estás migrando servidores es posible que necesites remover tu licencia de este servidor para poder instalarlo en un servidor nuevo. Para empezar, <a href=\"http://mattermost.com\" target=\"_blank\">deshabilita todas las características de la Edición Enterprise de este servidor</a>. Esta operación habilitará la opción para remover la licencia y degradar este servidor de la Edición Enterprise a la Edición Team.",
   "admin.license.chooseFile": "Escoger Archivo",
-  "admin.license.edition": "Edición: ",
-  "admin.license.enterpriseEdition": "Mattermost Edición Enterprise. Diseñada para comunicación de escala empresarial.",
-  "admin.license.enterpriseType": "<div><p>Esta versión compilada de la plataforma de Mattermost es provista bajo una <a href=\"http://mattermost.com\" target=\"_blank\">licencia comercial</a> de Mattermost, Inc. en función en su nivel de subscripción y bajo los <a href=\"{terms}\" target=\"_blank\">Términos del Servicio.</a></p><p>Los detalles de tu subscripción son los siguientes:</p>Nombre: {name}<br />Nombre compañía u organización: {company}<br/>Cantidad de usuarios: {users}<br/>Licencia emitida: {issued}<br/>Fecha de inicio: {start}<br/>Fecha de expiración: {expires}<br/>LDAP: {ldap}<br/></div>",
-  "admin.license.key": "Llave de la Licencia: ",
   "admin.license.keyRemove": "Remover la Licencia Enterprise y Degradar el Servidor",
   "admin.license.noFile": "No se subió ningún archivo",
   "admin.license.removing": "Removiendo Licencia...",
-  "admin.license.teamEdition": "Mattermost Edición Team. Diseñado para equipos desde 5 hasta 50 usuarios.",
-  "admin.license.teamType": "<span><p>Esta versión compilada de la plataforma de Mattermost es proporcionada bajo la licencia MIT.</p><p>Lea MIT-COMPILED-LICENSE.txt en el directorio raíz de la instalación para más detalles. Lea NOTICES.txt para información sobre software libre utilizado en este sistema.</p></span>",
   "admin.license.title": "Edición y Licencia",
   "admin.license.type": "Licencia: ",
   "admin.license.upload": "Subir",

webapp/i18n/pt.json

@@ -1,12 +1,12 @@
 {
   "about.close": "Fechar",
   "about.date": "Data De Criação:",
-  "about.enterpriseEditione1": "Enterprise Edition E1",
+  "about.enterpriseEditione1": "Enterprise Edition",
   "about.hash": "Hash de Compilação:",
   "about.licensed": "Licenciado pela:",
   "about.number": "O Número De Compilação:",
-  "about.teamEditiont0": "Team Edition T0",
+  "about.teamEditiont0": "Team Edition",
-  "about.teamEditiont1": "Team Edition T1",
+  "about.teamEditiont1": "Enterprise Edition",
   "about.title": "Sobre o Mattermost",
   "about.version": "Versão:",
   "access_history.title": "Histórico de Acesso",

webapp/utils/constants.jsx

@@ -428,6 +428,21 @@ export default {
             id: 'mentionHighlightLink',
             uiName: 'Mention Highlight Link'
         },
+        {
+            group: 'linkAndButtonElements',
+            id: 'linkColor',
+            uiName: 'Link Color'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonBg',
+            uiName: 'Button BG'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonColor',
+            uiName: 'Button Text'
+        },
         {
             group: 'centerChannelElements',
             id: 'codeTheme',
@@ -458,21 +473,6 @@ export default {
                     iconURL: monokaiIcon
                 }
             ]
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'linkColor',
-            uiName: 'Link Color'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonBg',
-            uiName: 'Button BG'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonColor',
-            uiName: 'Button Text'
         }
     ],
     DEFAULT_CODE_THEME: 'github',