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

Spanish copy + small copy fixes #1629

Merged
merged 23 commits into from
Aug 11, 2023
Merged

Spanish copy + small copy fixes #1629

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cc6bb56
feat(copy): add Spanish copy
machikoyasuda Aug 9, 2023
7bff521
fix: add back issues link
machikoyasuda Aug 9, 2023
cdbec01
fix(help): correct mst cc q/a on help
machikoyasuda Aug 9, 2023
0dfae40
fix(titles): change back Overview to Information
machikoyasuda Aug 9, 2023
0932209
fix(copy): add new Page TItles
machikoyasuda Aug 9, 2023
ec94d48
fix(enrollment): fix lp link misplaced
machikoyasuda Aug 9, 2023
abc79b3
fix(copy): switch around titles
machikoyasuda Aug 9, 2023
424161b
fix(copy): fix page titles for elig/start - use Overview
machikoyasuda Aug 9, 2023
937fc07
fix: update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 9, 2023
1362fdb
fix: Update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 9, 2023
d977889
fix: Update benefits/locale/en/LC_MESSAGES/django.po
machikoyasuda Aug 10, 2023
8e82450
fix: Update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 10, 2023
a0db4e7
fix: Update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 10, 2023
6ed89e7
fix: Update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 10, 2023
91b7081
fix: Update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 10, 2023
83eba05
fix: Update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 10, 2023
8a19a0e
fix: Update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 10, 2023
947a439
fix: Update benefits/locale/es/LC_MESSAGES/django.po
machikoyasuda Aug 10, 2023
8e3f04c
fix(copy): fix VeteranS everywhere
machikoyasuda Aug 10, 2023
2dfb7fe
fix(copy): : Agency card overview / Descripción de la tarjeta de agencia
machikoyasuda Aug 10, 2023
d33a410
fix(sp): don't title case any buttons in Spanish
machikoyasuda Aug 10, 2023
1335e2c
fix(copy): Courtesy card -> Agency card
machikoyasuda Aug 10, 2023
3843ff5
fix(copy): We couldn't connect your card
machikoyasuda Aug 10, 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
4 changes: 2 additions & 2 deletions benefits/core/migrations/0002_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def load_data(app, *args, **kwargs):
auth_provider=None,
selection_label_template="eligibility/includes/selection-label--mst-courtesy-card.html",
start_template="eligibility/start--mst-courtesy-card.html",
form_title=_("Confirm your Courtesy Card"),
form_title=_("Courtesy Card information"),
machikoyasuda marked this conversation as resolved.
Show resolved Hide resolved
form_headline=_("Let’s see if we can confirm your eligibility."),
form_blurb=_("Please input your Courtesy Card number and last name below to confirm your eligibility."),
form_sub_label=_("MST Courtesy Card number"),
Expand All @@ -186,7 +186,7 @@ def load_data(app, *args, **kwargs):
form_sub_pattern=r"\d{5}",
form_input_mode="numeric",
form_max_length=5,
form_name_label=_("last name (as it appears on Courtesy Card)"),
form_name_label=_("Last name (as it appears on Courtesy Card)"),
form_name_help_text=_("We use this to help confirm your Courtesy Card."),
form_name_placeholder="Garcia",
form_name_max_length=255,
Expand Down
2 changes: 1 addition & 1 deletion benefits/core/templates/core/agency-index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block title %}
{% translate "Introduction" %}
{% translate "Get started" %}
{% endblock title %}

{% block call-to-action %}
Expand Down
9 changes: 3 additions & 6 deletions benefits/core/templates/core/includes/help--mst.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{% load i18n %}

