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.

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

[EPM] Update UI copy to use integration #63077

Merged
merged 6 commits into from
Apr 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({ section, childre
disabled={!epm?.enabled}
>
<FormattedMessage
id="xpack.ingestManager.appNavigation.packagesLinkText"
defaultMessage="Packages"
id="xpack.ingestManager.appNavigation.epmLinkText"
defaultMessage="Integrations"
/>
</EuiTab>
<EuiTab isSelected={section === 'agent_config'} href={useLink(AGENT_CONFIG_PATH)}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const CreateDatasourcePageLayout: React.FunctionComponent<{
<EuiDescriptionListTitle>
<FormattedMessage
id="xpack.ingestManager.createDatasource.packageNameLabel"
defaultMessage="Package"
defaultMessage="Integration"
/>
</EuiDescriptionListTitle>
<EuiDescriptionListDescription>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const CreateDatasourceStepsNavigation: React.FunctionComponent<{
from === 'config'
? {
title: i18n.translate('xpack.ingestManager.createDatasource.stepSelectPackageLabel', {
defaultMessage: 'Select package',
defaultMessage: 'Select integration',
}),
isSelected: currentStep === 'selectPackage',
isComplete:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ export const CreateDatasourcePage: React.FunctionComponent = () => {
{from === 'config' ? (
<FormattedMessage
id="xpack.ingestManager.createDatasource.changePackageLinkText"
defaultMessage="Change package"
defaultMessage="Change integration"
/>
) : (
<FormattedMessage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const StepSelectPackage: React.FunctionComponent<{
title={
<FormattedMessage
id="xpack.ingestManager.createDatasource.stepSelectPackage.errorLoadingPackagesTitle"
defaultMessage="Error loading packages"
defaultMessage="Error loading integrations"
/>
}
error={packagesError}
Expand All @@ -114,7 +114,7 @@ export const StepSelectPackage: React.FunctionComponent<{
<h3>
<FormattedMessage
id="xpack.ingestManager.createDatasource.stepSelectPackage.selectPackageTitle"
defaultMessage="Select a package"
defaultMessage="Select integration"
/>
</h3>
</EuiTitle>
Expand Down Expand Up @@ -149,7 +149,7 @@ export const StepSelectPackage: React.FunctionComponent<{
placeholder: i18n.translate(
'xpack.ingestManager.createDatasource.stepSelectPackage.filterPackagesInputPlaceholder',
{
defaultMessage: 'Search for packages',
defaultMessage: 'Search for integrations',
}
),
}}
Expand Down Expand Up @@ -179,7 +179,7 @@ export const StepSelectPackage: React.FunctionComponent<{
title={
<FormattedMessage
id="xpack.ingestManager.createDatasource.stepSelectPackage.errorLoadingSelectedPackageTitle"
defaultMessage="Error loading selected package"
defaultMessage="Error loading selected integration"
/>
}
error={selectedPkgError}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export const DatasourcesTable: React.FunctionComponent<Props> = ({
name: i18n.translate(
'xpack.ingestManager.configDetails.datasourcesTable.packageNameColumnTitle',
{
defaultMessage: 'Package',
defaultMessage: 'Integration',
}
),
render(packageTitle: string, datasource: InMemoryDatasource) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function PackageListGrid({
query={searchTerm}
box={{
placeholder: i18n.translate('xpack.ingestManager.epmList.searchPackagesPlaceholder', {
defaultMessage: 'Search for a package',
defaultMessage: 'Search for integrations',
}),
incremental: true,
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
import React, { Fragment } from 'react';
import styled from 'styled-components';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiFlexGroup, EuiFlexItem, EuiPage, EuiTitle, IconType, EuiButton } from '@elastic/eui';
import { PackageInfo } from '../../../../types';
Expand Down Expand Up @@ -41,7 +42,12 @@ export function Header(props: HeaderProps) {
return (
<Fragment>
<FullWidthNavRow>
<NavButtonBack href={toListView()} text="Browse Packages" />
<NavButtonBack
href={toListView()}
text={i18n.translate('xpack.ingestManager.epm.browseAllButtonText', {
defaultMessage: 'Browse all integrations',
})}
/>
</FullWidthNavRow>
<EuiFlexGroup>
{iconType ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const HeroCopy = memo(() => {
<h1>
<FormattedMessage
id="xpack.ingestManager.epm.pageTitle"
defaultMessage="Elastic Package Manager"
defaultMessage="Elastic Integrations"
/>
</h1>
</EuiText>
Expand All @@ -27,7 +27,7 @@ export const HeroCopy = memo(() => {
<p>
<FormattedMessage
id="xpack.ingestManager.epm.pageSubtitle"
defaultMessage="Browse packages for popular apps and services."
defaultMessage="Browse integrations for popular apps and services."
/>
</p>
</EuiText>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ export function EPMHomePage() {
([
{
id: 'all_packages',
name: i18n.translate('xpack.ingestManager.epmList.allPackagesTabText', {
defaultMessage: 'All packages',
name: i18n.translate('xpack.ingestManager.epmList.allTabText', {
defaultMessage: 'All integrations',
}),
href: ALL_PACKAGES_URI,
isSelected: tabId !== 'installed',
},
{
id: 'installed_packages',
name: i18n.translate('xpack.ingestManager.epmList.installedPackagesTabText', {
defaultMessage: 'Installed packages',
name: i18n.translate('xpack.ingestManager.epmList.installedTabText', {
defaultMessage: 'Installed integrations',
}),
href: INSTALLED_PACKAGES_URI,
isSelected: tabId === 'installed',
Expand Down Expand Up @@ -72,14 +72,14 @@ function InstalledPackages() {
? allPackages.response.filter(pkg => pkg.status === 'installed')
: [];

const title = i18n.translate('xpack.ingestManager.epmList.installedPackagesTitle', {
defaultMessage: 'Installed packages',
const title = i18n.translate('xpack.ingestManager.epmList.installedTitle', {
defaultMessage: 'Installed integrations',
});

const categories = [
{
id: '',
title: i18n.translate('xpack.ingestManager.epmList.allPackagesFilterLinkText', {
title: i18n.translate('xpack.ingestManager.epmList.allFilterLinkText', {
defaultMessage: 'All',
}),
count: packages.length,
Expand Down Expand Up @@ -120,8 +120,8 @@ function AvailablePackages() {
const packages =
categoryPackagesRes && categoryPackagesRes.response ? categoryPackagesRes.response : [];

const title = i18n.translate('xpack.ingestManager.epmList.allPackagesTitle', {
defaultMessage: 'All packages',
const title = i18n.translate('xpack.ingestManager.epmList.allTitle', {
defaultMessage: 'All integrations',
});

const categories = [
Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -8408,7 +8408,6 @@
"xpack.ingestManager.appNavigation.configurationsLinkText": "構成",
"xpack.ingestManager.appNavigation.fleetLinkText": "フリート",
"xpack.ingestManager.appNavigation.overviewLinkText": "概要",
"xpack.ingestManager.appNavigation.packagesLinkText": "パッケージ",
"xpack.ingestManager.appTitle": "Ingest Manager",
"xpack.ingestManager.configDetails.addDatasourceButtonText": "データソースを作成",
"xpack.ingestManager.configDetails.configDetailsTitle": "構成「{id}」",
Expand Down Expand Up @@ -8534,10 +8533,6 @@
"xpack.ingestManager.epm.pageSubtitle": "人気のアプリやサービスのパッケージを参照する",
"xpack.ingestManager.epm.pageTitle": "Elastic Package Manager",
"xpack.ingestManager.epmList.allPackagesFilterLinkText": "すべて",
"xpack.ingestManager.epmList.allPackagesTabText": "すべてのパッケージ",
"xpack.ingestManager.epmList.allPackagesTitle": "すべてのパッケージ",
"xpack.ingestManager.epmList.installedPackagesTabText": "パッケージをインストールしました",
"xpack.ingestManager.epmList.installedPackagesTitle": "パッケージをインストールしました",
"xpack.ingestManager.epmList.noPackagesFoundPlaceholder": "パッケージが見つかりません",
"xpack.ingestManager.epmList.searchPackagesPlaceholder": "パッケージを検索",
"xpack.ingestManager.epmList.updatesAvailableFilterLinkText": "更新が可能です",
Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -8411,7 +8411,6 @@
"xpack.ingestManager.appNavigation.configurationsLinkText": "配置",
"xpack.ingestManager.appNavigation.fleetLinkText": "Fleet",
"xpack.ingestManager.appNavigation.overviewLinkText": "概览",
"xpack.ingestManager.appNavigation.packagesLinkText": "软件包",
"xpack.ingestManager.appTitle": "Ingest Manager",
"xpack.ingestManager.configDetails.addDatasourceButtonText": "创建数据源",
"xpack.ingestManager.configDetails.configDetailsTitle": "配置“{id}”",
Expand Down Expand Up @@ -8537,10 +8536,6 @@
"xpack.ingestManager.epm.pageSubtitle": "浏览热门应用和服务的软件。",
"xpack.ingestManager.epm.pageTitle": "Elastic Package Manager",
"xpack.ingestManager.epmList.allPackagesFilterLinkText": "全部",
"xpack.ingestManager.epmList.allPackagesTabText": "所有软件包",
"xpack.ingestManager.epmList.allPackagesTitle": "所有软件包",
"xpack.ingestManager.epmList.installedPackagesTabText": "已安装软件包",
"xpack.ingestManager.epmList.installedPackagesTitle": "已安装软件包",
"xpack.ingestManager.epmList.noPackagesFoundPlaceholder": "未找到任何软件包",
"xpack.ingestManager.epmList.searchPackagesPlaceholder": "搜索软件包",
"xpack.ingestManager.epmList.updatesAvailableFilterLinkText": "有可用更新",
Expand Down