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

Clean up sample data #969

Merged
merged 4 commits into from
Sep 28, 2022
Merged

Clean up sample data #969

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c85f4d2
chore: remove extra sample verifier
thekaveman Sep 28, 2022
2db03b4
chore: clean up sample agencies
thekaveman Sep 28, 2022
c9e8e06
chore: clean up sample types
thekaveman Sep 28, 2022
de5fcdf
chore(po): remove line number references
thekaveman Sep 28, 2022
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
54 changes: 11 additions & 43 deletions benefits/core/migrations/0002_sample_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,35 +95,19 @@ def load_sample_data(app, *args, **kwargs):
EligibilityVerifier = app.get_model("core", "EligibilityVerifier")

verifier1 = EligibilityVerifier.objects.create(
Copy link
Member Author

Choose a reason for hiding this comment

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

c85f4d2 is the critical commit of the PR - I removed the extra sample verifier we had (previously standing in as a placeholder for the DMV), and moved the existing sample OAuth verifier up and renamed it to verifier1.

This had a big impact on the PO files

name="Test Eligibility Verifier 1",
api_url="http://server:8000/verify",
api_auth_header="X-Server-API-Key",
api_auth_key="server-auth-token",
name="OAuth claims via Login.gov",
eligibility_type=type1,
public_key=server_public_key,
jwe_cek_enc="A256CBC-HS512",
jwe_encryption_alg="RSA-OAEP",
jws_signing_alg="RS256",
auth_provider=auth_provider,
selection_label=_("eligibility.pages.index.sample.label"),
selection_label_description=_("eligibility.pages.index.sample.description"),
start_headline=_("eligibility.pages.start.sample.title"),
start_sub_headline=_("eligibility.pages.start.sample.content_title"),
start_item_name=_("eligibility.pages.start.sample.items[0].title"),
start_item_description=_("eligibility.pages.start.sample.items[0].text"),
start_blurb=_("eligibility.pages.start.sample.p[0]"),
form_title=_("eligibility.pages.confirm.sample.title"),
form_content_title=_("eligibility.pages.confirm.sample.content_title"),
form_blurb=_("eligibility.pages.confirm.sample.p[0]"),
form_sub_label=_("eligibility.forms.confirm.sample.fields.sub"),
form_sub_placeholder="A1234567",
form_sub_pattern=".+",
form_name_label=_("eligibility.forms.confirm.sample.fields.name"),
form_name_placeholder="Rodriguez",
form_name_max_length=255,
unverified_title=_("eligibility.pages.unverified.sample.title"),
unverified_content_title=_("eligibility.pages.unverified.sample.content_title"),
unverified_blurb=_("eligibility.pages.unverified.sample.p[0]"),
selection_label=_("eligibility.pages.index.mst_login.label"),
selection_label_description=_("eligibility.pages.index.mst_login.description"),
start_headline=_("eligibility.pages.start.mst_login.headline"),
start_sub_headline=_("eligibility.pages.start.mst_login.sub_headline"),
start_item_name=_("eligibility.pages.start.mst_login.items[0].title"),
start_item_description=_("eligibility.pages.start.mst_login.items[0].text"),
start_blurb=_("eligibility.pages.start.mst_login.p[0]"),
unverified_title=_("eligibility.pages.unverified.mst_login.title"),
unverified_content_title=_("eligibility.pages.unverified.mst_login.content_title"),
unverified_blurb=_("eligibility.pages.unverified.mst_login.p[0]"),
)

verifier2 = EligibilityVerifier.objects.create(
Expand Down Expand Up @@ -160,22 +144,6 @@ def load_sample_data(app, *args, **kwargs):
unverified_blurb=_("eligibility.pages.unverified.mst_cc.p[0]"),
)

