publicdata/j40-cejst-2
1
0
Fork 0
mirror of https://github.com/DOI-DO/j40-cejst-2.git synced 2025-07-30 09:01:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update Spanish content (#2203)

Browse source 
* update spanish content

- closes #2154

* fix download links

- add how to use communites document in Spanish

* add language toggle on mobile

- update snapshots

* add instruction and memo in spanish

* add translations

* update tutorial links

* update links to es

* remove npm audit

* add survey links to "how you can help"

* change case back to lower case
This commit is contained in:
Vim 2023-06-27 09:42:39 -07:00 • committed by GitHub
commit 856e5084db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 3915 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/deploy_fe_main.yml vendored
View file

@ -45,8 +45,8 @@ jobs:
# run: npm run licenses
- name: Test
run: npm test
- name: Check for security vulnerabilities
run: npm audit --production
# - name: Check for security vulnerabilities
# run: npm audit --production
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:

4
.github/workflows/deploy_fe_staging.yml vendored
View file

@ -47,8 +47,8 @@ jobs:
# run: npm run licenses
- name: Test
run: npm test
- name: Check for security vulnerabilities
run: npm audit --production
# - name: Check for security vulnerabilities
# run: npm audit --production
# - name: Cypress / Gherkin integration tests 🌃
# uses: cypress-io/github-action@v4
# with:

3
client/.env.development
View file

@ -22,11 +22,14 @@ GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-sli
GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx
GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv
GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF=downloadable/1.0-communities-list.pdf
GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_ES_PDF=downloadable/1.0-communities-list-es.pdf
GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip
GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF=downloadable/CEQ-CEJST-Instructions.pdf
GATSBY_FILE_DL_PATH_1_0_INSTRUCT_ES_PDF=downloadable/CEQ-CEJST-Instructions-es.pdf
GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf
GATSBY_FILE_DL_PATH_1_0_TSD_PDF=downloadable/1.0-cejst-technical-support-document.pdf
GATSBY_FILE_DL_PATH_1_0_TOOL_COMP_PDF=downloadable/1.0-climate-and-environmental-burden-tool-comparison.pdf
GATSBY_FILE_DL_PATH_1_0_M_23_09_SIGNED_PDF=downloadable/M-23-09_Signed_CEQ_CPO_es.pdf
GATSBY_FILE_DL_PATH_TSD_ES_PDF=downloadable/cejst-technical-support-document-es.pdf
GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF=downloadable/draft-communities-list.pdf

3
client/.env.production
View file

@ -19,11 +19,14 @@ GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-sli
GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx
GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv
GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF=downloadable/1.0-communities-list.pdf
GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_ES_PDF=downloadable/1.0-communities-list-es.pdf
GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip
GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF=downloadable/CEQ-CEJST-Instructions.pdf
GATSBY_FILE_DL_PATH_1_0_INSTRUCT_ES_PDF=downloadable/CEQ-CEJST-Instructions-es.pdf
GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf
GATSBY_FILE_DL_PATH_1_0_TSD_PDF=downloadable/1.0-cejst-technical-support-document.pdf
GATSBY_FILE_DL_PATH_1_0_TOOL_COMP_PDF=downloadable/1.0-climate-and-environmental-burden-tool-comparison.pdf
GATSBY_FILE_DL_PATH_1_0_M_23_09_SIGNED_PDF=downloadable/M-23-09_Signed_CEQ_CPO_es.pdf
GATSBY_FILE_DL_PATH_TSD_ES_PDF=downloadable/cejst-technical-support-document-es.pdf
GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF=downloadable/draft-communities-list.pdf

2
client/src/components/AreaDetail/AreaDetail.tsx
View file

