Fix issues with dynamic content

211-Connect · Aug 23, 2023 · ab702d8 · ab702d8
1 parent 0db815f
commit ab702d8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/packages/client/components/molecules/LocationAutocomplete.tsx b/packages/client/components/molecules/LocationAutocomplete.tsx
@@ -160,14 +160,16 @@ export function LocationAutocomplete(props: Props) {
  <Flex align="center" mt="sm">
  <Autocomplete
  aria-label={
- (t('search.location_placeholder') as string) ||
- (t('search.location_placeholder', { ns: 'dynamic' }) as string) ||
- ''
+ t('search.location_placeholder', {
+ ns: 'dynamic',
+ defaultValue: t('search.location_placeholder'),
+ }) || ''
  }
  placeholder={
- (t('search.location_placeholder') as string) ||
- (t('search.location_placeholder', { ns: 'dynamic' }) as string) ||
- ''
+ t('search.location_placeholder', {
+ ns: 'dynamic',
+ defaultValue: t('search.location_placeholder'),
+ }) || ''
  }
  size="md"
  value={value}

diff --git a/packages/client/components/molecules/TaxonomyAutocomplete/index.tsx b/packages/client/components/molecules/TaxonomyAutocomplete/index.tsx
@@ -113,15 +113,17 @@ export function TaxonomyAutocomplete({
  <Autocomplete
  {...rest}
  aria-label={
- (t('search.query_placeholder') as string) ||
- (t('search.query_placeholder', { ns: 'dynamic' }) as string) ||
- ''
+ t('search.query_placeholder', {
+ ns: 'dynamic',
+ defaultValue: t('search.query_placeholder'),
+ }) || ''
  }
  icon={<IconSearch />}
  placeholder={
- (t('search.query_placeholder') as string) ||
- (t('search.query_placeholder', { ns: 'dynamic' }) as string) ||
- ''
+ t('search.query_placeholder', {
+ ns: 'dynamic',
+ defaultValue: t('search.query_placeholder'),
+ }) || ''
  }
  filter={(value, item) => {
  if (isTaxonomyCode.test(value)) {

diff --git a/packages/client/components/organisms/HeroSection.tsx b/packages/client/components/organisms/HeroSection.tsx
@@ -103,8 +103,10 @@ export function HeroSection() {
  sx={{ borderRadius: theme.radius.md }}
  >
  <Title order={1} size="h3" color="primary" mb="md">
- {t('search.hero_title', { ns: 'common' }) ||
- t('search.hero_title', { ns: 'dynamic' })}
+ {t('search.hero_title', {
+ ns: 'dynamic',
+ defaultValue: t('search.hero_title', { ns: 'common' }),
+ })}
  </Title>
 
  <HomePageSearch />

diff --git a/packages/client/public/locales/en/common.json b/packages/client/public/locales/en/common.json
@@ -23,9 +23,9 @@
  "unable_to_delete_list_message": "Your list could not be deleted."
  },
  "search": {
- "hero_title": "",
- "query_placeholder": "",
- "location_placeholder": "",
+ "hero_title": "Search for resources",
+ "query_placeholder": "Food, housing, etc...",
+ "location_placeholder": "City, state, or ZIP code",
  "radius_placeholder": "Radius",
  "miles": "Miles",
  "any": "Any",

diff --git a/packages/client/public/locales/en/dynamic.json b/packages/client/public/locales/en/dynamic.json
@@ -1,9 +1,9 @@
 {
- "search.hero_title": "Where to Turn for Teens",
+ "search.hero_title": "Search for resources",
  "search.query_placeholder": "What do you need help with?",
  "search.location_placeholder": "City, state, zip, etc...",
- "meta_title": "Teen Link",
- "meta_description": "Teen Link is a program of Crisis Connections that serves youth in Washington State.",
+ "meta_title": "Community resources",
+ "meta_description": "",
  "categories.0": "Alcohol, Drugs, and Substance Use",
  "categories.0.subcategories.0": "Counseling/Treatment",
  "categories.0.subcategories.1": "Support Groups",
@@ -55,4 +55,4 @@
  "suggestions.11": "I need confidential access to a counselor.",
  "suggestions.12": "I think I might be pregnant.",
  "suggestions.13": "I’m being sexually harassed."
-}
+}