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

[Fleet] Rename ingestManager translations fleet #81837

Merged
merged 3 commits into from
Oct 28, 2020
Merged

[Fleet] Rename ingestManager translations fleet #81837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b14909
[Fleet] Rename ingestManager translations fleet
nchaulet Oct 27, 2020
3c2f8df
Rename translations
nchaulet Oct 27, 2020
5fa4d15
Merge branch 'master' into feature-rename-fleet-translations
kibanamachine Oct 27, 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
6 changes: 2 additions & 4 deletions x-pack/.i18nrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"xpack.idxMgmt": "plugins/index_management",
"xpack.indexLifecycleMgmt": "plugins/index_lifecycle_management",
"xpack.infra": "plugins/infra",
"xpack.ingestManager": "plugins/ingest_manager",
"xpack.fleet": "plugins/ingest_manager",
"xpack.ingestPipelines": "plugins/ingest_pipelines",
"xpack.lens": "plugins/lens",
"xpack.licenseMgmt": "plugins/license_management",
Expand Down Expand Up @@ -56,9 +56,7 @@
"xpack.watcher": "plugins/watcher",
"xpack.observability": "plugins/observability"
},
"exclude": [
"examples"
],
"exclude": ["examples"],
"translations": [
"plugins/translations/translations/zh-CN.json",
"plugins/translations/translations/ja-JP.json"
Expand Down
15 changes: 6 additions & 9 deletions x-pack/plugins/ingest_manager/common/services/is_valid_namespace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,23 @@ export function isValidNamespace(namespace: string): { valid: boolean; error?: s
if (!namespace.trim()) {
return {
valid: false,
error: i18n.translate('xpack.ingestManager.namespaceValidation.requiredErrorMessage', {
error: i18n.translate('xpack.fleet.namespaceValidation.requiredErrorMessage', {
defaultMessage: 'Namespace is required',
}),
};
} else if (namespace !== namespace.toLowerCase()) {
return {
valid: false,
error: i18n.translate('xpack.ingestManager.namespaceValidation.lowercaseErrorMessage', {
error: i18n.translate('xpack.fleet.namespaceValidation.lowercaseErrorMessage', {
defaultMessage: 'Namespace must be lowercase',
}),
};
} else if (/[\*\\/\?"<>|\s,#:]+/.test(namespace)) {
return {
valid: false,
error: i18n.translate(
'xpack.ingestManager.namespaceValidation.invalidCharactersErrorMessage',
{
defaultMessage: 'Namespace contains invalid characters',
}
),
error: i18n.translate('xpack.fleet.namespaceValidation.invalidCharactersErrorMessage', {
defaultMessage: 'Namespace contains invalid characters',
}),
};
}
// Node.js doesn't have Blob, and browser doesn't have Buffer :)
Expand All @@ -41,7 +38,7 @@ export function isValidNamespace(namespace: string): { valid: boolean; error?: s
) {
return {
valid: false,
error: i18n.translate('xpack.ingestManager.namespaceValidation.tooLongErrorMessage', {
error: i18n.translate('xpack.fleet.namespaceValidation.tooLongErrorMessage', {
defaultMessage: 'Namespace cannot be more than 100 bytes',
}),
};
Expand Down
12 changes: 6 additions & 6 deletions x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/alpha_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiTitle size="m">
<h2 id="AlphaMessagingFlyoutTitle">
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.flyoutTitle"
id="xpack.fleet.alphaMessaging.flyoutTitle"
defaultMessage="About this release"
/>
</h2>
Expand All @@ -37,13 +37,13 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiText size="m">
<p>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.introText"
id="xpack.fleet.alphaMessaging.introText"
defaultMessage="Fleet is under active development and is not intended for use in production environments. This beta release is designed for users to test and offer feedback about Fleet and the new Elastic Agent. This plugin is not subject to the support SLA."
/>
</p>
<p>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.feedbackText"
id="xpack.fleet.alphaMessaging.feedbackText"
defaultMessage="Read our {docsLink} or go to our {forumLink} for questions or feedback."
values={{
docsLink: (
Expand All @@ -53,15 +53,15 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
target="_blank"
>
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.docsLink"
id="xpack.fleet.alphaMessaging.docsLink"
defaultMessage="documentation"
/>
</EuiLink>
),
forumLink: (
<EuiLink href="https://ela.st/ingest-manager-forum" external target="_blank">
<FormattedMessage
id="xpack.ingestManager.alphaMessaging.forumLink"
id="xpack.fleet.alphaMessaging.forumLink"
defaultMessage="Discuss forum"
/>
</EuiLink>
Expand All @@ -74,7 +74,7 @@ export const AlphaFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
<EuiFlyoutFooter>
<EuiButtonEmpty onClick={onClose} flush="left">
<FormattedMessage
id="xpack.ingestManager.alphaMessging.closeFlyoutLabel"
id="xpack.fleet.alphaMessging.closeFlyoutLabel"
defaultMessage="Close"
/>
</EuiButtonEmpty>
Expand Down
9 changes: 3 additions & 6 deletions .../plugins/ingest_manager/public/applications/ingest_manager/components/alpha_messaging.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,17 @@ export const AlphaMessaging: React.FC<{}> = () => {
<Message>
<p>
<strong>
<FormattedMessage
id="xpack.ingestManager.alphaMessageTitle"
defaultMessage="Beta release"
/>
<FormattedMessage id="xpack.fleet.alphaMessageTitle" defaultMessage="Beta release" />
</strong>
{' – '}
<FormattedMessage
id="xpack.ingestManager.alphaMessageDescription"
id="xpack.fleet.alphaMessageDescription"
defaultMessage="Fleet is not
recommended for production environments."
/>{' '}
<EuiLink color="subdued" onClick={() => setIsAlphaFlyoutOpen(true)}>
<FormattedMessage
id="xpack.ingestManager.alphaMessageLinkText"
id="xpack.fleet.alphaMessageLinkText"
defaultMessage="See more details."
/>
</EuiLink>
Expand Down
2 changes: 1 addition & 1 deletion ...ins/ingest_manager/public/applications/ingest_manager/components/context_menu_actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const ContextMenuActions = React.memo<Props>(({ button, onChange, isOpen,
<EuiButtonIcon
iconType="boxesHorizontal"
onClick={handleToggleMenu}
aria-label={i18n.translate('xpack.ingestManager.genericActionsMenuText', {
aria-label={i18n.translate('xpack.fleet.genericActionsMenuText', {
defaultMessage: 'Open',
})}
/>
Expand Down
10 changes: 5 additions & 5 deletions ...er/public/applications/ingest_manager/components/enrollment_instructions/manual/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
<>
<EuiText>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.descriptionText"
id="xpack.fleet.enrollmentInstructions.descriptionText"
defaultMessage="From the agent directory, run the appropriate command to install, enroll, and start an Elastic Agent. You can reuse these commands to set up agents on more than one host. Requires administrator privileges."
/>
</EuiText>
<EuiSpacer size="l" />
<EuiTitle size="xs">
<h4>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.linuxMacOSTitle"
id="xpack.fleet.enrollmentInstructions.linuxMacOSTitle"
defaultMessage="Linux, macOS"
/>
</h4>
Expand All @@ -59,7 +59,7 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
<EuiTitle size="xs">
<h4>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.windowsTitle"
id="xpack.fleet.enrollmentInstructions.windowsTitle"
defaultMessage="Windows"
/>
</h4>
Expand All @@ -71,7 +71,7 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
<EuiSpacer size="l" />
<EuiText>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.moreInstructionsText"
id="xpack.fleet.enrollmentInstructions.moreInstructionsText"
defaultMessage="See the {link} for more instructions and options."
values={{
link: (
Expand All @@ -81,7 +81,7 @@ export const ManualInstructions: React.FunctionComponent<Props> = ({
href="https://www.elastic.co/guide/en/ingest-management/current/elastic-agent-installation-configuration.html"
>
<FormattedMessage
id="xpack.ingestManager.enrollmentInstructions.moreInstructionsLink"
id="xpack.fleet.enrollmentInstructions.moreInstructionsLink"
defaultMessage="Elastic Agent docs"
/>
</EuiLink>
Expand Down
2 changes: 1 addition & 1 deletion ...pplications/ingest_manager/components/home_integration/tutorial_directory_header_link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const TutorialDirectoryHeaderLink: TutorialDirectoryHeaderLinkComponent = memo((
return hasIngestManager && noticeState.settingsDataLoaded && noticeState.hasSeenNotice ? (
<EuiButtonEmpty size="s" iconType="link" flush="right" href={getHref('overview')}>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.fleetAppButtonText"
id="xpack.fleet.homeIntegration.tutorialDirectory.fleetAppButtonText"
defaultMessage="Try Fleet Beta"
/>
</EuiButtonEmpty>
Expand Down
12 changes: 6 additions & 6 deletions ...lic/applications/ingest_manager/components/home_integration/tutorial_directory_notice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
iconType="cheer"
title={
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeTitle"
id="xpack.fleet.homeIntegration.tutorialDirectory.noticeTitle"
defaultMessage="{newPrefix} Elastic Agent and Fleet Beta"
values={{
newPrefix: (
<strong>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeTitle.newPrefix"
id="xpack.fleet.homeIntegration.tutorialDirectory.noticeTitle.newPrefix"
defaultMessage="New:"
/>
</strong>
Expand All @@ -77,15 +77,15 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
>
<p>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeText"
id="xpack.fleet.homeIntegration.tutorialDirectory.noticeText"
defaultMessage="The Elastic Agent provides a simple, unified way to add monitoring for logs, metrics, and other types of data to your hosts.
You no longer need to install multiple Beats and other agents, which makes it easier and faster to deploy policies across your infrastructure.
For more information, read our {blogPostLink}."
values={{
blogPostLink: (
<EuiLink href="https://ela.st/ingest-manager-announcement" external target="_blank">
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.noticeText.blogPostLink"
id="xpack.fleet.homeIntegration.tutorialDirectory.noticeText.blogPostLink"
defaultMessage="announcement blog post"
/>
</EuiLink>
Expand All @@ -98,7 +98,7 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
<div>
<EuiButton size="s" href={getHref('overview')}>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.fleetAppButtonText"
id="xpack.fleet.homeIntegration.tutorialDirectory.fleetAppButtonText"
defaultMessage="Try Fleet Beta"
/>
</EuiButton>
Expand All @@ -113,7 +113,7 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
}}
>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialDirectory.dismissNoticeButtonText"
id="xpack.fleet.homeIntegration.tutorialDirectory.dismissNoticeButtonText"
defaultMessage="Dismiss message"
/>
</EuiButtonEmpty>
Expand Down
8 changes: 4 additions & 4 deletions ...public/applications/ingest_manager/components/home_integration/tutorial_module_notice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ moduleName }
<EuiText>
<p>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText"
id="xpack.fleet.homeIntegration.tutorialModule.noticeText"
defaultMessage="{notePrefix} a newer version of this module is {availableAsIntegrationLink} in Fleet Beta.
To learn more about agent policies and the new Elastic Agent, read our {blogPostLink}."
values={{
notePrefix: (
<strong>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText.notePrefix"
id="xpack.fleet.homeIntegration.tutorialModule.noticeText.notePrefix"
defaultMessage="Note:"
/>
</strong>
Expand All @@ -45,7 +45,7 @@ const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ moduleName }
})}
>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText.integrationLink"
id="xpack.fleet.homeIntegration.tutorialModule.noticeText.integrationLink"
defaultMessage="available as an Integration"
/>
</EuiLink>
Expand All @@ -57,7 +57,7 @@ const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ moduleName }
target="_blank"
>
<FormattedMessage
id="xpack.ingestManager.homeIntegration.tutorialModule.noticeText.blogPostLink"
id="xpack.fleet.homeIntegration.tutorialModule.noticeText.blogPostLink"
defaultMessage="announcement blog post"
/>
</EuiLink>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/search_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const SearchBar: React.FunctionComponent<Props> = ({
icon={'search'}
placeholder={
placeholder ||
i18n.translate('xpack.ingestManager.defaultSearchPlaceholderText', {
i18n.translate('xpack.fleet.defaultSearchPlaceholderText', {
defaultMessage: 'Search',
})
}
Expand Down
Loading