From 8f38e4317b66b8ed778820a5f812ccc005036437 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 8 Mar 2016 14:57:35 -0500 Subject: [PATCH 1/2] Improving the about dialog for licencing --- web/react/components/about_build_modal.jsx | 39 +++++++++++++--------- web/static/i18n/en.json | 5 +-- web/static/i18n/es.json | 5 +-- web/static/i18n/pt.json | 7 ++-- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/web/react/components/about_build_modal.jsx b/web/react/components/about_build_modal.jsx index fe48bb48ef..86519e5dba 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 = ( ); + let licensee; - if (config.BuildEnterpriseReady === 'true' && license.IsLicensed === 'true') { + if (config.BuildEnterpriseReady === 'true') { title = ( ); - licensee = ( -
-
- + if (license.IsLicensed === 'true') { + title = ( + + ); + licensee = ( +
+
+ +
+
{license.Company}
-
{license.Company}
-
- ); + ); + } } return ( diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 4c6fa0eae2..340464667d 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.teamEdtiont0": "Team Edition T0", + "about.teamEdtiont1": "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 b144708722..2849578a58 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.teamEdtiont0": "Edición Team T0", + "about.teamEdtiont1": "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 f4b998ded9..94e67a7993 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.teamEdtiont0": "Team Edition T0", + "about.teamEdtiont1": "Team Edition T1", "about.title": "Sobre o Mattermost", "about.version": "Versão:", "access_history.title": "Histórico de Acesso", @@ -1288,4 +1289,4 @@ "view_image_popover.download": "Download", "view_image_popover.file": "Arquivo {count} de {total}", "view_image_popover.publicLink": "Obter O Link Público" -} \ No newline at end of file +} From 3d8c6af4d9cc04141c2af5d8163a640b3bb6a9a3 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 8 Mar 2016 23:09:33 -0500 Subject: [PATCH 2/2] Fix spelling --- web/react/components/about_build_modal.jsx | 4 ++-- web/static/i18n/en.json | 4 ++-- web/static/i18n/es.json | 4 ++-- web/static/i18n/pt.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/react/components/about_build_modal.jsx b/web/react/components/about_build_modal.jsx index 86519e5dba..34b1fdccfb 100644 --- a/web/react/components/about_build_modal.jsx +++ b/web/react/components/about_build_modal.jsx @@ -21,7 +21,7 @@ export default class AboutBuildModal extends React.Component { let title = ( ); @@ -30,7 +30,7 @@ export default class AboutBuildModal extends React.Component { if (config.BuildEnterpriseReady === 'true') { title = ( ); diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 340464667d..e3d3315930 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -5,8 +5,8 @@ "about.hash": "Build Hash:", "about.licensed": "Licensed by:", "about.number": "Build Number:", - "about.teamEdtiont0": "Team Edition T0", - "about.teamEdtiont1": "Team Edition T1", + "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 2849578a58..f9bb58ef30 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -5,8 +5,8 @@ "about.hash": "Hash de compilación:", "about.licensed": "Licenciado por:", "about.number": "Número de compilación:", - "about.teamEdtiont0": "Edición Team T0", - "about.teamEdtiont1": "Edición Team T1", + "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 94e67a7993..3bed12ebfa 100644 --- a/web/static/i18n/pt.json +++ b/web/static/i18n/pt.json @@ -5,8 +5,8 @@ "about.hash": "Hash de Compilação:", "about.licensed": "Licenciado pela:", "about.number": "O Número De Compilação:", - "about.teamEdtiont0": "Team Edition T0", - "about.teamEdtiont1": "Team Edition T1", + "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",