Merge pull request #2391 from mattermost/fix-about-modal

Improving the about dialog for licencing

4 files changed, 33 insertions, 21 deletions

diff --git a/web/react/components/about_build_modal.jsx b/web/react/components/about_build_modal.jsx
index fe48bb48e..34b1fdccf 100644
--- a/web/react/components/about_build_modal.jsx
+++ b/web/react/components/about_build_modal.jsx
@@ -21,29 +21,38 @@ export default class AboutBuildModal extends React.Component {
 
         let title = (
             <FormattedMessage
-                id='about.teamEdtion'
-                defaultMessage='Team Edition'
+                id='about.teamEditiont0'
+                defaultMessage='Team Edition T0'
             />
         );
+
         let licensee;
-        if (config.BuildEnterpriseReady === 'true' && license.IsLicensed === 'true') {
+        if (config.BuildEnterpriseReady === 'true') {
             title = (
                 <FormattedMessage
-                    id='about.enterpriseEdition'
-                    defaultMessage='Enterprise Edition'
+                    id='about.teamEditiont1'
+                    defaultMessage='Team Edition T1'
                 />
             );
-            licensee = (
-                <div className='row form-group'>
-                    <div className='col-sm-3 info__label'>
-                        <FormattedMessage
-                            id='about.licensed'
-                            defaultMessage='Licensed by:'
-                        />
+            if (license.IsLicensed === 'true') {
+                title = (
+                    <FormattedMessage
+                        id='about.enterpriseEditione1'
+                        defaultMessage='Enterprise Edition E1'
+                    />
+                );
+                licensee = (
+                    <div className='row form-group'>
+                        <div className='col-sm-3 info__label'>
+                            <FormattedMessage
+                                id='about.licensed'
+                                defaultMessage='Licensed by:'
+                            />
+                        </div>
+                        <div className='col-sm-9'>{license.Company}</div>
                     </div>
-                    <div className='col-sm-9'>{license.Company}</div>
-                </div>
-            );
+                );
+            }
         }
 
         return (
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 090b8be05..feea91aad 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -1,11 +1,12 @@
 {
   "about.close": "Close",
   "about.date": "Build Date:",
-  "about.enterpriseEdition": "Enterprise Edition",
+  "about.enterpriseEditione1": "Enterprise Edition E1",
   "about.hash": "Build Hash:",
   "about.licensed": "Licensed by:",
   "about.number": "Build Number:",
-  "about.teamEdtion": "Team Edition",
+  "about.teamEditiont0": "Team Edition T0",
+  "about.teamEditiont1": "Team Edition T1",
   "about.title": "About Mattermost",
   "about.version": "Version:",
   "access_history.title": "Access History",
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 89326bff3..2a7eaae16 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -1,11 +1,12 @@
 {
   "about.close": "Cerrar",
   "about.date": "Fecha de compilación:",
-  "about.enterpriseEdition": "Edición Enterprise",
+  "about.enterpriseEditione1": "Edición Enterprise E1",
   "about.hash": "Hash de compilación:",
   "about.licensed": "Licenciado por:",
   "about.number": "Número de compilación:",
-  "about.teamEdtion": "Edición Team",
+  "about.teamEditiont0": "Edición Team T0",
+  "about.teamEditiont1": "Edición Team T1",
   "about.title": "Acerca de Mattermost",
   "about.version": "Versión:",
   "access_history.title": "Historial de Acceso",
diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json
index e8f1d481e..b9b8f4c07 100644
--- a/web/static/i18n/pt.json
+++ b/web/static/i18n/pt.json
@@ -1,11 +1,12 @@
 {
   "about.close": "Fechar",
   "about.date": "Data De Criação:",
-  "about.enterpriseEdition": "Enterprise Edition",
+  "about.enterpriseEditione1": "Enterprise Edition E1",
   "about.hash": "Hash de Compilação:",
   "about.licensed": "Licenciado pela:",
   "about.number": "O Número De Compilação:",
-  "about.teamEdtion": "Team Edition",
+  "about.teamEditiont0": "Team Edition T0",
+  "about.teamEditiont1": "Team Edition T1",
   "about.title": "Sobre o Mattermost",
   "about.version": "Versão:",
   "access_history.title": "Histórico de Acesso",