Skip to content

Merge main into release #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valentinedwv merged 3 commits into from
Jul 14, 2025
Merged

Merge main into release #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25813e6
Update text
tlsharkey May 27, 2025
42fd1f2
Merge pull request #37 from TheResilientCollective/feature/36
valentinedwv Jul 3, 2025
2f09195
Merge pull request #38 from TheResilientCollective/develop
valentinedwv Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions html_js/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,10 @@ <h3 class="card-title" data-i18n="sidebar.cards.whatYouCanDo.title">What You Can
<p>
<span data-i18n="sidebar.cards.whatYouCanDo.h2sLink.label1" data-i18n-html="true">Recommendations based on current Hydrogen Sulfide levels can be found here:</span>
<a href="https://example.com" target="_blank" data-i18n="sidebar.cards.whatYouCanDo.h2sLink.link1.text" data-i18n-href="sidebar.cards.whatYouCanDo.h2sLink.link1.url">Air Quality Monitoring</a>
<br><br>
<span data-i18n="sidebar.cards.whatYouCanDo.h2sLink.label2" data-i18n-html="true">.</span>
<a href="https://example.com" target="_blank" data-i18n="sidebar.cards.whatYouCanDo.h2sLink.link2.text" data-i18n-href="sidebar.cards.whatYouCanDo.h2sLink.link2.url">Hydrogen Sulfide</a>
</p>
<p data-i18n="sidebar.cards.whatYouCanDo.h2sLink.airpurifiers" data-i18n-html="true"></p>

<br>

<div>
<p data-i18n="sidebar.cards.whatYouCanDo.reportOdor">
Report odor complaints to the San Diego County Air Pollution Control District by:
Expand All @@ -352,6 +349,12 @@ <h3 class="card-title" data-i18n="sidebar.cards.whatYouCanDo.title">What You Can
<li data-i18n="sidebar.cards.whatYouCanDo.infoItems.source">The name and address of the alleged source and the type of operation causing it (if known)</li>
</ul>
</div>

<br>
<p>
<span data-i18n="sidebar.cards.whatYouCanDo.h2sLink.label2" data-i18n-html="true">.</span>
<a href="https://example.com" target="_blank" data-i18n="sidebar.cards.whatYouCanDo.h2sLink.link2.text" data-i18n-href="sidebar.cards.whatYouCanDo.h2sLink.link2.url">Hydrogen Sulfide</a>
</p>

<!-- <p>
<span data-i18n="sidebar.cards.whatYouCanDo.h2sLink.label1">Protect Yourself from Environmental Odors</span>
Expand Down
3 changes: 2 additions & 1 deletion html_js/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"text": "Protect Yourself from Environmental Odors",
"url": "https://www.sandiegocounty.gov/content/sdc/hhsa/programs/phs/community_epidemiology/south-region-health-concerns/about-environmental-odors.html"
},
"airpurifiers": "San Diego County Air Pollution Control District (SDAPCD) is providing free air purifiers to residents living in affected communities. Check with the <a href=\"https://www.sdapcd.org/content/sdapcd/about/tj-river-valley/aire.html\" target=\"_blank\">AIRE Program</a> to see if you are eligible",
"label2": "Recommendations to ",
"link2": {
"text": "Protect Yourself from Contaminated Water",
Expand Down Expand Up @@ -113,7 +114,7 @@
"trend_same": "same as last week"
},
"p1": {
"body": "A closure is issued when a sewage or chemical flow impacts beach or bay waters. Additional warnings and advisories can be found here:",
"body": "A closure is issued when a sewage or chemical flow impacts beach or bay waters. Avoiding contact with beach water is recommended during Advisories and Warnings. More details visit",
"link": {
"text": "San Diego Beach & Bay Water Quality Program",
"url": "https://www.sdbeachinfo.com/"
Expand Down
3 changes: 2 additions & 1 deletion html_js/locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"text": "Protegerte de Olores Ambientales",
"url": "https://www.sandiegocounty.gov/content/sdc/hhsa/programs/phs/community_epidemiology/south-region-health-concerns/about-environmental-odors.html"
},
"airpurifiers": "El Distrito de Control de la Contaminación del Aire del Condado de San Diego (SDAPCD) está proporcionando purificadores de aire gratuitos a los residentes que viven en comunidades afectadas. Consulta con el <a href=\"https://www.sdapcd.org/content/sdapcd/about/tj-river-valley/aire.html\" target=\"_blank\">Programa AIRE</a> para ver si eres elegible.",
"label2": "Recomendaciones para ",
"link2": {
"text": "Protegerte de Agua Contaminada",
Expand Down Expand Up @@ -113,7 +114,7 @@
"trend_same": "igual que la semana pasada"
},
"p1": {
"body": "Se emite un cierre cuando un flujo de aguas negras o químico impacta las aguas del playa o la bahía. Advertencias y avisos adicionales se pueden encontrar aquí:",
"body": "Se emite un cierre cuando un flujo de aguas negras o químico impacta las aguas del playa o la bahía. Se recomienda evitar contacto con el agua de la playa durante Advertencias y Avisos. Para más detalles visite",
"link": {
"text": "Programa de Calidad del Agua de Playas y Bahía de San Diego",
"url": "https://www.sdbeachinfo.com/"
Expand Down