@ -872,7 +872,7 @@ const AreaDetail = ({properties}: IAreaDetailProps) => {
{/* Send Feedback button */}
<a
className={styles.sendFeedbackLink}
href={`https://www.surveymonkey.com/r/6GKVCMF?tractid=${blockGroup}`}
href={intl.locale === `es` ? `https://www.surveymonkey.com/r/ZHP6VZZ?tractid=${blockGroup}` : `https://www.surveymonkey.com/r/6GKVCMF?tractid=${blockGroup}`}
target={"_blank"}
rel="noreferrer"
>

2
client/src/components/DatasetContainer/index.tsx
View file

@ -35,7 +35,7 @@ const DatasetContainer = () => {
<Grid desktop={{col: 1}}>
</Grid>
<Grid desktop={{col: 4}}>
<DatasetsButton href= {'https://www.surveymonkey.com/r/6G9TQJ8'}/>
<DatasetsButton href= {intl.locale === 'es' ? 'https://www.surveymonkey.com/r/ZPKY8G9' : 'https://www.surveymonkey.com/r/6G9TQJ8'} />
</Grid>
</Grid>

2
client/src/components/DownloadButton/DownloadButton.module.scss
View file

@ -6,7 +6,7 @@
};
@mixin downloadButtonBase {
height: 40px;
height: fit-content;
@include u-margin-top(3);
.buttonContainer {

5
client/src/components/GovernmentBanner/GovernmentBanner.tsx
View file

@ -2,7 +2,7 @@ import React from 'react';
import {GovBanner} from '@trussworks/react-uswds';
import {useIntl} from 'gatsby-plugin-intl';
// import Language from '../Language';
import Language from '../Language';
import * as styles from './GovernmentBanner.module.scss';
@ -14,8 +14,7 @@ const GovernmentBanner = () => {
<div className={styles.bannerContainer}>
<GovBanner language={intl.locale === 'es' ? 'spanish' : 'english'}/>
{/* Temporarily removing while language is translated */}
{/* <Language isDesktop={true}/> */}
<Language isDesktop={true}/>
</div>
</div>

18
client/src/components/GovernmentBanner/__snapshots__/GovernmentBanner.test.tsx.snap
View file

@ -135,6 +135,24 @@ exports[`rendering of the GovernmentBanner checks if component renders 1`] = `
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
</DocumentFragment>

3
client/src/components/J40Footer/J40Footer.tsx
View file

@ -14,6 +14,7 @@ import SurveyButton from '../SurveyButton';
// @ts-ignore
import whitehouseIcon from '../../images/eop-seal.svg';
import * as COMMON_COPY from '../../data/copy/common';
import {GITHUB_LINK, GITHUB_LINK_ES} from '../../../src/data/copy/about';
const J40Footer = () => {
const intl = useIntl();
@ -82,7 +83,7 @@ const J40Footer = () => {
<LinkTypeWrapper
linkText={intl.formatMessage(COMMON_COPY.FOOTER.GITHUB_LINK_TEXT)}
internal={false}
url={intl.formatMessage(COMMON_COPY.FOOTER.GITHUB_LINK)}
url={intl.locale === 'es' ? GITHUB_LINK_ES : GITHUB_LINK}
openUrlNewTab={true}
className={'footer-link-first-child'}
key={'contactlink'}

9
client/src/components/J40Header/J40Header.tsx
View file

@ -12,7 +12,7 @@ import {
import BetaBanner from '../BetaBanner';
import J40MainGridContainer from '../J40MainGridContainer';
import GovernmentBanner from '../GovernmentBanner';
// import Language from '../Language';
import Language from '../Language';
import {useWindowSize} from 'react-use';
// @ts-ignore
@ -237,10 +237,9 @@ const J40Header = ({location}:IJ40Header) => {
data-cy={'nav-link-contact'}>
{intl.formatMessage(COMMON_COPY.HEADER.CONTACT)}
</Link>,
// Temporarily removing language link until translation is completed
// <div key={'language'}>
// <Language isDesktop={false}/>
// </div>,
<div key={'language'}>
<Language isDesktop={false}/>
</div>,
];
return (

42
client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
View file

@ -140,6 +140,24 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
<div>
@ -337,6 +355,30 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
Contact
</a>
</li>
<li
class="usa-nav__primary-item"
>
<div>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</li>
</ul>
</nav>
</div>

4
client/src/components/SurveyButton/SurveyButton.tsx
View file

@ -11,7 +11,9 @@ import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg';
const SurveyButton = () => {
const intl = useIntl();
const href = intl.formatMessage(CONTACT_COPY.PAGE_INTRO.SURVEY_URL);
const href = intl.locale === 'es' ?
`https://www.surveymonkey.com/r/ZH36CYV` :
`https://www.surveymonkey.com/r/P3LWTSB`;
return (
<J40MainGridContainer className={styles.surveyButtonContainer}>

13
client/src/data/copy/about.tsx
View file

@ -13,11 +13,17 @@ export const FED_RECOGNIZED_INDIAN_ENTITIES = `https://www.federalregister.gov/d
export const EJSCREEN = 'https://www.epa.gov/ejscreen/how-does-epa-use-ejscreen';
export const CEJST_INSTRUCT = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/CEQ-CEJST-Instructions.pdf`;
export const CEJST_INSTRUCT_ES = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/CEQ-CEJST-Instructions-es.pdf`;
export const CEJST_MEMO = `https://www.whitehouse.gov/wp-content/uploads/2023/01/M-23-09_Signed_CEQ_CPO.pdf`;
export const CEJST_MEMO_ES = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/M-23-09_Signed_CEQ_CPO_es.pdf`;
export const USE_MAP_TUTORIAL_LINK = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/Using-the-CEJST-Tutorial.pdf`;
export const USE_DATA_TUTORIAL_LINK = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/Using-the-CEJST-Spreadsheet-Tutorial.pdf`;
export const GITHUB_LINK = 'https://github.com/usds/justice40-tool';
export const GITHUB_LINK_ES = 'https://github.com/usds/justice40-tool/blob/main/README-es.md';
export const PAGE = defineMessages({
TITLE: {
id: 'about.page.title.text',
@ -80,6 +86,7 @@ export const CONTENT = {
description={'Navigate to the About page. This is the list item 2'}
values={{
link1: linkFn(CEJST_INSTRUCT, false, true),
link1es: linkFn(CEJST_INSTRUCT_ES, false, true),
}}
/>,
PARA4:
@ -144,7 +151,7 @@ export const CONTENT = {
description={'Navigate to the About page. This the link to download the how to use map tutorial'}
/>,
USE_DATA_TUTORIAL: <FormattedMessage
id={'about.page.use.map.tutorial'}
id={'about.page.use.data.tutorial'}
defaultMessage={`
Download the spreadsheet tutorial (.pdf 5.4 MB)
`}
@ -152,7 +159,6 @@ export const CONTENT = {
/>,
};
export const GITHUB_LINK = 'https://github.com/usds/justice40-tool';
export const HOW_TO_USE_TOOL = defineMessages({
TITLE: {
@ -244,6 +250,7 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
description={`Navigate to the about page. You will see How you can help list item 1`}
values={{
link1: linkFn('https://www.surveymonkey.com/r/P3LWTSB', false, true),
link1es: linkFn('https://www.surveymonkey.com/r/ZH36CYV', false, true),
}}
/>,
LIST_ITEM_2: <FormattedMessage
@ -252,6 +259,7 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
description={`Navigate to the about page. You will see How you can help list item 2`}
values={{
link1: linkFn('https://www.surveymonkey.com/r/6G9TQJ8', false, true),
link1es: linkFn('https://www.surveymonkey.com/r/ZPKY8G9', false, true),
}}
/>,
LIST_ITEM_3: <FormattedMessage
@ -266,6 +274,7 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
values={{
link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),
link2: linkFn('https://www.surveymonkey.com/r/5LZ7MNB', false, true),
link2es: linkFn('https://www.surveymonkey.com/r/CGTH5P7', false, true),
}}
/>,
PARA1: <FormattedMessage

7
client/src/data/copy/contact.tsx
View file

@ -25,13 +25,9 @@ export const PAGE_INTRO = defineMessages({
defaultMessage: `Help improve the tool`,
description: 'Navigate to the contact page, this is the text for floating action button',
},
SURVEY_URL: {
id: 'contact.page.fab.survey.link',
defaultMessage: 'https://www.surveymonkey.com/r/P3LWTSB',
description: 'The footer sticky link that links to the CEJST survey',
},
});
export const RFI_BOX = defineMessages({
TITLE: {
id: 'contact.page.request.for.info.box.title',
@ -87,6 +83,7 @@ export const CENSUS_TRACT_FEEDBACK = {
description={'Navigate to the survey. Spanish should substitute <link2> to get Spanish link! Already coded to support'}
values={{
link1: COMMON_COPY.linkFn('https://www.surveymonkey.com/r/5LZ7MNB', false, true),
link1es: COMMON_COPY.linkFn('https://www.surveymonkey.com/r/CGTH5P7', false, true),
}}
/>,
};

29
client/src/data/copy/downloads.tsx
View file

@ -69,16 +69,31 @@ export const DOWNLOAD_FILES = {
URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF, false),
LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
},
HOW_TO_COMMUNITIES_ES: {
SIZE: 761.8, // KB
URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_ES_PDF, false),
LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
},
INSTRUCTIONS: {
SIZE: 228.4, // KB // Todo: Update when actual file is uploaded
URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF, false),
LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
},
INSTRUCTIONS_ES: {
SIZE: 173.6, // KB // Todo: Update when actual file is uploaded
URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_INSTRUCT_ES_PDF, false),
LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
},
COMP_CHART: {
SIZE: 33.1, // KB
URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_TOOL_COMP_PDF, false),
LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
},
M_23_09_ES: {
SIZE: 120.5, // KB
URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_M_23_09_SIGNED_PDF, false),
LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE,
},
},
BETA: {
COMMUNITIES_LIST_XLS: {
@ -590,12 +605,19 @@ export const DOWNLOAD_LINKS = {
description={'Navigate to the download page. This is fifth download file link'}
values={{
link5: COMMON_COPY.linkFn(DOWNLOAD_FILES.NARWAL.HOW_TO_COMMUNITIES.URL, false, true),
link5es: COMMON_COPY.linkFn(DOWNLOAD_FILES.NARWAL.HOW_TO_COMMUNITIES_ES.URL, false, true),
howToCommFileSize: <FormattedNumber
value={DOWNLOAD_FILES.NARWAL.HOW_TO_COMMUNITIES.SIZE}
style="unit"
unit="kilobyte"
unitDisplay="narrow"
/>,
howToCommFileSizeEs: <FormattedNumber
value={DOWNLOAD_FILES.NARWAL.HOW_TO_COMMUNITIES_ES.SIZE}
style="unit"
unit="kilobyte"
unitDisplay="narrow"
/>,
}}
/>,
LINK6: <FormattedMessage
@ -604,12 +626,19 @@ export const DOWNLOAD_LINKS = {
description={'Navigate to the download page. This is sixth download file link'}
values={{
link6: COMMON_COPY.linkFn(DOWNLOAD_FILES.NARWAL.INSTRUCTIONS.URL, false, true),
link6es: COMMON_COPY.linkFn(DOWNLOAD_FILES.NARWAL.INSTRUCTIONS_ES.URL, false, true),
instructions: <FormattedNumber
value={DOWNLOAD_FILES.NARWAL.INSTRUCTIONS.SIZE}
style="unit"
unit="kilobyte"
unitDisplay="narrow"
/>,
instructionsEs: <FormattedNumber
value={DOWNLOAD_FILES.NARWAL.INSTRUCTIONS_ES.SIZE}
style="unit"
unit="kilobyte"
unitDisplay="narrow"
/>,
}}
/>,
// };

8
client/src/data/copy/faqs.tsx
View file

@ -4,7 +4,7 @@ import {defineMessages, FormattedMessage} from 'gatsby-plugin-intl';
import LinkTypeWrapper from '../../components/LinkTypeWrapper';
import {EJSCREEN, EXEC_ORDER_LINK, FED_RECOGNIZED_INDIAN_ENTITIES, CEJST_INSTRUCT, CEJST_MEMO} from './about';
import {EJSCREEN, EXEC_ORDER_LINK, FED_RECOGNIZED_INDIAN_ENTITIES, CEJST_INSTRUCT, CEJST_MEMO, CEJST_INSTRUCT_ES, CEJST_MEMO_ES} from './about';
import {boldFn, linkFn, FEEDBACK_EMAIL} from './common';
import {PAGES_ENDPOINTS} from '../constants';
import {EXPLORE_PAGE_LINKS} from './explore';
@ -270,10 +270,11 @@ export const FAQ_ANSWERS = {
/>,
Q1_P3_1: <FormattedMessage
id={ 'faqs.page.answers.Q1_P3_1'}
defaultMessage={ '<link1>Memorandum</link1> on Using the CEJST for the Justice40 Initiative'}
defaultMessage={ '<link1>Memorandum</link1> on using the CEJST for the Justice40 Initiative'}
description={ 'Navigate to the FAQs page, this will be an answer, Q1_P3_1'}
values={{
link1: linkFn(CEJST_MEMO, false, true),
link1es: linkFn(CEJST_MEMO_ES, false, true),
}}
/>,
Q1_P3_2: <FormattedMessage
@ -282,6 +283,7 @@ export const FAQ_ANSWERS = {
description={ 'Navigate to the FAQs page, this will be an answer, Q1_P3_2'}
values={{
link1: linkFn(CEJST_INSTRUCT, false, true),
link1es: linkFn(CEJST_INSTRUCT_ES, false, true),
}}
/>,
@ -379,7 +381,7 @@ export const FAQ_ANSWERS = {
/>,
Q5_P2_1: <FormattedMessage
id={ 'faqs.page.answers.Q5_P2_1'}
defaultMessage={ `This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s <link1>Action Plan for Consultation and Coordination with Tribal Nations</link1>, <link3>President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and <link2>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link2>.`}
defaultMessage={ `This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s <link1>Action Plan for Consultation and Coordination with Tribal Nations</link1>, <link3> President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation </link3>, and <link2>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link2>.`}
description={ 'Navigate to the FAQs page, this will be an answer, Q5_P2_1'}
values={{
link1: linkFn(EXPLORE_PAGE_LINKS.WH_GOV_TRIBAL_ACTION_PLAN_4_26_21, false, true),

14
client/src/intl/en.json
View file

@ -107,6 +107,10 @@
"defaultMessage": "The tool's data is available for <link1>download</link1>. This data can be used to filter by state or county.",
"description": "Navigate to the About page. This is the paragraph 4"
},
"about.page.use.data.tutorial": {
"defaultMessage": "Download the spreadsheet tutorial (.pdf 5.4 MB)",
"description": "Navigate to the About page. This the link to download the how to use map tutorial"
},
"about.page.use.map.heading": {
"defaultMessage": "Using the map",
"description": "Navigate to the About page. This is the sub heading of Using the map"
@ -116,7 +120,7 @@
"description": "Navigate to the About page. This is the paragraph of Using the map"
},
"about.page.use.map.tutorial": {
"defaultMessage": "Download the spreadsheet tutorial (.pdf 5.4 MB)",
"defaultMessage": "Download the CEJST tutorial (.pdf 9.6 MB)",
"description": "Navigate to the About page. This the link to download the how to use map tutorial"
},
"common.pages.alerts.additional_docs_available.description": {
@ -259,10 +263,6 @@
"defaultMessage": "The best way to contact the Council on Environmental Quality (CEQ) is by filling out <link1>this form</link1>.",
"description": "Navigate to the survey. Spanish should substitute <link2> to get Spanish link! Already coded to support"
},
"contact.page.fab.survey.link": {
"defaultMessage": "https://www.surveymonkey.com/r/P3LWTSB",
"description": "The footer sticky link that links to the CEJST survey"
},
"contact.page.fab.survey.text": {
"defaultMessage": "Help improve the tool",
"description": "Navigate to the contact page, this is the text for floating action button"
@ -1688,7 +1688,7 @@
"description": "Navigate to the FAQs page, this will be an answer, Q1_P3"
},
"faqs.page.answers.Q1_P3_1": {
"defaultMessage": "<link1>Memorandum</link1> on Using the CEJST for the Justice40 Initiative",
"defaultMessage": "<link1>Memorandum</link1> on using the CEJST for the Justice40 Initiative",
"description": "Navigate to the FAQs page, this will be an answer, Q1_P3_1"
},
"faqs.page.answers.Q1_P3_2": {
@ -1764,7 +1764,7 @@
"description": "Navigate to the FAQs page, this will be an answer, Q5_P2"
},
"faqs.page.answers.Q5_P2_1": {
"defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s <link1>Action Plan for Consultation and Coordination with Tribal Nations</link1>, <link3>President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation</link3>, and <link2>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link2>.",
"defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQ’s <link1>Action Plan for Consultation and Coordination with Tribal Nations</link1>, <link3> President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation </link3>, and <link2>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link2>.",
"description": "Navigate to the FAQs page, this will be an answer, Q5_P2_1"
},
"faqs.page.answers.Q6_P1": {

1082
client/src/intl/es.json
View file

File diff suppressed because it is too large Load diff

2770
client/src/intl/es_3.17.23-translated-final.json Normal file
View file

File diff suppressed because it is too large Load diff

12
client/src/intl/removeNesting.js
View file

@ -1,11 +1,13 @@
const fs = require('fs');
const englishJson = require('./es_5.4.22-translated-final.json');
// Place nested translation file
const nestedTranslation = require('./es_3.17.23-translated-final.json');
// placeholder for fixed es json file
const fixedEs = {};
// loop through incorrect es.json file modify
for (const [key, value] of Object.entries(englishJson)) {
// loop through nested es.json file and "flatten"
for (const [key, value] of Object.entries(nestedTranslation)) {
fixedEs[key] = value.defaultMessage;
};
@ -14,8 +16,8 @@ console.log(fixedEs);
// convert JSON object to string
const fixedEsString = JSON.stringify(fixedEs);
// write JSON string to a file
fs.writeFile('esNoNesting.json', fixedEsString, (err) => {
// write the flattened (no nesting) translated JSON string to a file
fs.writeFile('esFlattened.json', fixedEsString, (err) => {
if (err) {
throw err;
}

5
client/src/pages/about.tsx
View file

@ -37,6 +37,7 @@ const AboutPage = ({location}: IAboutPageProps) => {
const intl = useIntl();
const {width} = useWindowSize();
console.log(intl.locale);
return (
<Layout location={location} title={intl.formatMessage(ABOUT_COPY.PAGE.TITLE)}>
@ -44,7 +45,7 @@ const AboutPage = ({location}: IAboutPageProps) => {
<section className={'page-heading'}>
<h1 data-cy={'about-page-heading'}>{intl.formatMessage(ABOUT_COPY.PAGE.TITLE)}</h1>
<DatasetsButton href= {'https://www.surveymonkey.com/r/6G9TQJ8'} />
<DatasetsButton href= {intl.locale === 'es' ? 'https://www.surveymonkey.com/r/ZPKY8G9' : 'https://www.surveymonkey.com/r/6G9TQJ8'} />
</section>
<Grid row gap className={'j40-mb5-mt3'}>
@ -165,7 +166,7 @@ const AboutPage = ({location}: IAboutPageProps) => {
imgSrc={githubIcon}
header={intl.formatMessage(ABOUT_COPY.GET_INVOLVED.JOIN_OSC_HEADING)}
linkText={intl.formatMessage(ABOUT_COPY.GET_INVOLVED.JOIN_OSC_LINK_TEXT)}
url={ABOUT_COPY.GITHUB_LINK}
url={intl.locale === 'es' ? ABOUT_COPY.GITHUB_LINK_ES : ABOUT_COPY.GITHUB_LINK}
openUrlNewTab={true}
internal={false}>
<p>

2
client/src/pages/contact.tsx
View file

@ -24,7 +24,7 @@ const ContactPage = ({location}: IContactPageProps) => {
<section className={'page-heading'}>
<h1>{intl.formatMessage(CONTACT_COPY.PAGE_INTRO.PAGE_HEADING)}</h1>
<DatasetsButton href= {'https://www.surveymonkey.com/r/6G9TQJ8'} />
<DatasetsButton href= {intl.locale === 'es' ? 'https://www.surveymonkey.com/r/ZPKY8G9' : 'https://www.surveymonkey.com/r/6G9TQJ8'} />
</section>
<Grid row gap={6}>

2
client/src/pages/downloads.tsx
View file

@ -26,7 +26,7 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {
<section className={'page-heading'}>
<h1>{intl.formatMessage(DOWNLOADS_COPY.PAGE_INTRO.PAGE_HEADING1)}</h1>
<DatasetsButton href= {'https://www.surveymonkey.com/r/6G9TQJ8'} />
<DatasetsButton href= {intl.locale === 'es' ? 'https://www.surveymonkey.com/r/ZPKY8G9' : 'https://www.surveymonkey.com/r/6G9TQJ8'} />
</section>
<Grid row gap className={'j40-mb5-mt3'}>

2
client/src/pages/index.tsx
View file

@ -26,7 +26,7 @@ const ExporeToolPage = ({location}: IMapPageProps) => {
<section className={'page-heading'}>
<h1>{intl.formatMessage(EXPLORE_COPY.PAGE_INTRO.PAGE_HEADING)}</h1>
<DatasetsButton href= {'https://www.surveymonkey.com/r/6G9TQJ8'} />
<DatasetsButton href= {intl.locale === 'es' ? 'https://www.surveymonkey.com/r/ZPKY8G9' : 'https://www.surveymonkey.com/r/6G9TQJ8'} />
</section>
<Grid row gap className={'j40-mb5-mt3'}>

2
client/src/pages/methodology.tsx
View file

@ -29,7 +29,7 @@ const IndexPage = ({location}: MethodPageProps) => {
<section className={'page-heading'}>
<h1>{intl.formatMessage(METHODOLOGY_COPY.PAGE.HEADING)}</h1>
<DatasetsButton href= {'https://www.surveymonkey.com/r/6G9TQJ8'} />
<DatasetsButton href= {intl.locale === 'es' ? 'https://www.surveymonkey.com/r/ZPKY8G9' : 'https://www.surveymonkey.com/r/6G9TQJ8'} />
</section>
<Grid row gap className={'j40-mt3'}>

2
client/src/pages/previous-versions.tsx
View file

@ -33,7 +33,7 @@ const PreviousVersions = ({location}: IPreviousVersionsProps) => {
<section className={'page-heading'}>
<h1 data-cy={'about-page-heading'}>{intl.formatMessage(PREV_VER_COPY.PAGE.TITLE)}</h1>
<DatasetsButton href= {'https://www.surveymonkey.com/r/6G9TQJ8'} />
<DatasetsButton href= {intl.locale === 'es' ? 'https://www.surveymonkey.com/r/ZPKY8G9' : 'https://www.surveymonkey.com/r/6G9TQJ8'} />
</section>
<Grid row gap className={'j40-mb5-mt3'}>

42
client/src/pages/tests/__snapshots__/about.test.tsx.snap
View file

@ -140,6 +140,24 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
<div>
@ -337,6 +355,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Contact
</a>
</li>
<li
class="usa-nav__primary-item"
>
<div>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</li>
</ul>
</nav>
</div>

42
client/src/pages/tests/__snapshots__/contact.test.tsx.snap
View file

@ -140,6 +140,24 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
<div>
@ -337,6 +355,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Contact
</a>
</li>
<li
class="usa-nav__primary-item"
>
<div>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</li>
</ul>
</nav>
</div>

42
client/src/pages/tests/__snapshots__/downloads.test.tsx.snap
View file

@ -140,6 +140,24 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
<div>
@ -337,6 +355,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Contact
</a>
</li>
<li
class="usa-nav__primary-item"
>
<div>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</li>
</ul>
</nav>
</div>

46
client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap
View file

@ -140,6 +140,24 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
<div>
@ -337,6 +355,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Contact
</a>
</li>
<li
class="usa-nav__primary-item"
>
<div>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</li>
</ul>
</nav>
</div>
@ -442,7 +484,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
>
Memorandum
</a>
on Using the CEJST for the Justice40 Initiative
on using the CEJST for the Justice40 Initiative
</li>
<li>
<a
@ -641,7 +683,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
rel="noreferrer"
target="_blank"
>
President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation
President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation
</a>
, and
<a

42
client/src/pages/tests/__snapshots__/methodology.test.tsx.snap
View file

@ -140,6 +140,24 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
<div>
@ -337,6 +355,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Contact
</a>
</li>
<li
class="usa-nav__primary-item"
>
<div>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</li>
</ul>
</nav>
</div>

42
client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap
View file

@ -140,6 +140,24 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
<div>
@ -337,6 +355,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Contact
</a>
</li>
<li
class="usa-nav__primary-item"
>
<div>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</li>
</ul>
</nav>
</div>

42
client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap
View file

@ -140,6 +140,24 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</div>
</div>
</section>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</div>
<div>
@ -337,6 +355,30 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Contact
</a>
</li>
<li
class="usa-nav__primary-item"
>
<div>
<div>
<img
alt="language icon for selecting language"
src="test-file-stub"
/>
<a
class="usa-link"
href="#"
>
English
</a>
<a
class="usa-link"
href="#"
>
Español
</a>
</div>
</div>
</li>
</ul>
</nav>
</div>