From 7ee5147b26db96718fec1692896f7143458116f7 Mon Sep 17 00:00:00 2001 From: gchaps <33642766+gchaps@users.noreply.github.com> Date: Thu, 10 May 2018 09:31:46 -0700 Subject: [PATCH] [COPYEDIT] Fixed capitalization for Basic and Premium licenses (#18969) * [COPYEDIT] Fixed capitalization for Basic and Premium licenses * [COPYEDIT] More fixes for upper case in license text, including one code change --- .../__snapshots__/license_status.test.js.snap | 4 ++-- .../__snapshots__/revert_to_basic.test.js.snap | 6 +++--- .../__snapshots__/start_trial.test.js.snap | 6 +++--- .../license_status/license_status.container.js | 3 ++- .../revert_to_basic/revert_to_basic.js | 10 +++++----- .../license_dashboard/start_trial/start_trial.js | 14 +++++++------- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap index 1ee426e85962..7092dd34eb11 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap @@ -1,5 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`LicenseStatus component should display display warning is expired 1`] = `"

Your platinum license has expired

Your license expired on
"`; +exports[`LicenseStatus component should display display warning is expired 1`] = `"

Your Platinum license has expired

Your license expired on
"`; -exports[`LicenseStatus component should display normally when license is active 1`] = `"

Your gold license is active

Your license will expire on October 12, 2099 7:00 PM EST
"`; +exports[`LicenseStatus component should display normally when license is active 1`] = `"

Your Gold license is active

Your license will expire on October 12, 2099 7:00 PM EST
"`; diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap index 92f05ebd77e0..83c79535b996 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/revert_to_basic.test.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RevertToBasic component should display when license is about to expire 1`] = `"
Revert to basic license

You’ll revert to our free features and lose access to Security, Machine Learning and other platinum features.

"`; +exports[`RevertToBasic component should display when license is about to expire 1`] = `"
Revert to Basic license

You’ll revert to our free features and lose access to security, machine learning and other Platinum features.

"`; -exports[`RevertToBasic component should display when license is expired 1`] = `"
Revert to basic license

You’ll revert to our free features and lose access to Security, Machine Learning and other platinum features.

"`; +exports[`RevertToBasic component should display when license is expired 1`] = `"
Revert to Basic license

You’ll revert to our free features and lose access to security, machine learning and other Platinum features.

"`; -exports[`RevertToBasic component should display when trial is active 1`] = `"
Revert to basic license

You’ll revert to our free features and lose access to Security, Machine Learning and other platinum features.

"`; +exports[`RevertToBasic component should display when trial is active 1`] = `"
Revert to Basic license

You’ll revert to our free features and lose access to security, machine learning and other Platinum features.

"`; diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap index 3a3045eb119d..91ba9620637e 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`StartTrial component when trial is allowed display for basic license 1`] = `"
Start a 30-day trial

Experience what Security, Machine Learning, and all our other platinum features have to offer.

"`; +exports[`StartTrial component when trial is allowed display for basic license 1`] = `"
Start a 30-day trial

Experience what security, machine learning, and all our other Platinum features have to offer.

"`; -exports[`StartTrial component when trial is allowed should display for expired platinum license 1`] = `"
Start a 30-day trial

Experience what Security, Machine Learning, and all our other platinum features have to offer.

"`; +exports[`StartTrial component when trial is allowed should display for expired platinum license 1`] = `"
Start a 30-day trial

Experience what security, machine learning, and all our other Platinum features have to offer.

"`; -exports[`StartTrial component when trial is allowed should display for gold license 1`] = `"
Start a 30-day trial

Experience what Security, Machine Learning, and all our other platinum features have to offer.

"`; +exports[`StartTrial component when trial is allowed should display for gold license 1`] = `"
Start a 30-day trial

Experience what security, machine learning, and all our other Platinum features have to offer.

"`; diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js b/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js index 0a6c6045eee8..a28e361bd13c 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js @@ -10,9 +10,10 @@ import { getLicense, getExpirationDateFormatted, isExpired } from '../../../stor const mapStateToProps = (state) => { const { isActive, type } = getLicense(state); + const typeTitleCase = type.charAt(0).toUpperCase() + type.substr(1).toLowerCase(); return { status: isActive ? 'Active' : 'Inactive', - type, + type: typeTitleCase, isExpired: isExpired(state), expiryDate: getExpirationDateFormatted(state) }; diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js b/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js index 4d7c3184fa70..1737bfd7c98f 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js @@ -64,13 +64,13 @@ export class RevertToBasic extends React.PureComponent { } const description = ( - You’ll revert to our free features and lose access to Security, Machine - Learning and other{' '} + You’ll revert to our free features and lose access to security, machine + learning and other{' '} - platinum features + Platinum features . ); @@ -79,11 +79,11 @@ export class RevertToBasic extends React.PureComponent { {this.acknowledgeModal()} startBasicLicense(licenseType)}> - Revert to basic + Revert to Basic } /> diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js b/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js index c150762e88bd..32f12c343611 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js @@ -49,22 +49,22 @@ export class StartTrial extends React.PureComponent {

- This trial is for the full set of Elastic{' '} + This trial is for the full set of{' '} - platinum features - . You'll get immediate access to: + Platinum features + of the Elastic Stack. You'll get immediate access to:

  • Machine learning
  • Alerting
    • -
  • Graph
    • +
  • Graph capabilities
  • JDBC connectivity for SQL

- Security features, such authentication (native, AD/LDAP, SAML, + Security features, such as authentication (native, AD/LDAP, SAML, PKI), role-based access control, and auditing, require configuration. See the{' '} - Experience what Security, Machine Learning, and all our other{' '} + Experience what security, machine learning, and all our other{' '} - platinum features + Platinum features {' '} have to offer.