<h2 class="pt-8" id="mst-courtesy-card">{% translate "What is a Courtesy Card?" %}</h2>
<p class="pt-4">
<h2 class="h2-sm pt-4 pt-lg-8" id="mst-courtesy-card">{% translate "What is a Courtesy Card?" %}</h2>
<p class="pt-2 pt-lg-4">
{% blocktranslate trimmed %}
Courtesy Cards are issued by Monterey-Salinas Transit to riders who qualify for a number of reduced fare programs.
This website is a demonstration tool to support the Courtesy Card program. This benefit may need to be renewed in the
future based on the expiration date of the Courtesy Card. Learn more at the
<a href="https://mst.org/riders-guide/how-to-ride/courtesy-card/" target="_blank" rel="noopener noreferrer">MST Riders Guide</a>.
Monterey-Salinas Transit issues Courtesy 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 Courtesy Card. Learn more at the <a href="https://mst.org/riders-guide/how-to-ride/courtesy-card/" target="_blank" rel="noopener noreferrer">MST Riders Guide</a>.
{% endblocktranslate %}
</p>
2 changes: 1 addition & 1 deletion benefits/core/templates/core/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block title %}
{% translate "Choose Provider" %}
{% translate "Choose transit agency" %}
{% endblock title %}

{% block headline %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--mst-courtesy-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block page-title %}
{% translate "Courtesy Card information" %}
{% translate "Courtesy Card overview" %}
machikoyasuda marked this conversation as resolved.
Show resolved Hide resolved
{% endblock page-title %}

{% block headline %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--senior.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block page-title %}
{% translate "Older Adult benefit information" %}
{% translate "Older Adult benefit overview" %}
Copy link
Member

Choose a reason for hiding this comment

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

To match casing from the spreadsheet

Suggested change
{% translate "Older Adult benefit overview" %}
{% translate "Older adult benefit overview" %}

Copy link
Member Author

Choose a reason for hiding this comment

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

@indexing @srhhnry Question - Should Older Adult be capitalized in the title? It's capitalized on the form and headline:

image image

Copy link
Member

Choose a reason for hiding this comment

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

@srhhnry Stylistically, do we consider all benefit types proper names? I think we do. If so, I would capitalize both words (Older Adult). If not, I would use sentence case (Older adult) and other references in-line would be "older adult."

Once you've confirmed, I will review the spreadsheet to ensure consistency. (cc// @angela-tran )

Copy link
Member Author

Choose a reason for hiding this comment

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

My opinion:

  • Older Adult should be title-cased in English (b/c we already introduce this precedent in the app) and sentence-cased in Spanish (nothing is ever title-cased or capitalized in Spanish unless it starts the sentence/phrase). We're only using Older Adult because that is the politically-correct way to say Senior.

  • Agency card can be sentence-cased in English.

Copy link
Member

Choose a reason for hiding this comment

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

My opinion is the same as Machiko's ^

{% endblock page-title %}

{% block headline %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/start--veteran.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block page-title %}
{% translate "Veteran benefit information" %}
{% translate "Veteran benefit overview" %}
{% endblock page-title %}

{% block headline %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/eligibility/templates/eligibility/unverified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block page-title %}
{% translate "Eligibility Error" %}
{% translate "Unable to confirm eligibility" %}
{% endblock page-title %}

{% block main-content %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<div class="media-body--details">
<p>
{% translate "You will be directed to our payment partner, " %}
{% translate "We don’t store your information, and you won’t be charged." %}
{% include "core/includes/modal-trigger.html" with modal="modal--littlepay" text="Littlepay" period=True %}
{% translate "We don’t store your information, and you won’t be charged." %}
</p>
<p>{% translate "Please use a debit or credit card by Visa or Mastercard." %}</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion benefits/enrollment/templates/enrollment/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block page-title %}
{% translate "Connect your card" %}
{% translate "Eligibility confirmation" %}
{% endblock page-title %}

{% block nav-buttons %}
Expand Down
2 changes: 1 addition & 1 deletion benefits/enrollment/templates/enrollment/retry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block page-title %}
{% translate "We couldn’t connect your bank card" %}
{% translate "Unable to register card" %}
{% endblock page-title %}

{% block main-content %}
Expand Down
43 changes: 24 additions & 19 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,14 +6,14 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
"POT-Creation-Date: 2023-08-08 22:20+0000\n"
"POT-Creation-Date: 2023-08-09 21:16+0000\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgid "Confirm your Courtesy Card"
msgid "Courtesy Card information"
msgstr ""

