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.

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
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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.EVICTIONFREE_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
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: 6 additions & 6 deletions frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx
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,22 +512,22 @@ 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(),
gaLabel: "efnyc",
to: evictionfreeURL(),
gaLabel: "evictionfree",
samaratrilling marked this conversation as resolved.
Show resolved Hide resolved
text: li18n._(t`Learn more`),
},
};
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/tests/util.tsx
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
6 changes: 3 additions & 3 deletions frontend/lib/ui/efnyc-link.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getGlobalAppServerInfo } from "../app-context";
import i18n from "../i18n";

export function efnycURL(): string {
const efnycLocale = i18n.locale === "en" ? "en-us" : i18n.locale;
return `${getGlobalAppServerInfo().efnycOrigin}/${efnycLocale}`;
export function evictionfreeURL(): string {
const evictionfreeLocale = i18n.locale === "en" ? "en-us" : i18n.locale;
return `${getGlobalAppServerInfo().evictionfreeOrigin}/${evictionfreeLocale}`;
}
2 changes: 1 addition & 1 deletion locales/en/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -2775,7 +2775,7 @@ 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"
msgid "justfix.ddoEvictionfreeCovidMessage"
samaratrilling marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
2 changes: 1 addition & 1 deletion locales/es/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -2780,7 +2780,7 @@ msgid "justfix.commonWarningAboutChangingLandlordDetails"
msgstr "Si recibes documentos relacionados con el alquiler desde una dirección diferente, o si el dueño de tu edificio te ha dado instrucciones de usar una dirección diferente para vuestra correspondencia, puedes <0>proporcionar tus propios datos.</0> Sin embargo, sólo debes usar una dirección distinta a la que te sugerimos si tienes la certeza absoluta de que es correcta — es más seguro usar la dirección oficial que el dueño de tu edificio ha registrado con la ciudad."

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:337
msgid "justfix.ddoEfnycCovidMessage"
msgid "justfix.ddoEvictionfreeCovidMessage"
samaratrilling marked this conversation as resolved.
Show resolved Hide resolved
msgstr "Puedes enviar un formulario de declaración de penurias al dueño de tu edificio y a los tribunales locales — deteniendo tu caso de desalojo hasta el 1 de mayo, 2021."

#: frontend/lib/data-driven-onboarding/data-driven-onboarding.tsx:274
Expand Down
2 changes: 1 addition & 1 deletion project/justfix_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ class JustfixEnvironment(typed_environ.BaseEnvironment):
WOW_ORIGIN: str = "https://whoownswhat.justfix.nyc"

# The base url for outbound links to Eviction Free NYC.
EFNYC_ORIGIN: str = "https://www.evictionfreenyc.org"
EVICTIONFREE_ORIGIN: str = "https://www.evictionfreenyc.org"
samaratrilling marked this conversation as resolved.
Show resolved Hide resolved

# Whether to use the lambda HTTP server. If false, we'll use a separate
# subprocess for each server-side rendering request, otherwise we'll
Expand Down
2 changes: 1 addition & 1 deletion project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@

NAVBAR_LABEL = env.NAVBAR_LABEL
WOW_ORIGIN = env.WOW_ORIGIN
EFNYC_ORIGIN = env.EFNYC_ORIGIN
EVICTIONFREE_ORIGIN = env.EVICTIONFREE_ORIGIN

USE_LAMBDA_HTTP_SERVER = env.USE_LAMBDA_HTTP_SERVER

Expand Down
2 changes: 1 addition & 1 deletion project/settings_pytest.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
NAVBAR_LABEL = ""

WOW_ORIGIN = "https://demo-whoownswhat.herokuapp.com"
EFNYC_ORIGIN = "https://demo-efnyc.netlify.com"
EVICTIONFREE_ORIGIN = "https://demo-evictionfree.netlify.com"

ENABLE_EMERGENCY_HP_ACTION = True

Expand Down