Skip to content

Commit

Permalink
Merge branch 'dev' into dependabot/npm_and_yarn/tests/cypress/cypress…
Browse files Browse the repository at this point in the history
…-13.13.0
  • Loading branch information
machikoyasuda authored Jul 9, 2024
2 parents 2646a55 + 1591ca1 commit d8a3e90
Show file tree
Hide file tree
Showing 15 changed files with 288 additions and 24 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{% load i18n %}

<h2 class="h2-sm pt-4 pt-lg-8" id="cst-agency-card">{% translate "What is an Agency Card?" %}</h2>
<p class="pt-2 pt-lg-4">
{% blocktranslate trimmed %}
California State Transit issues Agency Cards to riders who qualify for a number of reduced fare programs. This transit benefit may need to be renewed in the future based on the expiration date of the Agency Card. Learn more at the <a href="https://www.agency-website.com" target="_blank" rel="noopener noreferrer">www.agency-website.com</a>.
{% endblocktranslate %}
</p>
6 changes: 6 additions & 0 deletions benefits/core/templates/core/index--cst.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% extends "core/agency-index.html" %}
{% load i18n %}

{% block headline %}
{% translate "Get a reduced fare on CST public transportation when you tap to ride" %}
{% endblock headline %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{% extends "eligibility/includes/media-item--idcardcheck.html" %}

{% load i18n %}

{% block heading %}
{% translate "Your current Agency Card number" %}
{% endblock heading %}

{% block body %}
<div class="media-body--details">
<p>{% translate "You do not need to have your physical CST Agency Card, but you will need to know the number." %}</p>
</div>
{% endblock body %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% extends "eligibility/includes/selection-label.html" %}
{% load i18n %}

{% block label %}
{% translate "Agency Card" %}
{% endblock label %}

{% block description %}
{% translate "This option is for people who have a current CST Agency Card or a CST Paratransit Eligibility Card." %}
{% endblock description %}
9 changes: 9 additions & 0 deletions benefits/eligibility/templates/eligibility/index--cst.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% extends "eligibility/index.html" %}

{% load i18n %}

