Move link text into subtitle translations

RedHatInsights · Jul 27, 2020 · 595c645 · 595c645
1 parent 58d0e15
commit 595c645
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 45 deletions.
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -78,10 +78,9 @@
     "tourDescription": "We'll walk you through each step, and include insight into how Red Hat collects and uses subscription data."
   },
   "curiosity-view": {
-    "learnMore": "Learn more about Subscription Watch reporting",
     "OpenShiftTitle": "Red Hat OpenShift",
-    "OpenShiftSubtitle": "Monitor your Red Hat OpenShift usage by socket or core usage, based on your subscription terms.",
+    "OpenShiftSubtitle": "Monitor your Red Hat OpenShift usage by socket or core usage, based on your subscription terms. <0>Learn more about Subscription Watch reporting</0>",
     "RHELTitle": "Red Hat Enterprise Linux",
-    "RHELSubtitle": "Monitor your Red Hat Enterprise Linux usage by physical, virtual, and public cloud sockets."
+    "RHELSubtitle": "Monitor your Red Hat Enterprise Linux usage by physical, virtual, and public cloud sockets. <0>Learn more about Subscription Watch reporting</0>"
   }
 }
diff --git a/src/components/pageLayout/__tests__/__snapshots__/pageHeader.test.js.snap b/src/components/pageLayout/__tests__/__snapshots__/pageHeader.test.js.snap
@@ -2,7 +2,6 @@
 
 exports[`PageHeader Component should render a basic component: basic 1`] = `
 <PageHeader
-  t={[Function]}
   viewId={null}
 >
   <PageHeader>
@@ -46,7 +45,6 @@ exports[`PageHeader Component should render a basic component: basic 1`] = `
 
 exports[`PageHeader Component should render string node types: string 1`] = `
 <PageHeader
-  t={[Function]}
   viewId={null}
 >
   <PageHeader>
@@ -80,7 +78,6 @@ exports[`PageHeader Component should render string node types: string 1`] = `
 
 exports[`PageHeader Component should render the subtitle when viewId is provided: with subtitle 1`] = `
 <PageHeader
-  t={[Function]}
   viewId="RHEL"
 >
   <PageHeader>
@@ -108,30 +105,7 @@ exports[`PageHeader Component should render the subtitle when viewId is provided
         </Title>
       </PageHeaderTitle>
       <p>
-        t(curiosity-view.RHELSubtitle)
-         
-        <Button
-          component="a"
-          href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/con-how-does-subscriptionwatch-show-data_assembly-opening-subscriptionwatch-ctxt/"
-          isInline={true}
-          target="_blank"
-          variant="link"
-        >
-          <a
-            aria-disabled={false}
-            aria-label={null}
-            className="pf-c-button pf-m-link pf-m-inline"
-            data-ouia-component-id={0}
-            data-ouia-component-type="PF4/Button"
-            data-ouia-safe={true}
-            disabled={null}
-            href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/con-how-does-subscriptionwatch-show-data_assembly-opening-subscriptionwatch-ctxt/"
-            target="_blank"
-            type={null}
-          >
-            t(curiosity-view.learnMore)
-          </a>
-        </Button>
+        t(curiosity-view.RHELSubtitle, [object Object], [object Object])
       </p>
     </section>
   </PageHeader>

diff --git a/src/components/pageLayout/pageHeader.js b/src/components/pageLayout/pageHeader.js
@@ -6,32 +6,30 @@ import {
   PageHeaderTitle
 } from '@redhat-cloud-services/frontend-components/components/cjs/PageHeader';
 import { Button } from '@patternfly/react-core';
-import { helpers } from '../../common';
+import { translate } from '../i18n/i18n';
 
 /**
  * Render a platform page header.
  *
  * @param {object} props
  * @param {Node} props.children
- * @param {Function} props.t
  * @param {string} props.viewId
  * @returns {Node}
  */
-const PageHeader = ({ children, t, viewId }) => (
+const PageHeader = ({ children, viewId }) => (
   <RcsPageHeader>
     <PageHeaderTitle title={children} />
     {viewId && (
       <p>
-        {t(`curiosity-view.${viewId}Subtitle`)}{' '}
-        <Button
-          isInline
-          component="a"
-          variant="link"
-          target="_blank"
-          href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/con-how-does-subscriptionwatch-show-data_assembly-opening-subscriptionwatch-ctxt/"
-        >
-          {t('curiosity-view.learnMore')}
-        </Button>
+        {translate(`curiosity-view.${viewId}Subtitle`, {}, [
+          <Button
+            isInline
+            component="a"
+            variant="link"
+            target="_blank"
+            href="https://access.redhat.com/documentation/en-us/subscription_central/2020-04/html/getting_started_with_subscription_watch/con-how-does-subscriptionwatch-show-data_assembly-opening-subscriptionwatch-ctxt/"
+          />
+        ])}
       </p>
     )}
   </RcsPageHeader>
@@ -44,15 +42,13 @@ const PageHeader = ({ children, t, viewId }) => (
  */
 PageHeader.propTypes = {
   children: PropTypes.node.isRequired,
-  t: PropTypes.func,
   viewId: PropTypes.string
 };
 
 /**
  * Default props.
  */
 PageHeader.defaultProps = {
-  t: helpers.noopTranslate,
   viewId: null
 };