From 0d6a27134d86777a78f1f3cdfc2e273f03403d37 Mon Sep 17 00:00:00 2001 From: Alison Goryachev Date: Tue, 18 Jun 2019 15:11:21 -0400 Subject: [PATCH] update watcher copy --- .../components/delete_watches_modal.tsx | 2 +- .../public/models/action/email_action.js | 4 +- .../public/models/action/index_action.js | 2 +- .../public/models/action/jira_action.js | 4 +- .../public/models/action/logging_action.js | 4 +- .../public/models/action/pagerduty_action.js | 4 +- .../public/models/action/slack_action.js | 2 +- .../public/models/action/webhook_action.js | 4 +- .../public/models/watch/threshold_watch.js | 16 +++---- .../json_watch_edit/json_watch_edit_form.tsx | 6 +-- .../json_watch_edit_simulate.tsx | 4 +- .../threshold_watch_action_accordion.tsx | 4 +- .../threshold_watch_action_dropdown.tsx | 2 +- .../threshold_watch_action_panel.tsx | 2 +- .../threshold_watch_edit.tsx | 10 ++--- .../watch_list/components/watch_list.tsx | 43 +++++++++---------- .../watch_status/components/watch_detail.tsx | 4 +- .../watch_status/components/watch_status.tsx | 2 +- .../watcher/server/models/action/action.js | 4 +- .../server/models/action/base_action.js | 2 +- .../server/models/action/email_action.js | 4 +- .../server/models/action/index_action.js | 4 +- .../server/models/action/jira_action.js | 8 ++-- .../server/models/action/logging_action.js | 4 +- .../server/models/action/pagerduty_action.js | 4 +- .../server/models/action/slack_action.js | 4 +- .../server/models/action/unknown_action.js | 2 +- .../server/models/action/webhook_action.js | 4 +- .../models/action_status/action_status.js | 4 +- .../watcher/server/models/fields/fields.js | 2 +- .../watcher/server/models/watch/base_watch.js | 6 +-- .../watcher/server/models/watch/watch.js | 4 +- .../watch_history_item/watch_history_item.js | 6 +-- .../models/watch_status/watch_status.js | 4 +- 34 files changed, 92 insertions(+), 93 deletions(-) diff --git a/x-pack/plugins/watcher/public/components/delete_watches_modal.tsx b/x-pack/plugins/watcher/public/components/delete_watches_modal.tsx index 93892f52774348..dcb17d82f7a1fd 100644 --- a/x-pack/plugins/watcher/public/components/delete_watches_modal.tsx +++ b/x-pack/plugins/watcher/public/components/delete_watches_modal.tsx @@ -24,7 +24,7 @@ export const DeleteWatchesModal = ({ 'xpack.watcher.deleteSelectedWatchesConfirmModal.descriptionText', { defaultMessage: - 'This will permanently delete {numWatchesToDelete, plural, one {a watch} other {# watches}}. You can’t recover a deleted watch.', + "You can't recover {numWatchesToDelete, plural, one {a deleted watch} other {deleted watches}}.", values: { numWatchesToDelete }, } ); diff --git a/x-pack/plugins/watcher/public/models/action/email_action.js b/x-pack/plugins/watcher/public/models/action/email_action.js index bca78e580a7746..9d199de0fe2967 100644 --- a/x-pack/plugins/watcher/public/models/action/email_action.js +++ b/x-pack/plugins/watcher/public/models/action/email_action.js @@ -101,9 +101,9 @@ export class EmailAction extends BaseAction { }); static iconClass = 'email'; static selectMessage = i18n.translate('xpack.watcher.models.emailAction.selectMessageText', { - defaultMessage: 'Send out an email from your server.', + defaultMessage: 'Send an email from your server.', }); static simulatePrompt = i18n.translate('xpack.watcher.models.emailAction.simulateButtonLabel', { - defaultMessage: 'Test fire an email now' + defaultMessage: 'Send test email' }); } diff --git a/x-pack/plugins/watcher/public/models/action/index_action.js b/x-pack/plugins/watcher/public/models/action/index_action.js index c254f2a63586a4..7276ef59a3fc35 100644 --- a/x-pack/plugins/watcher/public/models/action/index_action.js +++ b/x-pack/plugins/watcher/public/models/action/index_action.js @@ -76,6 +76,6 @@ export class IndexAction extends BaseAction { defaultMessage: 'Index data into Elasticsearch.', }); static simulatePrompt = i18n.translate('xpack.watcher.models.indexAction.simulateButtonLabel', { - defaultMessage: 'Index data now', + defaultMessage: 'Index data', }); } diff --git a/x-pack/plugins/watcher/public/models/action/jira_action.js b/x-pack/plugins/watcher/public/models/action/jira_action.js index 0dc90560b65c49..7e3839ea93b974 100644 --- a/x-pack/plugins/watcher/public/models/action/jira_action.js +++ b/x-pack/plugins/watcher/public/models/action/jira_action.js @@ -98,9 +98,9 @@ export class JiraAction extends BaseAction { }); static iconClass = 'apps'; static selectMessage = i18n.translate('xpack.watcher.models.jiraAction.selectMessageText', { - defaultMessage: 'Create issues in Atlassian’s Jira Software.', + defaultMessage: 'Create an issue in Atlassian’s Jira Software.', }); static simulatePrompt = i18n.translate('xpack.watcher.models.jiraAction.simulateButtonLabel', { - defaultMessage: 'Create a sample Jira issue now' + defaultMessage: 'Create a sample Jira issue' }); } diff --git a/x-pack/plugins/watcher/public/models/action/logging_action.js b/x-pack/plugins/watcher/public/models/action/logging_action.js index 07aae9470a5df8..e11ebedc874c07 100644 --- a/x-pack/plugins/watcher/public/models/action/logging_action.js +++ b/x-pack/plugins/watcher/public/models/action/logging_action.js @@ -70,9 +70,9 @@ export class LoggingAction extends BaseAction { }); static iconClass = 'loggingApp'; static selectMessage = i18n.translate('xpack.watcher.models.loggingAction.selectMessageText', { - defaultMessage: 'Add a new item to the logs.', + defaultMessage: 'Add an item to the logs.', }); static simulatePrompt = i18n.translate('xpack.watcher.models.loggingAction.simulateButtonLabel', { - defaultMessage: 'Log a sample message now', + defaultMessage: 'Log a sample message', }); } diff --git a/x-pack/plugins/watcher/public/models/action/pagerduty_action.js b/x-pack/plugins/watcher/public/models/action/pagerduty_action.js index 55008997209840..e825cf1f262fc8 100644 --- a/x-pack/plugins/watcher/public/models/action/pagerduty_action.js +++ b/x-pack/plugins/watcher/public/models/action/pagerduty_action.js @@ -71,10 +71,10 @@ export class PagerDutyAction extends BaseAction { }); static iconClass = 'apps'; static selectMessage = i18n.translate('xpack.watcher.models.pagerDutyAction.selectMessageText', { - defaultMessage: 'Create events in PagerDuty.', + defaultMessage: 'Create an event in PagerDuty.', }); static simulatePrompt = i18n.translate('xpack.watcher.models.pagerDutyAction.simulateButtonLabel', { - defaultMessage: 'Test fire a PagerDuty event' + defaultMessage: 'Send a PagerDuty event' }); } diff --git a/x-pack/plugins/watcher/public/models/action/slack_action.js b/x-pack/plugins/watcher/public/models/action/slack_action.js index ec11e5c10c8181..da0f3cf5fb0c7d 100644 --- a/x-pack/plugins/watcher/public/models/action/slack_action.js +++ b/x-pack/plugins/watcher/public/models/action/slack_action.js @@ -85,6 +85,6 @@ export class SlackAction extends BaseAction { defaultMessage: 'Send a message to a Slack user or channel.' }); static simulatePrompt = i18n.translate('xpack.watcher.models.slackAction.simulateButtonLabel', { - defaultMessage: 'Send a sample message now' + defaultMessage: 'Send a sample message' }); } diff --git a/x-pack/plugins/watcher/public/models/action/webhook_action.js b/x-pack/plugins/watcher/public/models/action/webhook_action.js index c639648591d77f..0eea87d6212b2b 100644 --- a/x-pack/plugins/watcher/public/models/action/webhook_action.js +++ b/x-pack/plugins/watcher/public/models/action/webhook_action.js @@ -135,9 +135,9 @@ export class WebhookAction extends BaseAction { }); static iconClass = 'logoWebhook'; static selectMessage = i18n.translate('xpack.watcher.models.webhookAction.selectMessageText', { - defaultMessage: 'Send a request to any web service.', + defaultMessage: 'Send a request to a web service.', }); static simulatePrompt = i18n.translate('xpack.watcher.models.webhookAction.simulateButtonLabel', { - defaultMessage: 'Send request now', + defaultMessage: 'Send request', }); } diff --git a/x-pack/plugins/watcher/public/models/watch/threshold_watch.js b/x-pack/plugins/watcher/public/models/watch/threshold_watch.js index 9153e21f029c7e..3b7ed15f58af8c 100644 --- a/x-pack/plugins/watcher/public/models/watch/threshold_watch.js +++ b/x-pack/plugins/watcher/public/models/watch/threshold_watch.js @@ -75,7 +75,7 @@ export class ThresholdWatch extends BaseWatch { const staticPart = i18n.translate( 'xpack.watcher.models.thresholdWatch.sendAlertOnSpecificConditionTitleDescription', { - defaultMessage: 'Send an alert when a specific condition is met.', + defaultMessage: 'Send an alert when your specified condition is met.', } ); if (isNaN(this.triggerIntervalSize)) { @@ -86,7 +86,7 @@ export class ThresholdWatch extends BaseWatch { const dynamicPartText = i18n.translate( 'xpack.watcher.models.thresholdWatch.thresholdWatchIntervalTitleDescription', { - defaultMessage: 'This will run every {triggerIntervalSize} {timeUnitLabel}.', + defaultMessage: 'Your watch will run every {triggerIntervalSize} {timeUnitLabel}.', values: { triggerIntervalSize: this.triggerIntervalSize, timeUnitLabel, @@ -111,7 +111,7 @@ export class ThresholdWatch extends BaseWatch { if (!this.name) { errors.name.push( i18n.translate('xpack.watcher.sections.watchEdit.threshold.error.requiredNameText', { - defaultMessage: 'Name is required', + defaultMessage: 'Name is required.', }) ); } @@ -120,7 +120,7 @@ export class ThresholdWatch extends BaseWatch { i18n.translate( 'xpack.watcher.sections.watchEdit.threshold.enterOneOrMoreIndicesValidationMessage', { - defaultMessage: 'Enter one or more indices', + defaultMessage: 'Enter one or more indices.', } ) ); @@ -134,7 +134,7 @@ export class ThresholdWatch extends BaseWatch { i18n.translate( 'xpack.watcher.sections.watchEdit.threshold.invalidIndexValidationMessage', { - defaultMessage: 'Your index query does not have an associated time field', + defaultMessage: 'Index does not have a time field.', } ) ); @@ -174,7 +174,7 @@ export class ThresholdWatch extends BaseWatch { i18n.translate( 'xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage', { - defaultMessage: 'Please select a field', + defaultMessage: 'This field is required.', } ) ); @@ -196,7 +196,7 @@ export class ThresholdWatch extends BaseWatch { i18n.translate( 'xpack.watcher.thresholdWatchExpression.groupBy.requiredFieldValidationMessage', { - defaultMessage: 'Please select a field.', + defaultMessage: 'This field is required.', } ) ); @@ -219,7 +219,7 @@ export class ThresholdWatch extends BaseWatch { errors.threshold1.push(i18n.translate( 'xpack.watcher.thresholdWatchExpression.thresholdLevel.secondValueMustBeGreaterMessage', { - defaultMessage: 'This value must be greater than {lowerBound}.', + defaultMessage: 'Value must be greater than {lowerBound}.', values: { lowerBound: this.threshold[0] } diff --git a/x-pack/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx b/x-pack/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx index e185dc62920bb2..ddfff9d8506593 100644 --- a/x-pack/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx +++ b/x-pack/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_form.tsx @@ -130,7 +130,7 @@ export const JsonWatchEditForm = () => { ( {i18n.translate('xpack.watcher.sections.watchEdit.json.form.watchJsonDocLink', { - defaultMessage: 'Syntax', + defaultMessage: 'API syntax', })} ) @@ -189,12 +189,12 @@ export const JsonWatchEditForm = () => { {watch.isNew ? ( ) : ( )} diff --git a/x-pack/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx b/x-pack/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx index 09f1950c1c8d17..cd9864b1e11071 100644 --- a/x-pack/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx +++ b/x-pack/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx @@ -153,7 +153,7 @@ export const JsonWatchEditSimulate = ({

{i18n.translate('xpack.watcher.sections.watchEdit.simulate.pageDescription', { defaultMessage: - 'Use the simulator to override the watch schedule, input results, conditions, and actions.', + 'Use the simulator to override the watch schedule, condition, actions, and input results.', })}

@@ -172,7 +172,7 @@ export const JsonWatchEditSimulate = ({ description={i18n.translate( 'xpack.watcher.sections.watchEdit.simulate.form.triggerOverridesDescription', { - defaultMessage: 'Schedule the time and date for starting the watch.', + defaultMessage: 'Set the time and date for starting the watch.', } )} > diff --git a/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_accordion.tsx b/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_accordion.tsx index 2980ea9ecaaa26..06c917f144e62f 100644 --- a/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_accordion.tsx +++ b/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_accordion.tsx @@ -161,7 +161,7 @@ export const WatchActionsAccordion: React.FunctionComponent = ({ title={i18n.translate( 'xpack.watcher.sections.watchEdit.threshold.actions.actionConfigurationWarningTitleText', { - defaultMessage: 'Account may not be configured.', + defaultMessage: 'Account may not be configured', } )} color="warning" @@ -171,7 +171,7 @@ export const WatchActionsAccordion: React.FunctionComponent = ({

= ({ actionErrors

{i18n.translate('xpack.watcher.sections.watchEdit.actions.title', { defaultMessage: - 'Will perform {watchActionsCount, plural, one{# action} other {# actions}} once met', + 'Perform {watchActionsCount, plural, one{# action} other {# actions}} when condition is met', values: { watchActionsCount: watch.actions.length, }, diff --git a/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx b/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx index 50eba55f09ebf2..962fa03883834b 100644 --- a/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx +++ b/x-pack/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx @@ -179,7 +179,7 @@ const ThresholdWatchEditUi = ({ intl, pageTitle }: { intl: InjectedIntl; pageTit const expressionErrorMessage = i18n.translate( 'xpack.watcher.thresholdWatchExpression.fixErrorInExpressionBelowValidationMessage', { - defaultMessage: 'Your expression has errors.', + defaultMessage: 'Expression contains errors.', } ); const expressionFields = [ @@ -269,7 +269,7 @@ const ThresholdWatchEditUi = ({ intl, pageTitle }: { intl: InjectedIntl; pageTit helpText={ } > @@ -396,7 +396,7 @@ const ThresholdWatchEditUi = ({ intl, pageTitle }: { intl: InjectedIntl; pageTit

@@ -851,12 +851,12 @@ const ThresholdWatchEditUi = ({ intl, pageTitle }: { intl: InjectedIntl; pageTit {watch.isNew ? ( ) : ( )} diff --git a/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list.tsx b/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list.tsx index 7109202d9ac71b..208d883a219c56 100644 --- a/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list.tsx +++ b/x-pack/plugins/watcher/public/sections/watch_list/components/watch_list.tsx @@ -68,14 +68,10 @@ const WatchListUi = () => { ); const watcherDescriptionText = ( - -

- -

- + ); const createWatchContextMenu = ( @@ -129,7 +125,7 @@ const WatchListUi = () => { @@ -148,7 +144,7 @@ const WatchListUi = () => { @@ -171,16 +167,17 @@ const WatchListUi = () => { if (availableWatches && availableWatches.length === 0) { const emptyPromptBody = ( - - {watcherDescriptionText} - {''} - - - - + +

+ {watcherDescriptionText}{' '} + + + +

+ ); return ( @@ -191,7 +188,7 @@ const WatchListUi = () => {

} @@ -446,7 +443,9 @@ const WatchListUi = () => { - {watcherDescriptionText} + +

{watcherDescriptionText}

+ diff --git a/x-pack/plugins/watcher/public/sections/watch_status/components/watch_detail.tsx b/x-pack/plugins/watcher/public/sections/watch_status/components/watch_detail.tsx index ab0cfc311191b9..db6d4e2a94682d 100644 --- a/x-pack/plugins/watcher/public/sections/watch_status/components/watch_detail.tsx +++ b/x-pack/plugins/watcher/public/sections/watch_status/components/watch_detail.tsx @@ -122,7 +122,7 @@ const WatchDetailUi = () => { content={i18n.translate( 'xpack.watcher.sections.watchDetail.watchTable.ackActionCellTooltipTitle', { - defaultMessage: 'Acknowledge this watch action', + defaultMessage: 'Acknowledge watch action.', } )} > @@ -192,7 +192,7 @@ const WatchDetailUi = () => { } > diff --git a/x-pack/plugins/watcher/server/models/action/action.js b/x-pack/plugins/watcher/server/models/action/action.js index c25cbfd0256d8d..09bc3316dcb363 100644 --- a/x-pack/plugins/watcher/server/models/action/action.js +++ b/x-pack/plugins/watcher/server/models/action/action.js @@ -38,7 +38,7 @@ export class Action { if (!json.id) { throw badRequest( i18n.translate('xpack.watcher.models.actionStatus.idPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {id} property', + defaultMessage: 'JSON argument must contain an {id} property', values: { id: 'id' } @@ -49,7 +49,7 @@ export class Action { if (!json.actionJson) { throw badRequest( i18n.translate('xpack.watcher.models.action.actionJsonPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJson} property', + defaultMessage: 'JSON argument must contain an {actionJson} property', values: { actionJson: 'actionJson' } diff --git a/x-pack/plugins/watcher/server/models/action/base_action.js b/x-pack/plugins/watcher/server/models/action/base_action.js index 0500a4a451ac8e..31d8b39b5b1c05 100644 --- a/x-pack/plugins/watcher/server/models/action/base_action.js +++ b/x-pack/plugins/watcher/server/models/action/base_action.js @@ -38,7 +38,7 @@ export class BaseAction { if (!json.id) { throw badRequest( i18n.translate('xpack.watcher.models.baseAction.idPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {id} property', + defaultMessage: 'JSON argument must contain an {id} property', values: { id: 'id' } diff --git a/x-pack/plugins/watcher/server/models/action/email_action.js b/x-pack/plugins/watcher/server/models/action/email_action.js index e2151b207a8420..42428ddfc69089 100644 --- a/x-pack/plugins/watcher/server/models/action/email_action.js +++ b/x-pack/plugins/watcher/server/models/action/email_action.js @@ -98,7 +98,7 @@ export class EmailAction extends BaseAction { if (!json.email) { const message = i18n.translate('xpack.watcher.models.emailAction.actionJsonEmailPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonEmail} property', + defaultMessage: 'JSON argument must contain an {actionJsonEmail} property', values: { actionJsonEmail: 'actionJson.email' } @@ -114,7 +114,7 @@ export class EmailAction extends BaseAction { if (!json.email.to) { const message = i18n.translate('xpack.watcher.models.emailAction.actionJsonEmailToPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonEmailTo} property', + defaultMessage: 'JSON argument must contain an {actionJsonEmailTo} property', values: { actionJsonEmailTo: 'actionJson.email.to' } diff --git a/x-pack/plugins/watcher/server/models/action/index_action.js b/x-pack/plugins/watcher/server/models/action/index_action.js index 692737456faa13..5bfd4335067ec1 100644 --- a/x-pack/plugins/watcher/server/models/action/index_action.js +++ b/x-pack/plugins/watcher/server/models/action/index_action.js @@ -69,7 +69,7 @@ export class IndexAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.indexAction.actionJsonIndexPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonIndex} property', + defaultMessage: 'JSON argument must contain an {actionJsonIndex} property', values: { actionJsonIndex: 'actionJson.index' } @@ -83,7 +83,7 @@ export class IndexAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.loggingAction.actionJsonIndexNamePropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonIndexName} property', + defaultMessage: 'JSON argument must contain an {actionJsonIndexName} property', values: { actionJsonIndexName: 'actionJson.index.index' } diff --git a/x-pack/plugins/watcher/server/models/action/jira_action.js b/x-pack/plugins/watcher/server/models/action/jira_action.js index 49b619e6428372..0a53258fe1bb66 100644 --- a/x-pack/plugins/watcher/server/models/action/jira_action.js +++ b/x-pack/plugins/watcher/server/models/action/jira_action.js @@ -89,7 +89,7 @@ export class JiraAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.jiraAction.actionJsonJiraPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonJira} property', + defaultMessage: 'JSON argument must contain an {actionJsonJira} property', values: { actionJsonJira: 'actionJson.jira' } @@ -103,7 +103,7 @@ export class JiraAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.jiraAction.actionJsonJiraProjectKeyPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonJiraProjectKey} property', + defaultMessage: 'JSON argument must contain an {actionJsonJiraProjectKey} property', values: { actionJsonJiraProjectKey: 'actionJson.jira.fields.project.key' } @@ -115,7 +115,7 @@ export class JiraAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.jiraAction.actionJsonJiraIssueTypePropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonJiraIssueType} property', + defaultMessage: 'JSON argument must contain an {actionJsonJiraIssueType} property', values: { actionJsonJiraIssueType: 'actionJson.jira.fields.issuetype.name' } @@ -127,7 +127,7 @@ export class JiraAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.jiraAction.actionJsonJiraSummaryPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonJiraSummary} property', + defaultMessage: 'JSON argument must contain an {actionJsonJiraSummary} property', values: { actionJsonJiraSummary: 'actionJson.jira.fields.summary' } diff --git a/x-pack/plugins/watcher/server/models/action/logging_action.js b/x-pack/plugins/watcher/server/models/action/logging_action.js index b65288ef87f834..92ba94dca84ff8 100644 --- a/x-pack/plugins/watcher/server/models/action/logging_action.js +++ b/x-pack/plugins/watcher/server/models/action/logging_action.js @@ -72,7 +72,7 @@ export class LoggingAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.loggingAction.actionJsonLoggingPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonLogging} property', + defaultMessage: 'JSON argument must contain an {actionJsonLogging} property', values: { actionJsonLogging: 'actionJson.logging' } @@ -86,7 +86,7 @@ export class LoggingAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.loggingAction.actionJsonLoggingTextPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonLoggingText} property', + defaultMessage: 'JSON argument must contain an {actionJsonLoggingText} property', values: { actionJsonLoggingText: 'actionJson.logging.text' } diff --git a/x-pack/plugins/watcher/server/models/action/pagerduty_action.js b/x-pack/plugins/watcher/server/models/action/pagerduty_action.js index 6ded2e4f0422bd..edfdb33584170a 100644 --- a/x-pack/plugins/watcher/server/models/action/pagerduty_action.js +++ b/x-pack/plugins/watcher/server/models/action/pagerduty_action.js @@ -72,7 +72,7 @@ export class PagerDutyAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.pagerDutyAction.actionJsonPagerDutyPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonPagerDuty} property', + defaultMessage: 'JSON argument must contain an {actionJsonPagerDuty} property', values: { actionJsonPagerDuty: 'actionJson.pagerduty' } @@ -86,7 +86,7 @@ export class PagerDutyAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.pagerDutyAction.actionJsonPagerDutyDescriptionPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonPagerDutyText} property', + defaultMessage: 'JSON argument must contain an {actionJsonPagerDutyText} property', values: { actionJsonPagerDutyText: 'actionJson.pagerduty.description' } diff --git a/x-pack/plugins/watcher/server/models/action/slack_action.js b/x-pack/plugins/watcher/server/models/action/slack_action.js index 6c76ed6ebff3d2..4441a71eacae91 100644 --- a/x-pack/plugins/watcher/server/models/action/slack_action.js +++ b/x-pack/plugins/watcher/server/models/action/slack_action.js @@ -81,7 +81,7 @@ export class SlackAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.slackAction.actionJsonSlackPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonSlack} property', + defaultMessage: 'JSON argument must contain an {actionJsonSlack} property', values: { actionJsonSlack: 'actionJson.slack' } @@ -95,7 +95,7 @@ export class SlackAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.slackAction.actionJsonSlackMessagePropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonSlackMessage} property', + defaultMessage: 'JSON argument must contain an {actionJsonSlackMessage} property', values: { actionJsonSlackMessage: 'actionJson.slack.message' } diff --git a/x-pack/plugins/watcher/server/models/action/unknown_action.js b/x-pack/plugins/watcher/server/models/action/unknown_action.js index 858b14472a9d1e..40324a9ab2882b 100644 --- a/x-pack/plugins/watcher/server/models/action/unknown_action.js +++ b/x-pack/plugins/watcher/server/models/action/unknown_action.js @@ -68,7 +68,7 @@ export class UnknownAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.unknownAction.actionJsonPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJson} property', + defaultMessage: 'JSON argument must contain an {actionJson} property', values: { actionJson: 'actionJson' } diff --git a/x-pack/plugins/watcher/server/models/action/webhook_action.js b/x-pack/plugins/watcher/server/models/action/webhook_action.js index 72cea919db358d..766ccd5371533d 100644 --- a/x-pack/plugins/watcher/server/models/action/webhook_action.js +++ b/x-pack/plugins/watcher/server/models/action/webhook_action.js @@ -149,7 +149,7 @@ export class WebhookAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.loggingAction.actionJsonWebhookHostPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonWebhookHost} property', + defaultMessage: 'JSON argument must contain an {actionJsonWebhookHost} property', values: { actionJsonWebhookHost: 'actionJson.webhook.host' } @@ -162,7 +162,7 @@ export class WebhookAction extends BaseAction { errors.push({ code: ERROR_CODES.ERR_PROP_MISSING, message: i18n.translate('xpack.watcher.models.loggingAction.actionJsonWebhookPortPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionJsonWebhookPort} property', + defaultMessage: 'JSON argument must contain an {actionJsonWebhookPort} property', values: { actionJsonWebhookPort: 'actionJson.webhook.port' } diff --git a/x-pack/plugins/watcher/server/models/action_status/action_status.js b/x-pack/plugins/watcher/server/models/action_status/action_status.js index 89e5fff535e5e3..a7aec37d2d29db 100644 --- a/x-pack/plugins/watcher/server/models/action_status/action_status.js +++ b/x-pack/plugins/watcher/server/models/action_status/action_status.js @@ -104,7 +104,7 @@ export class ActionStatus { if (!json.id) { throw badRequest( i18n.translate('xpack.watcher.models.actionStatus.idPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {id} property', + defaultMessage: 'JSON argument must contain an {id} property', values: { id: 'id' } @@ -114,7 +114,7 @@ export class ActionStatus { if (!json.actionStatusJson) { throw badRequest( i18n.translate('xpack.watcher.models.actionStatus.actionStatusJsonPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {actionStatusJson} property', + defaultMessage: 'JSON argument must contain an {actionStatusJson} property', values: { actionStatusJson: 'actionStatusJson' } diff --git a/x-pack/plugins/watcher/server/models/fields/fields.js b/x-pack/plugins/watcher/server/models/fields/fields.js index ba3ed23711457d..fef932ee630b79 100644 --- a/x-pack/plugins/watcher/server/models/fields/fields.js +++ b/x-pack/plugins/watcher/server/models/fields/fields.js @@ -55,7 +55,7 @@ export class Fields { if (!json.fields) { throw badRequest( i18n.translate('xpack.watcher.models.fields.fieldsPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain a {fields} property', + defaultMessage: 'JSON argument must contain a {fields} property', values: { fields: 'fields' } diff --git a/x-pack/plugins/watcher/server/models/watch/base_watch.js b/x-pack/plugins/watcher/server/models/watch/base_watch.js index bfcc8737cb1906..ada4cbc2dd2b2e 100644 --- a/x-pack/plugins/watcher/server/models/watch/base_watch.js +++ b/x-pack/plugins/watcher/server/models/watch/base_watch.js @@ -94,7 +94,7 @@ export class BaseWatch { if (!json.id) { throw badRequest( i18n.translate('xpack.watcher.models.baseWatch.idPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {id} property', + defaultMessage: 'JSON argument must contain an {id} property', values: { id: 'id' } @@ -104,7 +104,7 @@ export class BaseWatch { if (!json.watchJson) { throw badRequest( i18n.translate('xpack.watcher.models.baseWatch.watchJsonPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain a {watchJson} property', + defaultMessage: 'JSON argument must contain a {watchJson} property', values: { watchJson: 'watchJson' } @@ -114,7 +114,7 @@ export class BaseWatch { if (!json.watchStatusJson) { throw badRequest( i18n.translate('xpack.watcher.models.baseWatch.watchStatusJsonPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain a {watchStatusJson} property', + defaultMessage: 'JSON argument must contain a {watchStatusJson} property', values: { watchStatusJson: 'watchStatusJson' } diff --git a/x-pack/plugins/watcher/server/models/watch/watch.js b/x-pack/plugins/watcher/server/models/watch/watch.js index 03e75a365f028d..c75afc62c4c4bc 100644 --- a/x-pack/plugins/watcher/server/models/watch/watch.js +++ b/x-pack/plugins/watcher/server/models/watch/watch.js @@ -28,7 +28,7 @@ export class Watch { if (!json.type) { throw badRequest( i18n.translate('xpack.watcher.models.watch.typePropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {type} property', + defaultMessage: 'JSON argument must contain an {type} property', values: { type: 'type' } @@ -54,7 +54,7 @@ export class Watch { if (!json.watchJson) { throw badRequest( i18n.translate('xpack.watcher.models.watch.watchJsonPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain a {watchJson} property', + defaultMessage: 'JSON argument must contain a {watchJson} property', values: { watchJson: 'watchJson' } diff --git a/x-pack/plugins/watcher/server/models/watch_history_item/watch_history_item.js b/x-pack/plugins/watcher/server/models/watch_history_item/watch_history_item.js index b3982e11bef061..617f7585717426 100644 --- a/x-pack/plugins/watcher/server/models/watch_history_item/watch_history_item.js +++ b/x-pack/plugins/watcher/server/models/watch_history_item/watch_history_item.js @@ -40,7 +40,7 @@ export class WatchHistoryItem { if (!json.id) { throw badRequest( i18n.translate('xpack.watcher.models.watchHistoryItem.idPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {id} property', + defaultMessage: 'JSON argument must contain an {id} property', values: { id: 'id' } @@ -50,7 +50,7 @@ export class WatchHistoryItem { if (!json.watchId) { throw badRequest( i18n.translate('xpack.watcher.models.watchHistoryItem.watchIdPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain a {watchId} property', + defaultMessage: 'JSON argument must contain a {watchId} property', values: { watchId: 'watchId' } @@ -60,7 +60,7 @@ export class WatchHistoryItem { if (!json.watchHistoryItemJson) { throw badRequest( i18n.translate('xpack.watcher.models.watchHistoryItem.watchHistoryItemJsonPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain a {watchHistoryItemJson} property', + defaultMessage: 'JSON argument must contain a {watchHistoryItemJson} property', values: { watchHistoryItemJson: 'watchHistoryItemJson' } diff --git a/x-pack/plugins/watcher/server/models/watch_status/watch_status.js b/x-pack/plugins/watcher/server/models/watch_status/watch_status.js index 5045c3a7a311ef..b7cffe16ca0bc2 100644 --- a/x-pack/plugins/watcher/server/models/watch_status/watch_status.js +++ b/x-pack/plugins/watcher/server/models/watch_status/watch_status.js @@ -141,7 +141,7 @@ export class WatchStatus { if (!json.id) { throw badRequest( i18n.translate('xpack.watcher.models.watchStatus.idPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain an {id} property', + defaultMessage: 'JSON argument must contain an {id} property', values: { id: 'id' } @@ -151,7 +151,7 @@ export class WatchStatus { if (!json.watchStatusJson) { throw badRequest( i18n.translate('xpack.watcher.models.watchStatus.watchStatusJsonPropertyMissingBadRequestMessage', { - defaultMessage: 'json argument must contain a {watchStatusJson} property', + defaultMessage: 'JSON argument must contain a {watchStatusJson} property', values: { watchStatusJson: 'watchStatusJson' }