Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edit UI text strings in Integrations and Fleet tabs #75837

Merged
merged 2 commits into from
Sep 22, 2020
Merged

Edit UI text strings in Integrations and Fleet tabs #75837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e6c1c7
Edit UI text strings in Integrations and Fleet tabs
dedemorton Aug 25, 2020
24777b7
Merge branch 'master' into edit_ui_text_round2
elasticmachine Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ons/ingest_manager/sections/agent_policy/create_package_policy_page/components/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
) : (
<FormattedMessage
id="xpack.ingestManager.createPackagePolicy.pageDescriptionfromPackage"
defaultMessage="Follow the instructions below to add this integration to an agent policy."
defaultMessage="Follow these instructions to add this integration to an agent policy."
/>
);
}, [from]);
Expand Down
4 changes: 2 additions & 2 deletions ...ic/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,15 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {

notifications.toasts.addSuccess({
title: i18n.translate('xpack.ingestManager.createPackagePolicy.addedNotificationTitle', {
defaultMessage: `Successfully added '{packagePolicyName}'`,
defaultMessage: `'{packagePolicyName}' integration added.`,
values: {
packagePolicyName: packagePolicy.name,
},
}),
text:
agentCount && agentPolicy
? i18n.translate('xpack.ingestManager.createPackagePolicy.addedNotificationMessage', {
defaultMessage: `Fleet will deploy updates to all agents that use the '{agentPolicyName}' policy`,
defaultMessage: `Fleet will deploy updates to all agents that use the '{agentPolicyName}' policy.`,
values: {
agentPolicyName: agentPolicy.name,
},
Expand Down
7 changes: 4 additions & 3 deletions ...est_manager/sections/fleet/enrollment_token_list_page/components/confirm_delete_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const ConfirmEnrollmentTokenDelete = (props: Props) => {
<EuiOverlayMask>
<EuiConfirmModal
title={i18n.translate('xpack.ingestManager.enrollmentTokenDeleteModal.title', {
defaultMessage: 'Delete enrollment token',
defaultMessage: 'Revoke enrollment token',
})}
onCancel={onCancel}
onConfirm={onConfirm}
Expand All @@ -34,15 +34,16 @@ export const ConfirmEnrollmentTokenDelete = (props: Props) => {
confirmButtonText={i18n.translate(
'xpack.ingestManager.enrollmentTokenDeleteModal.deleteButton',
{
defaultMessage: 'Delete',
defaultMessage: 'Revoke enrollment token',
}
)}
defaultFocusedButton="confirm"
buttonColor="danger"
>
<EuiCallOut
title={i18n.translate('xpack.ingestManager.enrollmentTokenDeleteModal.description', {
defaultMessage: 'Are your sure you want to delete {keyName}.',
defaultMessage:
'Are your sure you want to revoke {keyName}? Agents that use this token will no longer be able to access policies or send data. ',
values: {
keyName: enrollmentKey.name,
},
Expand Down
2 changes: 1 addition & 1 deletion ...anager/sections/fleet/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
<h2 id="FleetNewEnrollmentKeyFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.newEnrollmentKey.flyoutTitle"
defaultMessage="Create a new enrollment token"
defaultMessage="Create enrollment token"
/>
</h2>
</EuiTitle>
Expand Down
4 changes: 2 additions & 2 deletions ...er/public/applications/ingest_manager/sections/fleet/enrollment_token_list_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
<EuiText color="subdued">
<FormattedMessage
id="xpack.ingestManager.enrollmentTokensList.pageDescription"
defaultMessage="This is a list of enrollment tokens that are available to enroll your agents."
defaultMessage="Create and revoke enrollment tokens. An enrollment token enables one or more agents to enroll in Fleet and send data."
/>
</EuiText>
<EuiSpacer size="m" />
Expand All @@ -290,7 +290,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
<EuiButton iconType="plusInCircle" onClick={() => setFlyoutOpen(true)}>
<FormattedMessage
id="xpack.ingestManager.enrollmentTokensList.newKeyButton"
defaultMessage="New enrollment token"
defaultMessage="Create enrollment token"
/>
</EuiButton>
</EuiFlexItem>
Expand Down
3 changes: 1 addition & 2 deletions ...ins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ export const SetupPage: React.FunctionComponent<{
<EuiText color="subdued">
<FormattedMessage
id="xpack.ingestManager.setupPage.enableText"
defaultMessage="In order to use Fleet, you must create an Elastic user. This user can create API keys
and write to logs-* and metrics-*."
defaultMessage="Fleet requires an Elastic user who can create API keys and write to logs-* and metrics-*."
/>
</EuiText>
<EuiSpacer size="l" />
Expand Down