New copy for strategyform (#42815)

enterprise/frontend/src/metabase-enterprise/caching/components/GranularControlsExplanation.tsx

 import { t } from "ttag";
 
-import { Title } from "metabase/ui";
-
 export const GranularControlsExplanation = () => (
   <>
     &nbsp;
-    {t`You can set up one rule for all your databases, or apply more specific settings to each database.`}
-    <Title
-      order={4}
-    >{t`Pick the policy for when cached query results should be invalidated.`}</Title>
+    {t`You can set up one caching policy for all your databases, or set up caching policies specific to each database.`}
   </>
 );

enterprise/frontend/src/metabase-enterprise/caching/components/InvalidateNowButton.tsx

@@ -87,14 +87,14 @@ const InvalidateNowFormBody = ({ targetName }: { targetName?: string }) => {
           label={
             <Group spacing="sm">
               <Icon color={color("danger")} name="trash" />
-              <Text>{t`Invalidate cache now`}</Text>
+              <Text>{t`Clear cache`}</Text>
             </Group>
           }
           activeLabel={
             <Group spacing="sm">
               <Loader size="1rem" />
-              <Text>{c("Shown when a cache is being invalidated")
-                .t`Invalidating… `}</Text>
+              <Text>{c("Shown when a cache is being cleared")
+                .t`Clearing cache… `}</Text>
             </Group>
           }
           successLabel={

frontend/src/metabase/admin/performance/components/StrategyEditorForDatabases.tsx

@@ -131,10 +131,8 @@ const StrategyEditorForDatabases_Base = ({
     <TabWrapper role="region" aria-label={t`Data caching settings`}>
       <Stack spacing="xl" lh="1.5rem" maw="32rem" mb="1.5rem">
         <aside>
-          <Stack spacing="xl">
-            {t`Cache the results of queries to have them display instantly. Here you can choose when cached results should be invalidated.`}
-            <PLUGIN_CACHING.GranularControlsExplanation />
-          </Stack>
+          {t`Speed up queries by caching their results.`}
+          <PLUGIN_CACHING.GranularControlsExplanation />
         </aside>
       </Stack>
       {confirmationModal}

frontend/src/metabase/admin/performance/components/StrategyForm.styled.tsx

 import styled from "@emotion/styled";
 
-import { FixedSizeIcon, Loader } from "metabase/ui";
+import { Form } from "metabase/forms";
+import { color } from "metabase/lib/colors";
+import type { BoxProps } from "metabase/ui";
+import { Box, FixedSizeIcon, Loader } from "metabase/ui";
 
 export const LoaderInButton = styled(Loader)`
   position: relative;
@@ -11,3 +14,21 @@ export const IconInButton = styled(FixedSizeIcon)`
   position: relative;
   top: 1px;
 `;
+
+export const FormWrapper = styled.div`
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+`;
+
+export const StyledForm = styled(Form)`
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+`;
+
+export const FormBox = styled(Box)<BoxProps>`
+  border-bottom: 1px solid ${color("border")};
+  overflow: auto;
+  flex-grow: 1;
+`;

frontend/src/metabase/admin/performance/components/StrategyForm.tsx

@@ -8,14 +8,12 @@ import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper";
 import { Schedule } from "metabase/components/Schedule/Schedule";
 import type { FormTextInputProps } from "metabase/forms";
 import {
-  Form,
   FormProvider,
   FormRadioGroup,
   FormSubmitButton,
   FormTextInput,
   useFormContext,
 } from "metabase/forms";
-import { color } from "metabase/lib/colors";
 import { useSelector } from "metabase/lib/redux";
 import { PLUGIN_CACHING } from "metabase/plugins";
 import { getSetting } from "metabase/selectors/settings";
@@ -49,7 +47,12 @@ import {
 } from "../strategies";
 import { cronToScheduleSettings, scheduleSettingsToCron } from "../utils";
 
-import { LoaderInButton } from "./StrategyForm.styled";
+import {
+  FormBox,
+  FormWrapper,
+  LoaderInButton,
+  StyledForm,
+} from "./StrategyForm.styled";
 
 interface ButtonLabels {
   save: string;
@@ -155,32 +158,12 @@ const StrategyFormBody = ({
   }, [selectedStrategyType, values, setFieldValue]);
 
   return (
-    <div
-      style={{
-        height: "100%",
-        display: "flex",
-        flexDirection: "column",
-      }}
-    >
-      <Form
-        style={{
-          display: "flex",
-          flexDirection: "column",
-          flexGrow: 1,
-          ...formStyle,
-        }}
-      >
-        <Box
-          className="strategy-form-box"
-          style={{
-            borderBottom: `1px solid ${color("border")}`,
-            overflow: "auto",
-            flexGrow: 1,
-          }}
-        >
+    <FormWrapper>
+      <StyledForm style={{ ...formStyle }}>
+        <FormBox className="strategy-form-box">
           {shouldShowName && (
-            <Box lh="1rem" px="lg" py="xs" color="text-medium">
-              <Group spacing="sm">
+            <Box lh="1rem" px="lg" py="md" color="text-medium">
+              <Group spacing="lg">
                 {targetModel === "database" && (
                   <FixedSizeIcon name="database" color="inherit" />
                 )}
@@ -231,7 +214,7 @@ const StrategyFormBody = ({
               <ScheduleStrategyFormFields />
             )}
           </Stack>
-        </Box>
+        </FormBox>
         <FormButtons
           targetId={targetId}
           targetModel={targetModel}
@@ -239,8 +222,8 @@ const StrategyFormBody = ({
           shouldAllowInvalidation={shouldAllowInvalidation}
           buttonLabels={buttonLabels}
         />
-      </Form>
-    </div>
+      </StyledForm>
+    </FormWrapper>
   );
 };
 
@@ -395,10 +378,14 @@ const StrategySelector = ({
     <section>
       <FormRadioGroup
         label={
-          <Text
-            lh="1rem"
-            color="text-medium"
-          >{t`When should cached query results be invalidated?`}</Text>
+          <Stack spacing="xs">
+            <Text lh="1rem" color="text-medium">
+              {t`Select the cache invalidation policy`}
+            </Text>
+            <Text lh="1rem" fw="normal" size="sm" color="text-medium">
+              {t`This determines how long cached results will be stored.`}
+            </Text>
+          </Stack>
         }
         name="type"
       >

src/metabase/api/cache.clj

@@ -122,9 +122,9 @@
     {:status (if (= cnt -1) 404 200)
      :body   {:count   cnt
               :message (case [(= include :overrides) (if (pos? cnt) 1 cnt)]
-                         [true -1]  (tru "Could not find a question for the criteria you specified.")
-                         [true 0]   (tru "No cached results to invalidate.")
-                         [true 1]   (trun "Invalidated a cached result." "Invalidated {0} cached results." cnt)
+                         [true -1]  (tru "Could not find any questions for the criteria you specified.")
+                         [true 0]   (tru "No cached results to clear.")
+                         [true 1]   (trun "Cleared a cached result." "Cleared {0} cached results." cnt)
                          [false -1] (tru "Nothing to invalidate.")
                          [false 0]  (tru "No cache configuration to invalidate.")
                          [false 1]  (trun "Invalidated cache configuration." "Invalidated {0} cache configurations." cnt))}}))