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

Jump to bottom

Eligibility Start: Veterans - Use Older Adult copy #1705

Merged
merged 6 commits into from
Sep 6, 2023
Merged

Eligibility Start: Veterans - Use Older Adult copy #1705

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
7f1bbda
feat(elig-start): Veterans - Use same copy as Older Adult
machikoyasuda Sep 5, 2023
1473974
feat(elig-start): Veterans - Use Login.gov button for CTA
machikoyasuda Sep 5, 2023
829e4d7
chore: update django.po
machikoyasuda Sep 5, 2023
edb1d10
fix(elig-start): change heading, change to Spaces: 2
machikoyasuda Sep 6, 2023
f9dffcb
fix(modal): rename modal from Senior to Login
machikoyasuda Sep 6, 2023
4cb2853
chore: run makemessages
machikoyasuda Sep 6, 2023
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
32 changes: 16 additions & 16 deletions ...ts/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
{% load i18n %}

{% block heading %}
{% translate "A Login.gov account with identity verification" %}
{% translate "A Login.gov account with identity verification" %}
{% endblock heading %}

{% block body %}
<div class="media-body--details">
<p>
{% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
{% translate "Learn more about identity verification" as text %}
{% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
</p>
<div class="media-body--items">
<p>{% translate "For this process you will need:" %}</p>
<ul>
<li>{% translate "Your state-issued ID card" %}</li>
<li>{% translate "Your Social Security number" %}</li>
<li>{% translate "A phone number with a phone plan associated with your name" %}</li>
</ul>
</div>
<div class="media-body--details">
<p>
{% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
{% translate "Learn more about identity verification" as text %}
{% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
</p>
<div class="media-body--items">
<p>{% translate "For this process you will need:" %}</p>
<ul>
<li>{% translate "Your state-issued ID card" %}</li>
<li>{% translate "Your Social Security number" %}</li>
<li>{% translate "A phone number with a phone plan associated with your name" %}</li>
</ul>
</div>
</div>

{% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
{% include "eligibility/includes/modal--login-gov-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
{% endblock body %}
19 changes: 10 additions & 9 deletions ...s/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,25 @@
{% load i18n %}

{% block heading %}
{% translate "Access to your preferred VA related account" %}
{% translate "A Login.gov account with identity verification" %}
{% endblock heading %}

{% block body %}
<div class="media-body--details">
<p>
{% translate "You will need to sign into VA.gov in order to verify your identity and your veteran status. VA.gov uses the following services:" %}
{% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
{% translate "Learn more about identity verification" as text %}
{% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
</p>
<div class="media-body--items">
<p>{% translate "For this process you will need:" %}</p>
<ul>
<li>{% translate "Login.gov" %}</li>
<li>{% translate "ID.me" %}</li>
<li>{% translate "DS Logon" %}</li>
<li>{% translate "My HealtheVet" %}</li>
<li>{% translate "Your state-issued ID card" %}</li>
<li>{% translate "Your Social Security number" %}</li>
<li>{% translate "A phone number with a phone plan associated with your name" %}</li>
</ul>
<p class="pt-1">
{% translate "If you do not have an account with any of these services, you will need to create one. We recommend using Login.gov." %}
</p>
</div>
</div>

{% include "eligibility/includes/modal--login-gov-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
{% endblock body %}
0 ...ty/includes/modal--senior-start-help.html → ...includes/modal--login-gov-start-help.html
View file
Open in desktop
File renamed without changes.
8 changes: 5 additions & 3 deletions benefits/eligibility/templates/eligibility/start--veteran.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ <h1>{% translate "You selected a Veteran transit benefit." %}</h1>

{% 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">
<div class="col-lg-4 offset-2 offset-lg-0 col-sm-8 col-8 d-flex justify-content-lg-end justify-content-center">
{% url "oauth:login" as button_url %}
{% translate "Continue to VA.gov" as button_text %}
<a href="{{ button_url }}" class="btn btn-lg btn-primary" role="button">{{ button_text }}</a>
{% translate "Get started with" as button_text %}
<a href="{{ button_url }}" class="btn btn-lg btn-primary" id="login">
{{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
</a>
</div>
</div>
{% endblock call-to-action %}
42 changes: 7 additions & 35 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: 2023-08-15 22:45+0000\n"
"POT-Creation-Date: 2023-09-06 21:22+0000\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -332,49 +332,24 @@ msgstr ""
msgid "A phone number with a phone plan associated with your name"
msgstr ""

msgid "Access to your preferred VA related account"
msgstr ""

msgid ""
"You will need to sign into VA.gov in order to verify your identity and your "
"veteran status. VA.gov uses the following services:"
msgstr ""

msgid "Login.gov"
msgstr ""

msgid "ID.me"
msgstr ""

msgid "DS Logon"
msgstr ""

msgid "My HealtheVet"
msgstr ""

msgid ""
"If you do not have an account with any of these services, you will need to "
"create one. We recommend using Login.gov."
msgstr ""

msgid "Go back"
msgstr ""

msgid "Learn more about"
msgid "Verify your identity with "
msgstr ""

msgctxt "image alt text"
msgid "Login.gov"
msgstr ""

msgid "Verify your identity with "
msgstr ""

msgid ""
"We use Login.gov to verify your identity to make sure you are eligible for "
"the transit benefit you selected."
msgstr ""

msgid "Learn more about"
msgstr ""

msgid "MST Courtesy Card"
msgstr ""

Expand All @@ -397,8 +372,8 @@ msgid ""
"This option is for people who have served in the active military, naval, or "
"air service, and who were discharged or released therefrom under conditions "
"other than dishonorable. You will need to <a href=\"https://www.va.gov/"
"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" "
"rel=\"noopener noreferrer\">verify your identity through VA.gov</a>."
"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" rel="
"\"noopener noreferrer\">verify your identity through VA.gov</a>."
msgstr ""

#, python-format
Expand Down Expand Up @@ -448,9 +423,6 @@ msgstr ""
msgid "You selected a Veteran transit benefit."
msgstr ""

msgid "Continue to VA.gov"
msgstr ""

msgid "You will need a few items to continue:"
msgstr ""

Expand Down
56 changes: 12 additions & 44 deletions benefits/locale/es/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: 2023-08-15 22:45+0000\n"
"POT-Creation-Date: 2023-09-06 21:22+0000\n"
"Language: Español\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -259,8 +259,8 @@ msgstr ""
"califican para una serie de programas de tarifas reducidas. Este beneficio "
"de tránsito debe renovarse en el futuro en función de la fecha de "
"vencimiento de la tarjeta de cortesía. Obtenga más información en el <a "
"href='https://mst.org/riders-guide/how-to-ride/courtesy-card/' "
"target=\"_blank\" rel=\"noopener noreferrer\">MST Riders Guide</a>."
"href='https://mst.org/riders-guide/how-to-ride/courtesy-card/' target="
"\"_blank\" rel=\"noopener noreferrer\">MST Riders Guide</a>."

msgid "Sign out of Login.gov"
msgstr "Cierre sesión de Login.gov"
Expand Down Expand Up @@ -423,55 +423,26 @@ msgid "A phone number with a phone plan associated with your name"
msgstr ""
"Un número de teléfono en el cual pueda recibir llamadas o mensajes de texto"

msgid "Access to your preferred VA related account"
msgstr "Acceso a su cuenta preferida relacionada con VA"

msgid ""
"You will need to sign into VA.gov in order to verify your identity and your "
"veteran status. VA.gov uses the following services:"
msgstr ""
"Deberá iniciar sesión en VA.gov para verificar su identidad y su estado de "
"veterano. VA.gov utiliza los siguientes servicios:"

msgid "Login.gov"
msgstr "Login.gov"

msgid "ID.me"
msgstr "ID.me"

msgid "DS Logon"
msgstr "DS Logon"

msgid "My HealtheVet"
msgstr "My HealtheVet"

msgid ""
"If you do not have an account with any of these services, you will need to "
"create one. We recommend using Login.gov."
msgstr ""
"Si no tiene una cuenta con ninguno de estos servicios, deberá crear una. "
"Recomendamos utilizar Login.gov. "

msgid "Go back"
msgstr "Volver"

msgid "Learn more about"
msgstr "Más información sobre"
msgid "Verify your identity with "
msgstr "Verifique su identidad con "

msgctxt "image alt text"
msgid "Login.gov"
msgstr "Login.gov"

msgid "Verify your identity with "
msgstr "Verifique su identidad con "

msgid ""
"We use Login.gov to verify your identity to make sure you are eligible for "
"the transit benefit you selected."
msgstr ""
"Utilizamos Login.gov para verificar tu identidad para asegurarnos de que "
"seas elegible para el beneficio de tránsito que seleccionaste."

msgid "Learn more about"
msgstr "Más información sobre"

msgid "MST Courtesy Card"
msgstr "Tarjeta de cortesía de MST"

Expand All @@ -496,14 +467,14 @@ msgid ""
"This option is for people who have served in the active military, naval, or "
"air service, and who were discharged or released therefrom under conditions "
"other than dishonorable. You will need to <a href=\"https://www.va.gov/"
"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" "
"rel=\"noopener noreferrer\">verify your identity through VA.gov</a>."
"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" rel="
"\"noopener noreferrer\">verify your identity through VA.gov</a>."
msgstr ""
"Esta opción es para personas que hayan prestado servicio militar, naval o "
"aéreo de manera activa, y quienes fueron dados de baja o liberados en "
"condiciones que no hayan sido deshonrosas. Necesitará <a href='https://www."
"va.gov/resources/verifying-your-identity-on-vagov/' target=\"_blank\" "
"rel=\"noopener noreferrer\">verificar su identidad a través de VA.gov</a>."
"va.gov/resources/verifying-your-identity-on-vagov/' target=\"_blank\" rel="
"\"noopener noreferrer\">verificar su identidad a través de VA.gov</a>."

#, python-format
msgid ""
Expand Down Expand Up @@ -558,9 +529,6 @@ msgstr "Descripción de beneficios para veteranos"
msgid "You selected a Veteran transit benefit."
msgstr "Ha seleccionado un beneficio de tránsito para veteranos."

msgid "Continue to VA.gov"
msgstr "Continuar con VA.gov"

msgid "You will need a few items to continue:"
msgstr "Necesitará algunos artículos para continuar:"

Expand Down