[Ingest Manager] Copy fixes (#68325)

* #68153 Change Elastic integrations to Integrations * Fix copy casing * #68152 Update create data source CTA copy * #68166 Remove icon next to top-level navigation when user is on new Kibana navigation style * Fix i18n Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2020-06-08 17:16:30 -07:00 · 2020-06-08 17:16:30 -07:00 · 299a6026fd
parent d1ed207945
commit 299a6026fd
11 changed files with 20 additions and 16 deletions
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
@ -167,7 +167,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
              'xpack.ingestManager.settings.integrationUpgradeEnabledFieldLabel',
              {
                defaultMessage:
-                  'Automatically update Integrations to the latest version to receive the latest assets. Agent configurations may need to be updated in order to use new features.',
+                  'Automatically update integrations to the latest version to receive the latest assets. Agent configurations may need to be updated in order to use new features.',
              }
            ),
          },
@ -190,7 +190,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
              <h3>
                <FormattedMessage
                  id="xpack.ingestManager.settings.integrationUpgradeFieldLabel"
-                  defaultMessage="Elastic integration version"
+                  defaultMessage="Integration version"
                />
              </h3>
            </EuiTitle>
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/layouts/default.tsx
@ -9,7 +9,7 @@ import { EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiButtonEmpty } f
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Section } from '../sections';
 import { AlphaMessaging, SettingFlyout } from '../components';
-import { useLink, useConfig } from '../hooks';
+import { useLink, useConfig, useCore } from '../hooks';

 interface Props {
  showSettings?: boolean;
@ -42,6 +42,7 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
 }) => {
  const { getHref } = useLink();
  const { epm, fleet } = useConfig();
+  const { uiSettings } = useCore();
  const [isSettingsFlyoutOpen, setIsSettingsFlyoutOpen] = React.useState(false);

  return (
@ -57,9 +58,11 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
        <div>
          <Nav>
            <EuiFlexGroup gutterSize="l" alignItems="center">
-              <EuiFlexItem grow={false}>
-                <EuiIcon type="savedObjectsApp" size="l" />
-              </EuiFlexItem>
+              {uiSettings.get('pageNavigation') === 'legacy' ? (
+                <EuiFlexItem grow={false}>
+                  <EuiIcon type="savedObjectsApp" size="l" />
+                </EuiFlexItem>
+              ) : null}
              <EuiFlexItem>
                <EuiTabs display="condensed">
                  <EuiTab isSelected={section === 'overview'} href={getHref('overview')}>
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx
@ -58,7 +58,7 @@ export const AgentConfigActionMenu = memo<{ configId: string; fullButton?: boole
            >
              <FormattedMessage
                id="xpack.ingestManager.agentConfigActionMenu.createDatasourceActionText"
-                defaultMessage="Create data source"
+                defaultMessage="Add data source"
              />
            </EuiContextMenuItem>,
          ]}
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/datasources/datasources_table.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/datasources/datasources_table.tsx
@ -280,7 +280,7 @@ export const DatasourcesTable: React.FunctionComponent<Props> = ({
          >
            <FormattedMessage
              id="xpack.ingestManager.configDetails.addDatasourceButtonText"
-              defaultMessage="Create data source"
+              defaultMessage="Add data source"
            />
          </EuiButton>,
        ],
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/datasources/no_datasources.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/datasources/no_datasources.tsx
@ -38,7 +38,7 @@ export const NoDatasources = memo<{ configId: string }>(({ configId }) => {
        >
          <FormattedMessage
            id="xpack.ingestManager.configDetailsDatasources.createFirstButtonText"
-            defaultMessage="Create data source"
+            defaultMessage="Add data source"
          />
        </EuiButton>
      }
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/confirm_package_uninstall.tsx
@ -56,7 +56,7 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
          <p>
            <FormattedMessage
              id="xpack.ingestManager.integrations.settings.confirmUninstallModal.uninstallCallout.description"
-              defaultMessage="Kibana and Elasticsearch assets that were created by this Integration will be removed. Agents configurations and any data sent by your agents will not be effected."
+              defaultMessage="Kibana and Elasticsearch assets that were created by this integration will be removed. Agents configurations and any data sent by your agents will not be effected."
            />
          </p>
        </EuiCallOut>
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/header.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/header.tsx
@ -74,7 +74,10 @@ export function Header(props: HeaderProps) {
              >
                <FormattedMessage
                  id="xpack.ingestManager.epm.addDatasourceButtonText"
-                  defaultMessage="Create data source"
+                  defaultMessage="Add {packageName}"
+                  values={{
+                    packageName: title,
+                  }}
                />
              </EuiButton>
            </EuiFlexItem>
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/detail/settings_panel.tsx
@ -175,7 +175,7 @@ export const SettingsPanel = (
              <p>
                <FormattedMessage
                  id="xpack.ingestManager.integrations.settings.packageUninstallDescription"
-                  defaultMessage="Remove Kibana and Elasticsearch assets that were installed by this Integration."
+                  defaultMessage="Remove Kibana and Elasticsearch assets that were installed by this integration."
                />
              </p>
            </div>
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/home/header.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/screens/home/header.tsx
@ -20,7 +20,7 @@ export const HeroCopy = memo(() => {
          <h1>
            <FormattedMessage
              id="xpack.ingestManager.epm.pageTitle"
-              defaultMessage="Elastic Integrations"
+              defaultMessage="Integrations"
            />
          </h1>
        </EuiText>
@ -46,7 +46,7 @@ export const HeroImage = memo(() => {

  const Illustration = styled(EuiImage).attrs((props) => ({
    alt: i18n.translate('xpack.ingestManager.epm.illustrationAltText', {
-      defaultMessage: 'Illustration of an Elastic integration',
+      defaultMessage: 'Illustration of an integration',
    }),
    url: IS_DARK_THEME
      ? toAssets('illustration_integrations_darkmode.svg')
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@ -8362,7 +8362,6 @@
    "xpack.ingestManager.enrollmentTokensList.newKeyButton": "新しい登録トークン",
    "xpack.ingestManager.enrollmentTokensList.pageDescription": "これは、エージェントを登録するために使用できる登録トークンのリストです。",
    "xpack.ingestManager.enrollmentTokensList.secretTitle": "シークレット",
-    "xpack.ingestManager.epm.addDatasourceButtonText": "データソースを作成",
    "xpack.ingestManager.epm.browseAllButtonText": "すべての統合を参照",
    "xpack.ingestManager.epm.illustrationAltText": "Elastic統合の例",
    "xpack.ingestManager.epm.pageSubtitle": "一般的なアプリやサービスの統合を参照する",
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@ -8366,7 +8366,6 @@
    "xpack.ingestManager.enrollmentTokensList.newKeyButton": "新建注册令牌",
    "xpack.ingestManager.enrollmentTokensList.pageDescription": "这是可用于注册代理的注册令牌列表。",
    "xpack.ingestManager.enrollmentTokensList.secretTitle": "密钥",
-    "xpack.ingestManager.epm.addDatasourceButtonText": "创建数据源",
    "xpack.ingestManager.epm.browseAllButtonText": "浏览所有集成",
    "xpack.ingestManager.epm.illustrationAltText": "Elastic 集成的图示",
    "xpack.ingestManager.epm.pageSubtitle": "浏览集成以了解热门应用和服务。",