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

Home, Agency Index: Use new EN/ES copy with 1 new agency variable #1499

Merged
merged 3 commits into from Jul 7, 2023

Conversation

machikoyasuda
Copy link
Member

@machikoyasuda machikoyasuda commented Jul 7, 2023

closes #1386

What this PR does

  • Model, migration changes: Adds 1 new text fields to TransitAgency model, transit_type. This field has a msgid values.
  • Index page change: Use new EN/ES copy
  • Agency Index page change: Use new EN/ES copy along with 1 new TransitAgency variable

What this PR does not do

  • Add the rest of the new text field variables to TransitAgency
  • Add new text field variables to EligibilityVerifier
  • Use the new TransitAgency text field variables in any copy aside from the Index, Agency Index pages

New variable on Transit Agency

Figma, Google Code in this PR MST SacRT
[transit type] transit_type bus light rail

How the variables are used in this PR

Figma

image

http://localhost:8000/mst

image

http://localhost:8000/sacrt

image

@github-actions github-actions bot added deployment-dev [auto] Changes that will trigger a deploy if merged to dev migrations [auto] Review for potential model changes/needed data migrations updates i18n Copy: Language files or Django i18n framework back-end Django views, sessions, middleware, models, migrations etc. labels Jul 7, 2023
@machikoyasuda machikoyasuda marked this pull request as ready for review July 7, 2023 00:59
@machikoyasuda machikoyasuda requested a review from a team as a code owner July 7, 2023 00:59
@machikoyasuda machikoyasuda self-assigned this Jul 7, 2023
@machikoyasuda machikoyasuda added this to the Veterans milestone Jul 7, 2023
@@ -325,6 +325,12 @@ def load_data(app, *args, **kwargs):
jws_signing_alg=os.environ.get("MST_AGENCY_JWS_SIGNING_ALG", "RS256"),
payment_processor=mst_payment_processor,
eligibility_index_intro=_("eligibility.pages.index.p[0].mst"),
transit_option=_("agency.variables.mst.transit_option"),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@angela-tran @thekaveman Also open to suggestions on how to name these msgIds: I just made this up _("agency.variables.mst.transit_option"),

Comment on lines 548 to 568
msgid "eligibility.pages.start.login_gov.required_items[0]"
msgstr "Su tarjeta de identificación emitida por el estado"

msgid "eligibility.pages.start.login_gov.required_items[1]"
msgstr "Su número de Seguro Social"

msgid "eligibility.pages.start.login_gov.required_items[2]"
msgstr "Un número de teléfono con un plan de teléfono asociado con su nombre"

msgid "eligibility.pages.start.veteran.required_items[0]"
msgstr "Login.gov"

msgid "eligibility.pages.start.veteran.required_items[1]"
msgstr "ID.me"

msgid "eligibility.pages.start.veteran.required_items[2]"
msgstr "DS Logon"

msgid "eligibility.pages.start.veteran.required_items[3]"
msgstr "My HealtheVet"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

???? Have no idea why Django did this !!!!!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know why now 😓 thankfully the changes in #1498 will prevent this clobbering from happening in the future by bin/makemessages.sh b/c the msgids will be in the app.

@machikoyasuda machikoyasuda changed the title Home, Agency Index: Use new EN/ES copy with new agency variables Home, Agency Index: Use new EN/ES copy with 1 new agency variable Jul 7, 2023
Copy link
Member

@thekaveman thekaveman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is simpler than #1498

We can merge this first and I can rebase on this, instead of the other way around.

@thekaveman thekaveman mentioned this pull request Jul 7, 2023
4 tasks
@machikoyasuda
Copy link
Member Author

@thekaveman Rebased

@machikoyasuda machikoyasuda merged commit 34b17a1 into dev Jul 7, 2023
13 checks passed
@machikoyasuda machikoyasuda deleted the feat/agency-variables branch July 7, 2023 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
back-end Django views, sessions, middleware, models, migrations etc. deployment-dev [auto] Changes that will trigger a deploy if merged to dev i18n Copy: Language files or Django i18n framework migrations [auto] Review for potential model changes/needed data migrations updates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Home & Agency Index - Update homepage copy + Create Agency text variables
2 participants