Skip to content

Commit

Permalink
Remove covid-19 language from onboarding and issue area (#2461)
Browse files Browse the repository at this point in the history
* remove covid-19 language from onboarding and issue area

* run lingui and django internationalization
  • Loading branch information
kiwansim authored Jun 4, 2024
1 parent 3d009e8 commit 49d7078
Show file tree
Hide file tree
Showing 8 changed files with 626 additions and 641 deletions.
2 changes: 1 addition & 1 deletion common-data/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const config: CommonDataConfig = {
typeName: "IssueChoice",
exportLabels: true,
internationalizeLabels: true,
filterOut: /^(LANDLORD__|PUBLIC_AREAS__ILLEGAL_APARTMENTS|HOME__COVID_SANITATION_REQUIRED|HOME__(FRONT_DOOR|DOOR_LOCK|DOORBELL|BUZZER)_BROKEN|KITCHEN__(REFRIGERATOR|STOVE)_BROKEN)/,
filterOut: /^(LANDLORD__|PUBLIC_AREAS__ILLEGAL_APARTMENTS|HOME__(FRONT_DOOR|DOOR_LOCK|DOORBELL|BUZZER)_BROKEN|KITCHEN__(REFRIGERATOR|STOVE)_BROKEN)/,
},
{
jsonFilename: "issue-area-choices.json",
Expand Down
2 changes: 0 additions & 2 deletions common-data/issue-choices.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[
["HOME__COVID_SANITATION_REQUIRED", "Needs cleaning due to COVID-19"],
["HOME__MICE", "Mice"],
["HOME__RATS", "Rats"],
["HOME__COCKROACHES", "Cockroaches"],
Expand Down Expand Up @@ -115,7 +114,6 @@
["BATHROOMS__SHOWER_FAUCET_LEAKING", "Shower: low water pressure"],
["BATHROOMS__SHOWER_NO_FAUCET", "Shower: leaky shower head"],
["BATHROOMS__SHOWER_DRAIN", "Shower: drain stoppage"],
["PUBLIC_AREAS__COVID_SANITATION_REQUIRED", "Needs cleaning due to COVID-19"],
["PUBLIC_AREAS__PAINTING_OVERDUE", "Painting overdue (3 years)"],
["PUBLIC_AREAS__PAINT", "Peeling/flaking paint"],
["PUBLIC_AREAS__NO_HEAT", "No heat"],
Expand Down
4 changes: 1 addition & 3 deletions common-data/issue-choices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { t } from "@lingui/macro";
import { li18n } from '../frontend/lib/i18n-lingui';

export type IssueChoice = "HOME__MICE"|"HOME__RATS"|"HOME__COCKROACHES"|"HOME__NO_GAS"|"HOME__NO_HEAT"|"HOME__NO_HOT_WATER"|"HOME__NO_COLD_WATER"|"HOME__NO_SMOKE_DETECTOR"|"HOME__SMOKE_DETECTOR_DEFECTIVE"|"HOME__FLOOR"|"HOME__PAINTING"|"HOME__FRONT_DOOR_DEFECTIVE"|"HOME__DOOR_LOCK_DEFECTIVE"|"HOME__DOORBELL_DEFECTIVE"|"HOME__BUZZER_DEFECTIVE"|"HOME__LEAD_BASED_PAINT"|"HOME__VACATE_ORDER_ISSUED"|"HOME__MOLD"|"BEDROOMS__PAINT"|"BEDROOMS__WALLS"|"BEDROOMS__MOLD_ON_WALLS"|"BEDROOMS__WATER_DAMAGE"|"BEDROOMS__LOOSE_FLOOR"|"BEDROOMS__BASEBOARDS_DEFECTIVE"|"BEDROOMS__WINDOW_GLASS_BROKEN"|"BEDROOMS__WINDOW_FRAME_DEFECTIVE"|"BEDROOMS__DOOR"|"BEDROOMS__RADIATORS"|"BEDROOMS__CEILING"|"BEDROOMS__CEILING_LEAKING"|"BEDROOMS__ELECTRICITY"|"BEDROOMS__WIRING_EXPOSED"|"BEDROOMS__OUTLETS"|"KITCHEN__MOLD"|"KITCHEN__WATER"|"KITCHEN__PAINT"|"KITCHEN__WALLS"|"KITCHEN__LOOSE_FLOOR"|"KITCHEN__BASEBOARDS_DEFECTIVE"|"KITCHEN__WINDOW_GLASS_BROKEN"|"KITCHEN__WINDOW_FRAME_DEFECTIVE"|"KITCHEN__DOOR"|"KITCHEN__RADIATORS"|"KITCHEN__CEILING"|"KITCHEN__CEILING_LEAKING"|"KITCHEN__ELECTRICITY"|"KITCHEN__WIRING_EXPOSED"|"KITCHEN__OUTLETS"|"KITCHEN__REFRIGERATOR"|"KITCHEN__STOVE"|"KITCHEN__SINK"|"KITCHEN__FAUCET_LEAKING"|"KITCHEN__NO_FAUCET"|"KITCHEN__FAUCET_NOT_WORKING"|"KITCHEN__WATER_PRESSURE"|"KITCHEN__PIPES"|"KITCHEN__DRAIN"|"LIVING_ROOM__MOLD"|"LIVING_ROOM__WATER"|"LIVING_ROOM__PAINT"|"LIVING_ROOM__WALLS"|"LIVING_ROOM__LOOSE_FLOOR"|"LIVING_ROOM__BASEBOARDS_DEFECTIVE"|"LIVING_ROOM__WINDOW_GLASS_BROKEN"|"LIVING_ROOM__WINDOW_FRAME_DEFECTIVE"|"LIVING_ROOM__DOOR"|"LIVING_ROOM__RADIATORS"|"LIVING_ROOM__CEILING"|"LIVING_ROOM__CEILING_LEAKING"|"LIVING_ROOM__ELECTRICITY"|"LIVING_ROOM__WIRING_EXPOSED"|"LIVING_ROOM__OUTLETS"|"BATHROOMS__MOLD"|"BATHROOMS__WATER"|"BATHROOMS__PAINT"|"BATHROOMS__WALLS"|"BATHROOMS__LOOSE_FLOOR"|"BATHROOMS__BASEBOARDS_DEFECTIVE"|"BATHROOMS__WINDOW_GLASS_BROKEN"|"BATHROOMS__WINDOW_FRAME_DEFECTIVE"|"BATHROOMS__DOOR"|"BATHROOMS__RADIATORS"|"BATHROOMS__CEILING"|"BATHROOMS__CEILING_LEAKING"|"BATHROOMS__ELECTRICITY"|"BATHROOMS__WIRING_EXPOSED"|"BATHROOMS__OUTLETS"|"BATHROOMS__TOILET"|"BATHROOMS__TOILET_LEAKING"|"BATHROOMS__SINK"|"BATHROOMS__SINK_FAUCET_LEAKING"|"BATHROOMS__SINK_NO_FAUCET"|"BATHROOMS__SINK_FAUCET_NOT_WORKING"|"BATHROOMS__SINK_WATER_PRESSURE"|"BATHROOMS__SINK_PIPES"|"BATHROOMS__SINK_DRAIN"|"BATHROOMS__TUB"|"BATHROOMS__TUB_FAUCET_LEAKING"|"BATHROOMS__TUB_NO_FAUCET"|"BATHROOMS__TUB_FAUCET_NOT_WORKING"|"BATHROOMS__TUB_PIPES"|"BATHROOMS__TUB_DRAIN"|"BATHROOMS__SHOWER_MOLD"|"BATHROOMS__SHOWER_WATER_PRESSURE"|"BATHROOMS__SHOWER_PIPES"|"BATHROOMS__SHOWER"|"BATHROOMS__SHOWER_FAUCET_LEAKING"|"BATHROOMS__SHOWER_NO_FAUCET"|"BATHROOMS__SHOWER_DRAIN"|"PUBLIC_AREAS__COVID_SANITATION_REQUIRED"|"PUBLIC_AREAS__PAINTING_OVERDUE"|"PUBLIC_AREAS__PAINT"|"PUBLIC_AREAS__NO_HEAT"|"PUBLIC_AREAS__NO_HOT_WATER"|"PUBLIC_AREAS__WATER_PRESSURE"|"PUBLIC_AREAS__RUSTY_WATER"|"PUBLIC_AREAS__WIRING_EXPOSED"|"PUBLIC_AREAS__ELECTRICAL_CURRENT"|"PUBLIC_AREAS__BUGS"|"PUBLIC_AREAS__PESTS"|"PUBLIC_AREAS__FUMES"|"PUBLIC_AREAS__SMOKE_DETECTORS"|"PUBLIC_AREAS__WINDOW_GUARDS"|"PUBLIC_AREAS__WASHING_MACHINE"|"PUBLIC_AREAS__DRYER"|"PUBLIC_AREAS__NO_SUPER"|"PUBLIC_AREAS__RENT_RECEIPTS"|"PUBLIC_AREAS__INCOMPLETE_RENT_RECEIPTS";
export type IssueChoice = "HOME__MICE"|"HOME__RATS"|"HOME__COCKROACHES"|"HOME__NO_GAS"|"HOME__NO_HEAT"|"HOME__NO_HOT_WATER"|"HOME__NO_COLD_WATER"|"HOME__NO_SMOKE_DETECTOR"|"HOME__SMOKE_DETECTOR_DEFECTIVE"|"HOME__FLOOR"|"HOME__PAINTING"|"HOME__FRONT_DOOR_DEFECTIVE"|"HOME__DOOR_LOCK_DEFECTIVE"|"HOME__DOORBELL_DEFECTIVE"|"HOME__BUZZER_DEFECTIVE"|"HOME__LEAD_BASED_PAINT"|"HOME__VACATE_ORDER_ISSUED"|"HOME__MOLD"|"BEDROOMS__PAINT"|"BEDROOMS__WALLS"|"BEDROOMS__MOLD_ON_WALLS"|"BEDROOMS__WATER_DAMAGE"|"BEDROOMS__LOOSE_FLOOR"|"BEDROOMS__BASEBOARDS_DEFECTIVE"|"BEDROOMS__WINDOW_GLASS_BROKEN"|"BEDROOMS__WINDOW_FRAME_DEFECTIVE"|"BEDROOMS__DOOR"|"BEDROOMS__RADIATORS"|"BEDROOMS__CEILING"|"BEDROOMS__CEILING_LEAKING"|"BEDROOMS__ELECTRICITY"|"BEDROOMS__WIRING_EXPOSED"|"BEDROOMS__OUTLETS"|"KITCHEN__MOLD"|"KITCHEN__WATER"|"KITCHEN__PAINT"|"KITCHEN__WALLS"|"KITCHEN__LOOSE_FLOOR"|"KITCHEN__BASEBOARDS_DEFECTIVE"|"KITCHEN__WINDOW_GLASS_BROKEN"|"KITCHEN__WINDOW_FRAME_DEFECTIVE"|"KITCHEN__DOOR"|"KITCHEN__RADIATORS"|"KITCHEN__CEILING"|"KITCHEN__CEILING_LEAKING"|"KITCHEN__ELECTRICITY"|"KITCHEN__WIRING_EXPOSED"|"KITCHEN__OUTLETS"|"KITCHEN__REFRIGERATOR"|"KITCHEN__STOVE"|"KITCHEN__SINK"|"KITCHEN__FAUCET_LEAKING"|"KITCHEN__NO_FAUCET"|"KITCHEN__FAUCET_NOT_WORKING"|"KITCHEN__WATER_PRESSURE"|"KITCHEN__PIPES"|"KITCHEN__DRAIN"|"LIVING_ROOM__MOLD"|"LIVING_ROOM__WATER"|"LIVING_ROOM__PAINT"|"LIVING_ROOM__WALLS"|"LIVING_ROOM__LOOSE_FLOOR"|"LIVING_ROOM__BASEBOARDS_DEFECTIVE"|"LIVING_ROOM__WINDOW_GLASS_BROKEN"|"LIVING_ROOM__WINDOW_FRAME_DEFECTIVE"|"LIVING_ROOM__DOOR"|"LIVING_ROOM__RADIATORS"|"LIVING_ROOM__CEILING"|"LIVING_ROOM__CEILING_LEAKING"|"LIVING_ROOM__ELECTRICITY"|"LIVING_ROOM__WIRING_EXPOSED"|"LIVING_ROOM__OUTLETS"|"BATHROOMS__MOLD"|"BATHROOMS__WATER"|"BATHROOMS__PAINT"|"BATHROOMS__WALLS"|"BATHROOMS__LOOSE_FLOOR"|"BATHROOMS__BASEBOARDS_DEFECTIVE"|"BATHROOMS__WINDOW_GLASS_BROKEN"|"BATHROOMS__WINDOW_FRAME_DEFECTIVE"|"BATHROOMS__DOOR"|"BATHROOMS__RADIATORS"|"BATHROOMS__CEILING"|"BATHROOMS__CEILING_LEAKING"|"BATHROOMS__ELECTRICITY"|"BATHROOMS__WIRING_EXPOSED"|"BATHROOMS__OUTLETS"|"BATHROOMS__TOILET"|"BATHROOMS__TOILET_LEAKING"|"BATHROOMS__SINK"|"BATHROOMS__SINK_FAUCET_LEAKING"|"BATHROOMS__SINK_NO_FAUCET"|"BATHROOMS__SINK_FAUCET_NOT_WORKING"|"BATHROOMS__SINK_WATER_PRESSURE"|"BATHROOMS__SINK_PIPES"|"BATHROOMS__SINK_DRAIN"|"BATHROOMS__TUB"|"BATHROOMS__TUB_FAUCET_LEAKING"|"BATHROOMS__TUB_NO_FAUCET"|"BATHROOMS__TUB_FAUCET_NOT_WORKING"|"BATHROOMS__TUB_PIPES"|"BATHROOMS__TUB_DRAIN"|"BATHROOMS__SHOWER_MOLD"|"BATHROOMS__SHOWER_WATER_PRESSURE"|"BATHROOMS__SHOWER_PIPES"|"BATHROOMS__SHOWER"|"BATHROOMS__SHOWER_FAUCET_LEAKING"|"BATHROOMS__SHOWER_NO_FAUCET"|"BATHROOMS__SHOWER_DRAIN"|"PUBLIC_AREAS__PAINTING_OVERDUE"|"PUBLIC_AREAS__PAINT"|"PUBLIC_AREAS__NO_HEAT"|"PUBLIC_AREAS__NO_HOT_WATER"|"PUBLIC_AREAS__WATER_PRESSURE"|"PUBLIC_AREAS__RUSTY_WATER"|"PUBLIC_AREAS__WIRING_EXPOSED"|"PUBLIC_AREAS__ELECTRICAL_CURRENT"|"PUBLIC_AREAS__BUGS"|"PUBLIC_AREAS__PESTS"|"PUBLIC_AREAS__FUMES"|"PUBLIC_AREAS__SMOKE_DETECTORS"|"PUBLIC_AREAS__WINDOW_GUARDS"|"PUBLIC_AREAS__WASHING_MACHINE"|"PUBLIC_AREAS__DRYER"|"PUBLIC_AREAS__NO_SUPER"|"PUBLIC_AREAS__RENT_RECEIPTS"|"PUBLIC_AREAS__INCOMPLETE_RENT_RECEIPTS";

export const IssueChoices: IssueChoice[] = [
"HOME__MICE",
Expand Down Expand Up @@ -116,7 +116,6 @@ export const IssueChoices: IssueChoice[] = [
"BATHROOMS__SHOWER_FAUCET_LEAKING",
"BATHROOMS__SHOWER_NO_FAUCET",
"BATHROOMS__SHOWER_DRAIN",
"PUBLIC_AREAS__COVID_SANITATION_REQUIRED",
"PUBLIC_AREAS__PAINTING_OVERDUE",
"PUBLIC_AREAS__PAINT",
"PUBLIC_AREAS__NO_HEAT",
Expand Down Expand Up @@ -258,7 +257,6 @@ export function getIssueChoiceLabels(): IssueChoiceLabels {
BATHROOMS__SHOWER_FAUCET_LEAKING: li18n._(t`Shower: low water pressure`),
BATHROOMS__SHOWER_NO_FAUCET: li18n._(t`Shower: leaky shower head`),
BATHROOMS__SHOWER_DRAIN: li18n._(t`Shower: drain stoppage`),
PUBLIC_AREAS__COVID_SANITATION_REQUIRED: li18n._(t`Needs cleaning due to COVID-19`),
PUBLIC_AREAS__PAINTING_OVERDUE: li18n._(t`Painting overdue (3 years)`),
PUBLIC_AREAS__PAINT: li18n._(t`Peeling/flaking paint`),
PUBLIC_AREAS__NO_HEAT: li18n._(t`No heat`),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,10 @@ const ACTION_CARDS: ActionCardPropsCreator[] = [
};
},
function letterOfComplaint(data): ActionCardProps {
// Default content temporarily implemented during COVID-19 Outbreak
const covidMessage = (
<Trans id="justfix.ddoLocCovidMessage">
Landlord not responding? You can take action for free to request
repairs! Due to the Covid-19 health crisis, we recommend requesting
repairs only in the case of an emergency so you can stay safe and
healthy by limiting how many people enter your home.
repairs!
</Trans>
);
return {
Expand Down
4 changes: 2 additions & 2 deletions locales/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-23 19:58+0000\n"
"POT-Creation-Date: 2024-06-04 19:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -186,7 +186,7 @@ msgstr ""
msgid "Hello world"
msgstr ""

#: project/util/address_form_fields.py:72
#: project/util/address_form_fields.py:77
msgid "The address provided is invalid."
msgstr ""

Expand Down
Loading

0 comments on commit 49d7078

Please sign in to comment.