Skip to content
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

Rename EFNYC -> EVICTIONFREE everywhere with proper case #2016

Closed
wants to merge 6 commits into from
Closed

Rename EFNYC -> EVICTIONFREE everywhere with proper case #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b3dc35
Rename EFNYC -> EVICTIONFREE everywhere with proper case
samaratrilling Mar 25, 2021
4d0a094
Rename file
samaratrilling Mar 25, 2021
16cbf7c
Undo some of the renames with larger repercussions
samaratrilling Apr 6, 2021
5b4fa2c
Merge branch 'master' into efnyc-rename-1918
samaratrilling Apr 7, 2021
48334ca
revert messages.po files correctly
samaratrilling Apr 7, 2021
18e6155
Fully revert env variable changes
samaratrilling Apr 7, 2021
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
2 changes: 1 addition & 1 deletion frontend/initial_props.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def create_initial_props_for_lambda(
"submittedHardshipDeclarationURL": reverse("evictionfree:submitted_declaration_pdf"),
"navbarLabel": settings.NAVBAR_LABEL,
"wowOrigin": settings.WOW_ORIGIN,
"efnycOrigin": settings.EFNYC_ORIGIN,
"evictionfreeOrigin": settings.EFNYC_ORIGIN,
"enableEmergencyHPAction": settings.ENABLE_EMERGENCY_HP_ACTION,
"mapboxAccessToken": settings.MAPBOX_ACCESS_TOKEN,
"isDemoDeployment": settings.IS_DEMO_DEPLOYMENT,
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/app-context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export interface AppServerInfo {
/**
* The base url for outbound links to Eviction Free NYC.
*/
efnycOrigin: string;
evictionfreeOrigin: string;

/**
* Whether the site is in development mode (corresponds to settings.DEBUG in
Expand Down
12 changes: 7 additions & 5 deletions frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { getEmergencyHPAIssueLabels } from "../hpaction/emergency/emergency-hp-a
import { Trans, t, Plural } from "@lingui/macro";
import { EnglishOutboundLink } from "../ui/localized-outbound-link";
import { li18n } from "../i18n-lingui";
import { efnycURL } from "../ui/efnyc-link";
import { evictionfreeURL } from "../ui/evictionfree-link";
import { fbq } from "../analytics/facebook-pixel";

const CTA_CLASS_NAME = "button is-primary jf-text-wrap";
Expand All @@ -36,7 +36,7 @@ const PLACEHOLDER_IMG = "frontend/img/96x96.png";

const MAX_RECOMMENDED_ACTIONS = 3;

const EFNYC_PRIORITY = 100;
const EVICTIONFREE_PRIORITY = 100;
const VIOLATIONS_PRIORITY = 50;
const VIOLATIONS_HIGH_PRIORITY = 50;
const COMPLAINTS_PRIORITY = 40;
Expand Down Expand Up @@ -512,21 +512,23 @@ const ACTION_CARDS: ActionCardPropsCreator[] = [
},
function evictionFreeNy(data): ActionCardProps {
const covidMessage = (
<Trans id="justfix.ddoEfnycCovidMessage">
<Trans id="justfix.ddoEvictionfreeCovidMessage">
You can send a hardship declaration form to your landlord and local
courts— putting your eviction case on hold until May 1st, 2021.
</Trans>
);
return {
title: li18n._(t`Protect yourself from eviction`),
priority: EFNYC_PRIORITY,
priority: EVICTIONFREE_PRIORITY,
isRecommended:
data.isRtcEligible && (data.numberOfEvictionsFromPortfolio || 0) > 0,
indicators: [covidMessage],
fallbackMessage: covidMessage,
imageStaticURL: "frontend/img/ddo/judge.svg",
cta: {
to: efnycURL(),
to: evictionfreeURL(),
// While we've renamed efnyc to evictionfree elsewhere, doing so here would
// create a new Google Analytics label. We want to keep continuity instead.
gaLabel: "efnyc",
text: li18n._(t`Learn more`),
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/tests/util.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const FakeServerInfo: Readonly<AppServerInfo> = {
isDemoDeployment: true,
finishedLocPdfURL: "/my-finished-letter.pdf",
wowOrigin: "https://wow.test",
efnycOrigin: "https://efnyc.test",
evictionfreeOrigin: "https://evictionfree.test",
enableSafeModeURL: "/mysafemode/enable",
previewHardshipDeclarationURL: "/preview-declaration.pdf",
submittedHardshipDeclarationURL: "/submitted-declaration.pdf",
Expand Down
7 changes: 0 additions & 7 deletions frontend/lib/ui/efnyc-link.tsx
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions frontend/lib/ui/evictionfree-link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { getGlobalAppServerInfo } from "../app-context";
import i18n from "../i18n";

export function evictionfreeURL(): string {
const evictionfreeLocale = i18n.locale === "en" ? "en-us" : i18n.locale;
return `${getGlobalAppServerInfo().evictionfreeOrigin}/${evictionfreeLocale}`;
}
42 changes: 22 additions & 20 deletions locales/en/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ msgstr "<0/> makes use of a <1/> and <2/>, which you can review."
msgid "<0>Declaration of COVID-19 Related Financial Distress</0><1/>Compliant with Code of Civil Procedure Section 1179.02, SB91, COVID-19 Tenant Relief Act"
msgstr "<0>Declaration of COVID-19 Related Financial Distress</0><1/>Compliant with Code of Civil Procedure Section 1179.02, SB91, COVID-19 Tenant Relief Act"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:447
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:449
msgid "<0>Free tools for you to fight for a safe and healthy home</0><1>Enter your address to learn more.</1>"
msgstr "<0>Free tools for you to fight for a safe and healthy home</0><1>Enter your address to learn more.</1>"

Expand Down Expand Up @@ -126,7 +126,7 @@ msgstr "A national tool by non-profit <0>JustFix.nyc</0>"
msgid "About"
msgstr "About"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:403
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:405
msgid "Actions"
msgstr "Actions"

Expand Down Expand Up @@ -201,7 +201,7 @@ msgstr "Apartment needs painting"
msgid "Apartment number"
msgstr "Apartment number"

#: frontend/lib/pages/logout-alt-page.tsx:15
#: frontend/lib/pages/logout-alt-page.tsx:16
msgid "Are you sure you want to log out?"
msgstr "Are you sure you want to log out?"

Expand Down Expand Up @@ -568,7 +568,7 @@ msgstr "Do you live in {0}, {1}?"
msgid "Do you still want to mail to:"
msgstr "Do you still want to mail to:"

#: frontend/lib/pages/logout-alt-page.tsx:18
#: frontend/lib/pages/logout-alt-page.tsx:19
msgid "Don’t worry, we’ll save your progress so you’ll be able to come back to your last step when you log back in."
msgstr "Don’t worry, we’ll save your progress so you’ll be able to come back to your last step when you log back in."

Expand Down Expand Up @@ -644,7 +644,7 @@ msgstr "Email:"
msgid "English version"
msgstr "English version"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:456
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:458
msgid "Enter your address to see some recommended actions."
msgstr "Enter your address to see some recommended actions."

Expand Down Expand Up @@ -1134,7 +1134,7 @@ msgstr "Learn about why we made this tool, who we are, and who our partners are.
msgid "Learn about your rent"
msgstr "Learn about your rent"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:351
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:353
#: frontend/lib/norent/about.tsx:66
#: frontend/lib/norent/the-letter.tsx:29
msgid "Learn more"
Expand Down Expand Up @@ -1192,7 +1192,7 @@ msgstr "Log in"

#: frontend/lib/evictionfree/site.tsx:75
#: frontend/lib/norent/site.tsx:40
#: frontend/lib/pages/logout-alt-page.tsx:13
#: frontend/lib/pages/logout-alt-page.tsx:14
msgid "Log out"
msgstr "Log out"

Expand Down Expand Up @@ -1318,7 +1318,7 @@ msgstr "Months of rent non-payment"
msgid "Months you're missing rent payments"
msgstr "Months you're missing rent payments"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:402
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:404
msgid "More actions"
msgstr "More actions"

Expand Down Expand Up @@ -1382,7 +1382,8 @@ msgid "Next"
msgstr "Next"

#: frontend/lib/evictionfree/declaration-builder/preview.tsx:31
#: frontend/lib/forms/yes-no-radios-form-field.tsx:27
#: frontend/lib/forms/yes-no-radios-form-field.tsx:28
#: frontend/lib/forms/yes-no-radios-form-field.tsx:47
#: frontend/lib/norent/letter-builder/letter-preview.tsx:28
#: frontend/lib/ui/confirmation-modal.tsx:20
msgid "No"
Expand Down Expand Up @@ -1620,7 +1621,7 @@ msgstr "Rats"
msgid "Rats/mice"
msgstr "Rats/mice"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:395
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:397
msgid "Recommended actions"
msgstr "Recommended actions"

Expand Down Expand Up @@ -1673,7 +1674,7 @@ msgstr "Research your landlord"
msgid "Reset your password"
msgstr "Reset your password"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:391
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:393
msgid "Results for {0}"
msgstr "Results for {0}"

Expand Down Expand Up @@ -1705,7 +1706,7 @@ msgstr "Rusty water"
msgid "Sample NoRent.org letter"
msgstr "Sample NoRent.org letter"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:460
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:462
msgid "Search address"
msgstr "Search address"

Expand Down Expand Up @@ -1870,7 +1871,7 @@ msgstr "Smoke detector not working"
msgid "Sorry, the page you are looking for doesn't seem to exist."
msgstr "Sorry, the page you are looking for doesn't seem to exist."

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:419
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:421
msgid "Sorry, we don't recognize the address you entered."
msgstr "Sorry, we don't recognize the address you entered."

Expand Down Expand Up @@ -2081,7 +2082,7 @@ msgstr "Unfortunately, we do not currently recommend sending this notice of non-
msgid "Unit/apt/lot/suite number"
msgstr "Unit/apt/lot/suite number"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:417
#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:419
msgid "Unrecognized address"
msgstr "Unrecognized address"

Expand Down Expand Up @@ -2390,7 +2391,8 @@ msgstr "With this free tool, you can"
msgid "Wyoming"
msgstr "Wyoming"

#: frontend/lib/forms/yes-no-radios-form-field.tsx:26
#: frontend/lib/forms/yes-no-radios-form-field.tsx:28
#: frontend/lib/forms/yes-no-radios-form-field.tsx:46
#: frontend/lib/norent/letter-builder/letter-preview.tsx:30
#: frontend/lib/ui/confirmation-modal.tsx:20
msgid "Yes"
Expand All @@ -2404,7 +2406,7 @@ msgstr "Yes, JustFix.nyc can text me to follow up about my housing issues."
msgid "Yes, Right to Counsel NYC Coalition, Housing Justice for All, and JustFix.nyc can text me to follow up about my housing issues."
msgstr "Yes, Right to Counsel NYC Coalition, Housing Justice for All, and JustFix.nyc can text me to follow up about my housing issues."

#: frontend/lib/pages/logout-alt-page.tsx:25
#: frontend/lib/pages/logout-alt-page.tsx:26
msgid "Yes, Sign Out"
msgstr "Yes, Sign Out"

Expand Down Expand Up @@ -2774,14 +2776,14 @@ msgstr "It looks like this building may require registration with HPD. Landlords
msgid "justfix.commonWarningAboutChangingLandlordDetails"
msgstr "If you receive rent-related documents from a different address, or if your landlord has instructed you to use a different address for correspondence, you can <0>provide your own details.</0> But, only use a different address if you are absolutely sure it is correct— it is safer to use the official address your landlord provided to the city."

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:337
msgid "justfix.ddoEfnycCovidMessage"
msgstr "You can send a hardship declaration form to your landlord and local courts— putting your eviction case on hold until May 1st, 2021."

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:274
msgid "justfix.ddoEhpaCovidMessage"
msgstr "<0>Due to the covid-19 pandemic, Housing Courts in New York City are prioritizing cases for conditions that threaten the health and safety of your household, such as: {issues}.</0>"

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:337
msgid "justfix.ddoEvictionfreeCovidMessage"
msgstr "You can send a hardship declaration form to your landlord and local courts— putting your eviction case on hold until May 1st, 2021."

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:260
msgid "justfix.ddoHpaCovidMessage"
msgstr "<0>Due to the Covid-19 health crisis, Housing Courts in New York City are closed. You can still make the forms to take your landlord to court but you will not be able to file them until the courts re-open.</0><1>If you are facing an emergency such as lack of heat and/or hot water, call the Housing Court Answers Hotline at <2>(212) 962-4795</2> to get assistance Mon-Fri, 9am-5pm. Assistance is available in English and Spanish.</1>"
Expand Down
Loading