msgid "Let’s see if we can confirm your eligibility."
Expand All @@ -30,13 +30,13 @@ msgstr ""
msgid "This is a 5-digit number on the front and back of your card."
msgstr ""

msgid "last name (as it appears on Courtesy Card)"
msgid "Last name (as it appears on Courtesy Card)"
msgstr ""

msgid "We use this to help confirm your Courtesy Card."
msgstr ""

msgid "Introduction"
msgid "Get started"
msgstr ""

msgid "Get Started"
Expand Down Expand Up @@ -210,11 +210,10 @@ msgid "What is a Courtesy Card?"
msgstr ""

msgid ""
"Courtesy Cards are issued by Monterey-Salinas Transit to riders who qualify "
"for a number of reduced fare programs. This website is a demonstration tool "
"to support the Courtesy Card program. This benefit may need to be renewed in "
"the future based on the expiration date of the Courtesy Card. Learn more at "
"the <a href=\"https://mst.org/riders-guide/how-to-ride/courtesy-card/\" "
"Monterey-Salinas Transit issues Courtesy 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 Courtesy Card. Learn more "
"at the <a href=\"https://mst.org/riders-guide/how-to-ride/courtesy-card/\" "
"target=\"_blank\" rel=\"noopener noreferrer\">MST Riders Guide</a>."
msgstr ""

Expand Down Expand Up @@ -250,7 +249,7 @@ msgstr ""
msgid "Get a reduced fare on SacRT light rail when you tap to ride"
msgstr ""

msgid "Choose Provider"
msgid "Choose transit agency"
msgstr ""

msgid "Get a reduced fare on public transportation when you tap to ride"
Expand Down Expand Up @@ -407,8 +406,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 All @@ -429,7 +428,7 @@ msgstr ""
msgid "Choose the transit benefit you would like to enroll in"
msgstr ""

msgid "Courtesy Card information"
msgid "Courtesy Card overview"
msgstr ""

msgid "You selected a Courtesy Card transit benefit."
Expand All @@ -438,7 +437,7 @@ msgstr ""
msgid "Continue"
msgstr ""

msgid "Older Adult benefit information"
msgid "Older Adult benefit overview"
machikoyasuda marked this conversation as resolved.
Show resolved Hide resolved
msgstr ""

msgid "You selected an Older Adult transit benefit."
Expand All @@ -447,7 +446,7 @@ msgstr ""
msgid "Get started with"
msgstr ""

msgid "Veteran benefit information"
msgid "Veteran benefit overview"
msgstr ""

msgid "You selected a Veteran transit benefit."
Expand All @@ -459,7 +458,7 @@ msgstr ""
msgid "You will need a few items to continue:"
msgstr ""

msgid "Eligibility Error"
msgid "Unable to confirm eligibility"
msgstr ""

msgctxt "image alt text"
Expand Down Expand Up @@ -492,7 +491,7 @@ msgstr ""
msgid "Learn more about Littlepay"
msgstr ""

msgid "Connect your card"
msgid "Eligibility confirmation"
msgstr ""

msgid "Your eligibility is confirmed! You’re nearly there."
Expand All @@ -504,13 +503,16 @@ msgstr ""
msgid "Connect your Card"
msgstr ""

msgid "We couldn’t connect your bank card"
msgid "Unable to register card"
msgstr ""

msgctxt "image alt text"
msgid "Bank card icon with contactless symbol and question mark"
msgstr ""

msgid "We couldn’t connect your bank card"
machikoyasuda marked this conversation as resolved.
Show resolved Hide resolved
msgstr ""

msgid "You can try again or reach out to your transit provider for assistance."
msgstr ""

Expand Down Expand Up @@ -543,7 +545,7 @@ msgstr ""
msgid "If you are on a public or shared computer, don’t forget to sign out of "
msgstr ""

msgid "Invalid state"
msgid "Start over"
msgstr ""

msgid "You may have reached this page on accident."
Expand All @@ -554,6 +556,9 @@ msgid ""
"will be directed to the beginning of the enrollment process."
msgstr ""

msgid "Service is down."
msgstr ""

msgid "Sorry! Service for this site is down."
msgstr ""

Expand Down
Loading