EligibilityVerifier.objects.create(
name="OAuth claims via Login.gov",
eligibility_type=type1,
auth_provider=auth_provider,
selection_label=_("eligibility.pages.index.mst_login.label"),
selection_label_description=None,
start_headline=_("eligibility.pages.start.mst_login.headline"),
start_sub_headline=_("eligibility.pages.start.mst_login.sub_headline"),
start_item_name=_("eligibility.pages.start.mst_login.items[0].title"),
start_item_description=_("eligibility.pages.start.mst_login.items[0].text"),
start_blurb=_("eligibility.pages.start.mst_login.p[0]"),
unverified_title=_("eligibility.pages.unverified.mst_login.title"),
unverified_content_title=_("eligibility.pages.unverified.mst_login.content_title"),
unverified_blurb=_("eligibility.pages.unverified.mst_login.p[0]"),
)

PaymentProcessor = app.get_model("core", "PaymentProcessor")

payment_processor = PaymentProcessor.objects.create(
Expand Down
160 changes: 48 additions & 112 deletions benefits/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
"POT-Creation-Date: 2022-09-28 20:50+0000\n"
"POT-Creation-Date: 2022-09-28 22:59+0000\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -21,201 +21,137 @@ msgstr "Get started with"
msgid "eligibility.buttons.signout"
msgstr "Sign out of Login.gov"

#: benefits/core/migrations/0002_sample_data.py:108
msgid "eligibility.pages.index.sample.label"
msgstr "I am 65 years of age or older"
#: benefits/core/migrations/0002_sample_data.py:101
msgid "eligibility.pages.index.mst_login.label"
msgstr "Senior Discount Program"

#: benefits/core/migrations/0002_sample_data.py:109
msgid "eligibility.pages.index.sample.description"
#: benefits/core/migrations/0002_sample_data.py:102
msgid "eligibility.pages.index.mst_login.description"
msgstr ""
"You must be 65 years or older. This benefit does not expire, but you may "
"need to renew. Using this benefit means your new transit fare is half of the "
"standard fare."

#: benefits/core/migrations/0002_sample_data.py:110
msgid "eligibility.pages.start.sample.title"
msgstr "You selected an Older Adult Benefit with MST."
#: benefits/core/migrations/0002_sample_data.py:103
msgid "eligibility.pages.start.mst_login.headline"
msgstr "You selected an Older Adult benefit with MST."

#: benefits/core/migrations/0002_sample_data.py:111
msgid "eligibility.pages.start.sample.content_title"
#: benefits/core/migrations/0002_sample_data.py:104
msgid "eligibility.pages.start.mst_login.sub_headline"
msgstr "You will need a few items to connect your benefit:"

#: benefits/core/migrations/0002_sample_data.py:112
msgid "eligibility.pages.start.sample.items[0].title"
msgstr "Provide your California ID number"

#: benefits/core/migrations/0002_sample_data.py:113
msgid "eligibility.pages.start.sample.items[0].text"
msgstr "You will need to verify your age with a driver’s license or ID card."
#: benefits/core/migrations/0002_sample_data.py:105
msgid "eligibility.pages.start.mst_login.items[0].title"
msgstr "A Login.gov account with identity verification"

#: benefits/core/migrations/0002_sample_data.py:114
msgid "eligibility.pages.start.sample.p[0]"
#: benefits/core/migrations/0002_sample_data.py:106
msgid "eligibility.pages.start.mst_login.items[0].text"
msgstr ""
"This program is currently open to those who are 65 or older. Not over 65? "
"Get in touch with your transit provider to learn about other available "
"discount programs."

#: benefits/core/migrations/0002_sample_data.py:115
msgid "eligibility.pages.confirm.sample.title"
msgstr "Confirm Eligibility"

#: benefits/core/migrations/0002_sample_data.py:116
msgid "eligibility.pages.confirm.sample.content_title"
msgstr "Let’s see if we can confirm your age with the Sample Server."
"Login.gov is a safe way to sign in to government services. Benefits uses "
"Login.gov to verify your age. If you do not have an account already, you "
"will be able to create one. You will also need to verify your identity, "
"which will require these items:"

#: benefits/core/migrations/0002_sample_data.py:117
msgid "eligibility.pages.confirm.sample.p[0]"
#: benefits/core/migrations/0002_sample_data.py:107
msgid "eligibility.pages.start.mst_login.p[0]"
msgstr ""
"Please enter your license/ID number and last name below. If you’re 65 or "
"older, we can confirm that you are eligible for a senior discount when you "
"ride transit. We do not save the information you enter here."

#: benefits/core/migrations/0002_sample_data.py:118
msgid "eligibility.forms.confirm.sample.fields.sub"
msgstr "CA driver’s license or ID number"

#: benefits/core/migrations/0002_sample_data.py:121
msgid "eligibility.forms.confirm.sample.fields.name"
msgstr "Last name (as it appears on ID)"

#: benefits/core/migrations/0002_sample_data.py:124
msgid "eligibility.pages.unverified.sample.title"
#: benefits/core/migrations/0002_sample_data.py:108
msgid "eligibility.pages.unverified.mst_login.title"
msgstr "Eligibility Error"

#: benefits/core/migrations/0002_sample_data.py:125
msgid "eligibility.pages.unverified.sample.content_title"
#: benefits/core/migrations/0002_sample_data.py:109
msgid "eligibility.pages.unverified.mst_login.content_title"
msgstr "Your eligibility could not be verified."

#: benefits/core/migrations/0002_sample_data.py:126
msgid "eligibility.pages.unverified.sample.p[0]"
#: benefits/core/migrations/0002_sample_data.py:110
msgid "eligibility.pages.unverified.mst_login.p[0]"
msgstr ""
"You may still be eligible for a discount, but we can’t verify your age with "
"the sample."
"That’s okay! You may still be eligible for our program. Please reach out to "
"your local transit provider for assistance."

#: benefits/core/migrations/0002_sample_data.py:140
#: benefits/core/migrations/0002_sample_data.py:124
msgid "eligibility.pages.index.mst_cc.label"
msgstr "I have an MST Courtesy Card"

#: benefits/core/migrations/0002_sample_data.py:141
#: benefits/core/migrations/0002_sample_data.py:125
msgid "eligibility.pages.index.mst_cc.description"
msgstr ""
"This option is for people who have a current Courtesy Card (includes MST "
"RIDES Eligibility cardholders). This benefit is part of a demonstration tool "
"and may need to be renewed in the future. Using this benefit means your new "
"transit fare is half of the standard fare.the sample."

#: benefits/core/migrations/0002_sample_data.py:142
#: benefits/core/migrations/0002_sample_data.py:126
msgid "eligibility.pages.start.mst_cc.headline"
msgstr "You selected a Courtesy Card benefit."

#: benefits/core/migrations/0002_sample_data.py:143
#: benefits/core/migrations/0002_sample_data.py:127
msgid "eligibility.pages.start.mst_cc.sub_headline"
msgstr "You will need a few items to connect your benefit:"

#: benefits/core/migrations/0002_sample_data.py:144
#: benefits/core/migrations/0002_sample_data.py:128
msgid "eligibility.pages.start.mst_cc.items[0].title"
msgstr "Your current Courtesy Card number"

#: benefits/core/migrations/0002_sample_data.py:145
#: benefits/core/migrations/0002_sample_data.py:129
msgid "eligibility.pages.start.mst_cc.items[0].text"
msgstr ""
"You do not need to have your physical card, but you will need to know the "
"number. It is five digits and starts with a #. "

#: benefits/core/migrations/0002_sample_data.py:146
#: benefits/core/migrations/0002_sample_data.py:130
msgid "eligibility.pages.start.mst_cc.p[0]"
msgstr ""
"This program is currently open to all MST Courtesy Cardholders. Not a "
"Courtesy Cardholder? Get in touch with your transit provider to learn about "
"other available discount programs at"

#: benefits/core/migrations/0002_sample_data.py:147
#: benefits/core/migrations/0002_sample_data.py:131
msgid "eligibility.pages.confirm.mst_cc.title"
msgstr "Confirm your Courtesy Card"

#: benefits/core/migrations/0002_sample_data.py:148
#: benefits/core/migrations/0002_sample_data.py:132
msgid "eligibility.pages.confirm.mst_cc.content_title"
msgstr "Let’s see if we can find you in our system"

#: benefits/core/migrations/0002_sample_data.py:149
#: benefits/core/migrations/0002_sample_data.py:133
msgid "eligibility.pages.confirm.mst_cc.p[0]"
msgstr ""
"Please input your Courtesy Card number and last name below. If you’re a "
"current MST Courtesy Cardholder, we can confirm that you are eligible for a "
"benefit. We do not save your information."

#: benefits/core/migrations/0002_sample_data.py:150
#: benefits/core/migrations/0002_sample_data.py:134
msgid "eligibility.forms.confirm.mst_cc.fields.sub"
msgstr "MST Courtesy Card number"

#: benefits/core/migrations/0002_sample_data.py:151
#: benefits/core/migrations/0002_sample_data.py:135
msgid "eligibility.forms.confirm.mst_cc.fields.sub.help_text"
msgstr "This is a 5-digit number on the front and back of your card."

#: benefits/core/migrations/0002_sample_data.py:154
#: benefits/core/migrations/0002_sample_data.py:138
msgid "eligibility.forms.confirm.mst_cc.fields.name"
msgstr "Last name (as it appears on Courtesy Card)"

#: benefits/core/migrations/0002_sample_data.py:155
#: benefits/core/migrations/0002_sample_data.py:139
msgid "eligibility.forms.confirm.mst_cc.fields.name.help_text"
msgstr "We use this to help confirm your Courtesy Card."

#: benefits/core/migrations/0002_sample_data.py:158
#: benefits/core/migrations/0002_sample_data.py:142
msgid "eligibility.pages.unverified.mst_cc.title"
msgstr "Courtesy Card not located"

#: benefits/core/migrations/0002_sample_data.py:159
#: benefits/core/migrations/0002_sample_data.py:143
msgid "eligibility.pages.unverified.mst_cc.content_title"
msgstr "We couldn’t locate you in our system"

#: benefits/core/migrations/0002_sample_data.py:160
#: benefits/core/migrations/0002_sample_data.py:144
msgid "eligibility.pages.unverified.mst_cc.p[0]"
msgstr ""
"That’s okay! You may still be eligible for our program. Please reach out to "
"Monterey-Salinas Transit for assistance."

#: benefits/core/migrations/0002_sample_data.py:167
msgid "eligibility.pages.index.mst_login.label"
msgstr "Senior Discount Program"

#: benefits/core/migrations/0002_sample_data.py:169
msgid "eligibility.pages.start.mst_login.headline"
msgstr "You selected an Older Adult benefit with MST."

#: benefits/core/migrations/0002_sample_data.py:170
msgid "eligibility.pages.start.mst_login.sub_headline"
msgstr "You will need a few items to connect your benefit:"

#: benefits/core/migrations/0002_sample_data.py:171
msgid "eligibility.pages.start.mst_login.items[0].title"
msgstr "A Login.gov account with identity verification"

#: benefits/core/migrations/0002_sample_data.py:172
msgid "eligibility.pages.start.mst_login.items[0].text"
msgstr ""
"Login.gov is a safe way to sign in to government services. Benefits uses "
"Login.gov to verify your age. If you do not have an account already, you "
"will be able to create one. You will also need to verify your identity, "
"which will require these items:"

#: benefits/core/migrations/0002_sample_data.py:173
msgid "eligibility.pages.start.mst_login.p[0]"
msgstr ""

#: benefits/core/migrations/0002_sample_data.py:174
msgid "eligibility.pages.unverified.mst_login.title"
msgstr "Eligibility Error"

#: benefits/core/migrations/0002_sample_data.py:175
msgid "eligibility.pages.unverified.mst_login.content_title"
msgstr "Your eligibility could not be verified."

#: benefits/core/migrations/0002_sample_data.py:176
msgid "eligibility.pages.unverified.mst_login.p[0]"
msgstr ""
"That’s okay! You may still be eligible for our program. Please reach out to "
"your local transit provider for assistance."

#: benefits/core/templates/core/agency_index.html:10
msgid "core.pages.agency_index.h2"
msgstr "Your benefit applies every time you tap to ride."
Expand Down Expand Up @@ -616,7 +552,7 @@ msgstr ""
msgid "eligibility.pages.start.title"
msgstr "Get Started"

#: benefits/eligibility/views.py:234
#: benefits/eligibility/views.py:233
msgctxt "image alt text"
msgid "core.icons.idcardquestion"
msgstr "Identification card icon with question mark"
Expand Down
Loading