[CCR] Copy edits

src/ui/public/indices/constants/index.js

@@ -19,4 +19,9 @@
 
 import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from 'ui/index_patterns';
 
-export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.concat(',');
+export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [ ...INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE ];
+
+// Insert the comma into the middle, so it doesn't look as if it has grammatical meaning when
+// these characters are rendered in the UI.
+const insertionIndex = Math.floor(INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.length / 2);
+INDEX_ILLEGAL_CHARACTERS_VISIBLE.splice(insertionIndex, 0, ',');

x-pack/plugins/cross_cluster_replication/public/app/app.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { Route, Switch, Redirect } from 'react-router-dom';
 import chrome from 'ui/chrome';
@@ -18,6 +18,7 @@ import {
   EuiFlexItem,
   EuiLoadingSpinner,
   EuiPageContent,
+  EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
 
@@ -160,15 +161,19 @@ export const App = injectI18n(
 
       if (fetchPermissionError) {
         return (
-          <SectionError
-            title={(
-              <FormattedMessage
-                id="xpack.crossClusterReplication.app.permissionCheckErrorTitle"
-                defaultMessage="Error checking permissions"
-              />
-            )}
-            error={fetchPermissionError}
-          />
+          <Fragment>
+            <SectionError
+              title={(
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.app.permissionCheckErrorTitle"
+                  defaultMessage="Error checking permissions"
+                />
+              )}
+              error={fetchPermissionError}
+            />
+
+            <EuiSpacer size="m" />
+          </Fragment>
         );
       }
 
@@ -182,14 +187,15 @@ export const App = injectI18n(
                 <h2>
                   <FormattedMessage
                     id="xpack.crossClusterReplication.app.deniedPermissionTitle"
-                    defaultMessage="Permission denied"
+                    defaultMessage="You're missing cluster privileges"
                   />
                 </h2>}
               body={
                 <p>
                   <FormattedMessage
                     id="xpack.crossClusterReplication.app.deniedPermissionDescription"
-                    defaultMessage="You do not have required cluster privileges ({clusterPrivileges}) for Cross Cluster Replication."
+                    defaultMessage="To use Cross Cluster Replication, you must have {clusterPrivileges,
+                      plural, one {this cluster privilege} other {these cluster privileges}}: {clusterPrivileges}."
                     values={{ clusterPrivileges: missingClusterPrivileges.join(', ') }}
                   />
                 </p>}

x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js

@@ -66,6 +66,7 @@ export class AutoFollowPatternFormUI extends PureComponent {
     apiStatus: PropTypes.string.isRequired,
     currentUrl: PropTypes.string.isRequired,
     remoteClusters: PropTypes.array,
+    saveButtonLabel: PropTypes.node,
   }
 
   constructor(props) {
@@ -216,9 +217,15 @@ export class AutoFollowPatternFormUI extends PureComponent {
     if (apiError) {
       const title = intl.formatMessage({
         id: 'xpack.crossClusterReplication.autoFollowPatternForm.savingErrorTitle',
-        defaultMessage: 'Error creating auto-follow pattern',
+        defaultMessage: `Can't create auto-follow pattern`,
       });
-      return <SectionError title={title} error={apiError} />;
+
+      return (
+        <Fragment>
+          <SectionError title={title} error={apiError} />
+          <EuiSpacer size="l" />
+        </Fragment>
+      );
     }
 
     return null;
@@ -301,13 +308,13 @@ export class AutoFollowPatternFormUI extends PureComponent {
         />),
         remoteClusterNotConnectedNotEditable: () => (<FormattedMessage
           id="xpack.crossClusterReplication.autoFollowPatternForm.currentRemoteClusterNotConnectedCallOutDescription"
-          defaultMessage="You need to connect it before editing this auto-follow pattern. Edit the remote cluster to
-            fix the problem."
+          defaultMessage="The remote cluster must be connected to edit this auto-follow pattern."
         />),
-        remoteClusterDoesNotExist: () => (<FormattedMessage
+        remoteClusterDoesNotExist: (name) => (<FormattedMessage
           id="xpack.crossClusterReplication.autoFollowPatternForm.currentRemoteClusterNotFoundCallOutDescription"
-          defaultMessage="It might have been removed. In order to edit this auto-follow pattern,
-            you need to add a remote cluster with the same name."
+          defaultMessage="Before you can edit this auto-follow pattern, you must add a remote cluster
+            named '{name}'."
+          values={{ name }}
         />)
       };
 
@@ -539,7 +546,6 @@ export class AutoFollowPatternFormUI extends PureComponent {
 
       return (
         <Fragment>
-          <EuiSpacer size="m" />
           <EuiCallOut
             title={(
               <FormattedMessage
@@ -550,6 +556,7 @@ export class AutoFollowPatternFormUI extends PureComponent {
             color="danger"
             iconType="cross"
           />
+          <EuiSpacer size="l" />
         </Fragment>
       );
     };
@@ -558,7 +565,7 @@ export class AutoFollowPatternFormUI extends PureComponent {
      * Form Actions
      */
     const renderActions = () => {
-      const { apiStatus } = this.props;
+      const { apiStatus, saveButtonLabel } = this.props;
       const { areErrorsVisible } = this.state;
 
       if (apiStatus === API_STATUS.SAVING) {
@@ -592,10 +599,7 @@ export class AutoFollowPatternFormUI extends PureComponent {
               fill
               disabled={isSaveDisabled}
             >
-              <FormattedMessage
-                id="xpack.crossClusterReplication.autoFollowPatternForm.saveButtonLabel"
-                defaultMessage="Save"
-              />
+              {saveButtonLabel}
             </EuiButton>
           </EuiFlexItem>
 
@@ -623,7 +627,7 @@ export class AutoFollowPatternFormUI extends PureComponent {
           {renderAutoFollowPatternPrefixSuffix()}
         </EuiForm>
         {renderFormErrorWarning()}
-        <EuiSpacer size="l" />
+        {this.renderApiErrors()}
         {renderActions()}
       </Fragment>
     );
@@ -645,7 +649,6 @@ export class AutoFollowPatternFormUI extends PureComponent {
   render() {
     return (
       <Fragment>
-        {this.renderApiErrors()}
         {this.renderForm()}
         {this.renderLoading()}
       </Fragment>

x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/advanced_settings_fields.js

@@ -18,7 +18,7 @@ const byteUnitsHelpText = (
       <a href={byteUnitsUrl} target="_blank">
         <FormattedMessage
           id="xpack.crossClusterReplication.followerIndexForm.advancedSettings.byteUnitsHelpTextLinkMessage"
-          defaultMessage="Learn more."
+          defaultMessage="Learn more"
         />
       </a>
     ) }}
@@ -33,7 +33,7 @@ const timeUnitsHelpText = (
       <a href={timeUnitsUrl} target="_blank">
         <FormattedMessage
           id="xpack.crossClusterReplication.followerIndexForm.advancedSettings.timeUnitsHelpTextLinkMessage"
-          defaultMessage="Learn more."
+          defaultMessage="Learn more"
         />
       </a>
     ) }}

x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.js

@@ -92,6 +92,7 @@ export const FollowerIndexForm = injectI18n(
       apiError: PropTypes.object,
       apiStatus: PropTypes.string.isRequired,
       remoteClusters: PropTypes.array,
+      saveButtonLabel: PropTypes.node,
     }
 
     constructor(props) {
@@ -288,20 +289,26 @@ export const FollowerIndexForm = injectI18n(
       if (apiError) {
         const title = intl.formatMessage({
           id: 'xpack.crossClusterReplication.followerIndexForm.savingErrorTitle',
-          defaultMessage: 'Error creating follower index',
+          defaultMessage: `Can't create follower index`,
         });
         const { leaderIndex } = this.state.followerIndex;
         const error = apiError.status === 404
           ? {
             data: {
               message: intl.formatMessage({
                 id: 'xpack.crossClusterReplication.followerIndexForm.leaderIndexNotFoundError',
-                defaultMessage: `The leader index '{leaderIndex}' you want to replicate from does not exist.`,
+                defaultMessage: `The leader index '{leaderIndex}' does not exist.`,
               }, { leaderIndex })
             }
           }
           : apiError;
-        return <SectionError title={title} error={error} />;
+
+        return (
+          <Fragment>
+            <SectionError title={title} error={error} />
+            <EuiSpacer size="l" />
+          </Fragment>
+        );
       }
 
       return null;
@@ -343,7 +350,7 @@ export const FollowerIndexForm = injectI18n(
 
       const indexNameLabel = i18n.translate(
         'xpack.crossClusterReplication.followerIndexForm.sectionFollowerIndexNameTitle', {
-          defaultMessage: 'Name'
+          defaultMessage: 'Follower index'
         }
       );
 
@@ -359,7 +366,7 @@ export const FollowerIndexForm = injectI18n(
           )}
           label={indexNameLabel}
           description={i18n.translate('xpack.crossClusterReplication.followerIndexForm.sectionFollowerIndexNameDescription', {
-            defaultMessage: 'A name for the follower index.'
+            defaultMessage: 'A unique name for your index.'
           })}
           helpText={indexNameHelpText}
           isLoading={isValidatingIndexName}
@@ -382,13 +389,13 @@ export const FollowerIndexForm = injectI18n(
           />),
           remoteClusterNotConnectedNotEditable: () => (<FormattedMessage
             id="xpack.crossClusterReplication.followerIndexForm.currentRemoteClusterNotConnectedCallOutDescription"
-            defaultMessage="You need to connect it before editing this follower index. Edit the remote cluster to
-              fix the problem."
+            defaultMessage="The remote cluster must be connected to edit this follower index."
           />),
-          remoteClusterDoesNotExist: () => (<FormattedMessage
+          remoteClusterDoesNotExist: (name) => (<FormattedMessage
             id="xpack.crossClusterReplication.followerIndexForm.currentRemoteClusterNotFoundCallOutDescription"
-            defaultMessage="It might have been removed. In order to edit this follower index,
-              you need to add a remote cluster with the same name."
+            defaultMessage="Before you can edit this follower index, you must add a remote cluster
+              named '{name}'."
+            values={{ name }}
           />)
         };
 
@@ -407,7 +414,7 @@ export const FollowerIndexForm = injectI18n(
             description={(
               <FormattedMessage
                 id="xpack.crossClusterReplication.followerIndexForm.sectionRemoteClusterDescription"
-                defaultMessage="The remote cluster to replicate your leader index from."
+                defaultMessage="The cluster that contains the index to replicate."
               />
             )}
             fullWidth
@@ -449,9 +456,31 @@ export const FollowerIndexForm = injectI18n(
             </EuiTitle>
           )}
           label={leaderIndexLabel}
-          description={i18n.translate('xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription', {
-            defaultMessage: 'The leader index you want to replicate from the remote cluster.'
-          })}
+          description={(
+            <Fragment>
+              <p>
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription"
+                  defaultMessage="The index you want to replicate."
+                />
+              </p>
+
+              <p>
+                <FormattedMessage
+                  id="xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription2"
+                  defaultMessage="{note} the leader index must already exist."
+                  values={{ note: (
+                    <strong>
+                      <FormattedMessage
+                        id="xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription2.noteLabel"
+                        defaultMessage="Note:"
+                      />
+                    </strong>
+                  ) }}
+                />
+              </p>
+            </Fragment>
+          )}
           helpText={(
             <FormattedMessage
               id="xpack.crossClusterReplication.followerIndexForm.indexNameHelpLabel"
@@ -489,8 +518,7 @@ export const FollowerIndexForm = injectI18n(
                   <p>
                     <FormattedMessage
                       id="xpack.crossClusterReplication.followerIndexForm.advancedSettingsDescription"
-                      defaultMessage="Customize advanced settings to control the rate at which data is replicated.
-                        If you don't customize them, default advanced settings will be applied."
+                      defaultMessage="Advanced settings control the rate at which data is replicated.."
                     />
                   </p>
 
@@ -557,7 +585,6 @@ export const FollowerIndexForm = injectI18n(
 
         return (
           <Fragment>
-            <EuiSpacer size="m" />
             <EuiCallOut
               title={(
                 <FormattedMessage
@@ -578,7 +605,7 @@ export const FollowerIndexForm = injectI18n(
        * Form Actions
        */
       const renderActions = () => {
-        const { apiStatus } = this.props;
+        const { apiStatus, saveButtonLabel } = this.props;
         const { areErrorsVisible } = this.state;
 
         if (apiStatus === API_STATUS.SAVING) {
@@ -612,10 +639,7 @@ export const FollowerIndexForm = injectI18n(
                 fill
                 disabled={isSaveDisabled}
               >
-                <FormattedMessage
-                  id="xpack.crossClusterReplication.followerIndexForm.saveButtonLabel"
-                  defaultMessage="Save"
-                />
+                {saveButtonLabel}
               </EuiButton>
             </EuiFlexItem>
 
@@ -645,6 +669,7 @@ export const FollowerIndexForm = injectI18n(
           </EuiForm>
 
           {renderFormErrorWarning()}
+          {this.renderApiErrors()}
           {renderActions()}
         </Fragment>
       );
@@ -666,7 +691,6 @@ export const FollowerIndexForm = injectI18n(
     render() {
       return (
         <Fragment>
-          {this.renderApiErrors()}
           {this.renderForm()}
           {this.renderLoading()}
         </Fragment>