{% block explanatory-text %}
<p class="pt-4 pb-4 pb-lg-8">
{% translate "Cal-ITP doesn’t save any of your information. All CST transit benefits reduce fares by 50% for bus service on fixed routes." %}
</p>
{% endblock explanatory-text %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{% extends "eligibility/start.html" %}
{% load i18n %}

{% block page-title %}
{% translate "Agency card overview" %}
{% endblock page-title %}

{% block headline %}
<div class="col-lg-8">
<h1>{% translate "You selected an Agency Card transit benefit." %}</h1>
</div>
{% endblock headline %}

{% block media-item %}
{% include "eligibility/includes/media-item--idcardcheck--start--cst-agency-card.html" %}
{% endblock media-item %}

{% block call-to-action %}
<div class="row d-flex justify-content-lg-end">
<div class="col-lg-3 offset-2 offset-sm-2 offset-lg-0 col-sm-8 col-8">
{% url "eligibility:confirm" as button_url %}
<a href="{{ button_url }}" class="btn btn-lg btn-primary" role="button">{% translate "Continue" %}</a>
</div>
</div>
{% endblock call-to-action %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% extends "eligibility/unverified.html" %}
{% load i18n %}

{% block unverified-headline %}
{% translate "Your card information may not have been entered correctly." %}
{% endblock unverified-headline %}

{% block unverified-body %}
{% translate "The number and last name must be entered exactly as they appear on your CST Agency Card. Please check your card and try again, or contact your transit agency for help." %}
{% endblock unverified-body %}

{% block unverified-call-to-action %}
{% translate "Try again" as button_text %}
<div class="col-lg-3 col-8">{% include "core/includes/button--origin.html" with button_text=button_text %}</div>
{% endblock unverified-call-to-action %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{% extends "enrollment/success.html" %}
{% load i18n %}

{% block headline-message %}
{% blocktranslate trimmed %}
You can now use your contactless card to tap to ride with a reduced fare!
{% endblocktranslate %}
{% endblock headline-message %}

{% block success-message %}
{% blocktranslate trimmed %}
Your contactless card is now enrolled in a CST Agency Card transit benefit. When boarding a CST bus, tap this card and you will be
charged a reduced fare. You will need to re-enroll if you choose to change the card you use to pay for transit service.
{% endblocktranslate %}
{% endblock success-message %}

{% block thank-you-message %}
{% blocktranslate trimmed %}
You were not charged anything today. Thank you for using Cal-ITP Benefits!
{% endblocktranslate %}
{% endblock thank-you-message %}
9 changes: 9 additions & 0 deletions benefits/enrollment/templates/enrollment/success--cst.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% extends "enrollment/success.html" %}
{% load i18n %}

{% block success-message %}
{% blocktranslate trimmed %}
You were not charged anything today. When boarding a CST bus, tap your contactless card and you will be
charged a reduced fare. You will need to re-enroll if you choose to change the card you use to pay for transit service.
{% endblocktranslate %}
{% endblock success-message %}
74 changes: 66 additions & 8 deletions benefits/locale/en/LC_MESSAGES/django.po
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: 2024-06-07 16:22+0000\n"
"POT-Creation-Date: 2024-07-03 13:26-0700\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -219,6 +219,17 @@ msgid ""
"pay for public transportation."
msgstr ""

msgid "What is an Agency Card?"
msgstr ""

msgid ""
"California State Transit issues Agency Cards to riders who qualify for a "
"number of reduced fare programs. This transit benefit may need to be renewed "
"in the future based on the expiration date of the Agency Card. Learn more at "
"the <a href=\"https://www.agency-website.com\" target=\"_blank\" "
"rel=\"noopener noreferrer\">www.agency-website.com</a>."
msgstr ""

msgid "What is a Courtesy Card?"
msgstr ""

Expand Down Expand Up @@ -267,6 +278,9 @@ msgid ""
"JavaScript. Please enable JavaScript for this website and"
msgstr ""

msgid "Get a reduced fare on CST public transportation when you tap to ride"
msgstr ""

msgid "Get a reduced fare on MST public transportation when you tap to ride"
msgstr ""

Expand Down Expand Up @@ -367,6 +381,14 @@ msgstr ""
msgid "Learn more about contactless cards"
msgstr ""

msgid "Your current Agency Card number"
msgstr ""

msgid ""
"You do not need to have your physical CST Agency Card, but you will need to "
"know the number."
msgstr ""

msgid "A Login.gov account with identity verification"
msgstr ""

Expand Down Expand Up @@ -441,6 +463,14 @@ msgid ""
"verify your identity with"
msgstr ""

msgid "Agency Card"
msgstr ""

msgid ""
"This option is for people who have a current CST Agency Card or a CST "
"Paratransit Eligibility Card."
msgstr ""

msgid "Courtesy Card"
msgstr ""

Expand Down Expand Up @@ -473,6 +503,12 @@ msgid ""
"other than dishonorable. You will need to verify your identity with"
msgstr ""

#, python-format
msgid ""
"Cal-ITP doesn’t save any of your information. All CST transit benefits "
"reduce fares by 50%% for bus service on fixed routes."
msgstr ""

#, python-format
msgid ""
"Cal-ITP doesn’t save any of your information. All MST transit benefits "
Expand Down Expand Up @@ -509,12 +545,15 @@ msgstr ""
msgid "Agency card overview"
msgstr ""

msgid "You selected a Courtesy Card transit benefit."
msgid "You selected an Agency Card transit benefit."
msgstr ""

msgid "Continue"
msgstr ""

msgid "You selected a Courtesy Card transit benefit."
msgstr ""

msgid "You selected a Reduced Fare Mobility ID transit benefit."
msgstr ""

Expand All @@ -537,14 +576,20 @@ msgid "Your card information may not have been entered correctly."
msgstr ""

msgid ""
"The number and last name must be entered exactly as they appear on your MST "
"Courtesy Card. Please check your card and try again, or contact your transit "
"The number and last name must be entered exactly as they appear on your CST "
"Agency Card. Please check your card and try again, or contact your transit "
"agency for help."
msgstr ""

msgid "Try again"
msgstr ""

msgid ""
"The number and last name must be entered exactly as they appear on your MST "
"Courtesy Card. Please check your card and try again, or contact your transit "
"agency for help."
msgstr ""

msgid ""
"The number and last name must be entered exactly as they appear on your "
"SBMTD Reduced Fare Mobility ID card. Please check your card and try again, "
Expand Down Expand Up @@ -649,16 +694,29 @@ msgid ""
msgstr ""

msgid ""
"Your contactless card is now enrolled in an MST Courtesy Card transit "
"benefit. When boarding an MST bus, tap this card and you will be charged a "
"reduced fare. You will need to re-enroll if you choose to change the card "
"you use to pay for transit service."
"Your contactless card is now enrolled in a CST Agency Card transit benefit. "
"When boarding a CST bus, tap this card and you will be charged a reduced "
"fare. You will need to re-enroll if you choose to change the card you use to "
"pay for transit service."
msgstr ""

msgid ""
"You were not charged anything today. Thank you for using Cal-ITP Benefits!"
msgstr ""

msgid ""
"You were not charged anything today. When boarding a CST bus, tap your "
"contactless card and you will be charged a reduced fare. You will need to re-"
"enroll if you choose to change the card you use to pay for transit service."
msgstr ""

msgid ""
"Your contactless card is now enrolled in an MST Courtesy Card transit "
"benefit. When boarding an MST bus, tap this card and you will be charged a "
"reduced fare. You will need to re-enroll if you choose to change the card "
"you use to pay for transit service."
msgstr ""

msgid ""
"You were not charged anything today. When boarding an MST bus, tap this card "
"and you will be charged a reduced fare. You will need to re-enroll if you "
Expand Down
Loading

0 comments on commit d8a3e90

Please sign in to comment.