From 774be894abc5ca8458ff0e3345ae1b6e25f0fee3 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 15 Aug 2023 21:54:12 +0000 Subject: [PATCH 1/4] feat(icons): remove alt tag from decorative icons --- .../core/templates/core/includes/icon.html | 6 +---- benefits/core/templates/core/logged-out.html | 5 +--- .../media-item--bankcardcheck--start.html | 3 +-- .../includes/media-item--idcardcheck.html | 3 +-- .../includes/modal--contactless.html | 6 +---- .../templates/eligibility/unverified.html | 3 +-- .../media-item--bankcardcheck--index.html | 3 +-- .../templates/enrollment/retry.html | 3 +-- benefits/locale/en/LC_MESSAGES/django.po | 24 ----------------- benefits/locale/es/LC_MESSAGES/django.po | 26 ------------------- benefits/templates/error.html | 3 +-- 11 files changed, 9 insertions(+), 76 deletions(-) diff --git a/benefits/core/templates/core/includes/icon.html b/benefits/core/templates/core/includes/icon.html index 705ebda0c..ee05ec1b0 100644 --- a/benefits/core/templates/core/includes/icon.html +++ b/benefits/core/templates/core/includes/icon.html @@ -3,11 +3,7 @@

Missing name argument

-{% elif not alt %} -

- Missing alt argument -

{% else %} {% load static %} - {{ alt }} + {% endif %} diff --git a/benefits/core/templates/core/logged-out.html b/benefits/core/templates/core/logged-out.html index c6c5b3784..2c3f1f1f6 100644 --- a/benefits/core/templates/core/logged-out.html +++ b/benefits/core/templates/core/logged-out.html @@ -10,10 +10,7 @@

- - {% translate "Bus icon with smiley face" context "image alt text" as alt_i18n %} - {% include "core/includes/icon.html" with name="happybus" alt=alt_i18n %} - + {% include "core/includes/icon.html" with name="happybus" %} {% translate "You have successfully logged out. Thank you for using Cal-ITP Benefits!" %}

diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html b/benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html index dbdc19cd0..99e20c191 100644 --- a/benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html +++ b/benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html @@ -2,8 +2,7 @@ {% load i18n %} {% block icon %} - {% translate "Bank card icon with contactless symbol and checkmark" context "image alt text" as icon_alt %} - {% include "core/includes/icon.html" with name="bankcardcheck" alt=icon_alt %} + {% include "core/includes/icon.html" with name="bankcardcheck" %} {% endblock icon %} {% block heading %} diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck.html b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck.html index fb51240a7..b7c7a61bf 100644 --- a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck.html +++ b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck.html @@ -3,6 +3,5 @@ {% load i18n %} {% block icon %} - {% translate "Identification card icon with checkmark" context "image alt text" as icon_alt %} - {% include "core/includes/icon.html" with name="idcardcheck" alt=icon_alt %} + {% include "core/includes/icon.html" with name="idcardcheck" %} {% endblock icon %} diff --git a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html index 0bf8f0337..36ea937be 100644 --- a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html +++ b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html @@ -13,11 +13,7 @@

{% translate "Learn more about c

{% translate "The contactless symbol is four curved lines, like this:" %}

- {% translate +

{% translate "Your card must include a Visa or Mastercard logo." %}

diff --git a/benefits/eligibility/templates/eligibility/unverified.html b/benefits/eligibility/templates/eligibility/unverified.html index 884e719c5..1b7ce999a 100644 --- a/benefits/eligibility/templates/eligibility/unverified.html +++ b/benefits/eligibility/templates/eligibility/unverified.html @@ -13,8 +13,7 @@

- {% translate "Identification card icon with question mark" context "image alt text" as alt_i18n %} - {% include "core/includes/icon.html" with name="idcardquestion" alt=alt_i18n %} + {% include "core/includes/icon.html" with name="idcardquestion" %} {% translate "Your eligibility could not be verified." %}

diff --git a/benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html b/benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html index b76452d44..a93b2a156 100644 --- a/benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html +++ b/benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html @@ -2,8 +2,7 @@ {% load i18n %} {% block icon %} - {% translate "Bank card icon with contactless symbol and checkmark" context "image alt text" as icon_alt %} - {% include "core/includes/icon.html" with name="bankcardcheck" alt=icon_alt %} + {% include "core/includes/icon.html" with name="bankcardcheck" %} {% endblock icon %} {% block heading %} diff --git a/benefits/enrollment/templates/enrollment/retry.html b/benefits/enrollment/templates/enrollment/retry.html index 49d7dc25c..7cd0ea9c1 100644 --- a/benefits/enrollment/templates/enrollment/retry.html +++ b/benefits/enrollment/templates/enrollment/retry.html @@ -12,8 +12,7 @@

- {% translate "Bank card icon with contactless symbol and question mark" context "image alt text" as alt_i18n %} - {% include "core/includes/icon.html" with name="bankcardquestion" alt=alt_i18n %} + {% include "core/includes/icon.html" with name="bankcardquestion" %} {% translate "We couldn’t connect your card" %}

diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po index 9d350affb..2614f332b 100644 --- a/benefits/locale/en/LC_MESSAGES/django.po +++ b/benefits/locale/en/LC_MESSAGES/django.po @@ -270,10 +270,6 @@ msgstr "" msgid "Logged out" msgstr "" -msgctxt "image alt text" -msgid "Bus icon with smiley face" -msgstr "" - msgid "You have successfully logged out. Thank you for using Cal-ITP Benefits!" msgstr "" @@ -295,10 +291,6 @@ msgstr "" msgid "This field is required." msgstr "" -msgctxt "image alt text" -msgid "Bank card icon with contactless symbol and checkmark" -msgstr "" - msgid "Your contactless card details" msgstr "" @@ -365,10 +357,6 @@ msgid "" "create one. We recommend using Login.gov." msgstr "" -msgctxt "image alt text" -msgid "Identification card icon with checkmark" -msgstr "" - msgid "Go back" msgstr "" @@ -469,10 +457,6 @@ msgstr "" msgid "Unable to confirm eligibility" msgstr "" -msgctxt "image alt text" -msgid "Identification card icon with question mark" -msgstr "" - msgid "Your eligibility could not be verified." msgstr "" @@ -514,10 +498,6 @@ msgstr "" 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 card" msgstr "" @@ -594,7 +574,3 @@ msgid "" "The page you are looking for might be somewhere else or may not exist " "anymore." msgstr "" - -msgctxt "image alt text" -msgid "Bus icon with flat tire" -msgstr "" diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po index f88caad08..a319774bf 100644 --- a/benefits/locale/es/LC_MESSAGES/django.po +++ b/benefits/locale/es/LC_MESSAGES/django.po @@ -353,10 +353,6 @@ msgstr "" msgid "Logged out" msgstr "Cierre sesión" -msgctxt "image alt text" -msgid "Bus icon with smiley face" -msgstr "Icono de autobús con cara sonriente" - msgid "You have successfully logged out. Thank you for using Cal-ITP Benefits!" msgstr "Ha cerrado sesión correctamente. ¡Gracias por usar Cal-ITP Benefits!" @@ -378,11 +374,6 @@ msgstr "Verifique su entrada. El formato parece incorrecto." msgid "This field is required." msgstr "Este campo es requerido." -msgctxt "image alt text" -msgid "Bank card icon with contactless symbol and checkmark" -msgstr "" -"Icono de tarjeta bancaria con símbolo sin contacto y marca de verificación" - msgid "Your contactless card details" msgstr "Los datos de su tarjeta sin contacto" @@ -461,10 +452,6 @@ msgstr "" "Si no tiene una cuenta con ninguno de estos servicios, deberá crear una. " "Recomendamos utilizar Login.gov. " -msgctxt "image alt text" -msgid "Identification card icon with checkmark" -msgstr "Icono de tarjeta de identificación con marca de verificación" - msgid "Go back" msgstr "Volver" @@ -580,10 +567,6 @@ msgstr "Necesitará algunos artículos para continuar:" msgid "Unable to confirm eligibility" msgstr "No se pudo confirmar la elegibilidad" -msgctxt "image alt text" -msgid "Identification card icon with question mark" -msgstr "Icono de tarjeta de identificación con signo de interrogación" - msgid "Your eligibility could not be verified." msgstr "No se pudo verificar su elegibilidad." @@ -627,11 +610,6 @@ msgstr "Conecta tu tarjeta" msgid "Unable to register card" msgstr "No se pudo registrar la tarjeta" -msgctxt "image alt text" -msgid "Bank card icon with contactless symbol and question mark" -msgstr "" -"Icono de tarjeta bancaria con símbolo sin contacto y signo de interrogación" - msgid "We couldn’t connect your card" msgstr "No pudimos conectar su tarjeta" @@ -726,7 +704,3 @@ msgid "" msgstr "" "La página que está buscando puede estar en otro lugar o puede que ya no " "exista." - -msgctxt "image alt text" -msgid "Bus icon with flat tire" -msgstr "Icono de autobus con llanta ponchada" diff --git a/benefits/templates/error.html b/benefits/templates/error.html index e9ee65eb2..7ef2a42a1 100644 --- a/benefits/templates/error.html +++ b/benefits/templates/error.html @@ -10,8 +10,7 @@

- {% translate "Bus icon with flat tire" context "image alt text" as alt_i18n %} - {% include "core/includes/icon.html" with name="sadbus" alt=alt_i18n %} + {% include "core/includes/icon.html" with name="sadbus" %} {% block headline %} {% endblock headline %} From cf9904015598670476a7e2c5eb7e26a9a010e5b0 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 15 Aug 2023 00:21:06 +0000 Subject: [PATCH 2/4] fix(icon): remove name validation --- benefits/core/templates/core/includes/icon.html | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/benefits/core/templates/core/includes/icon.html b/benefits/core/templates/core/includes/icon.html index ee05ec1b0..81793717b 100644 --- a/benefits/core/templates/core/includes/icon.html +++ b/benefits/core/templates/core/includes/icon.html @@ -1,9 +1,2 @@ - -{% if not name %} -

- Missing name argument -

-{% else %} - {% load static %} - -{% endif %} +{% load static %} + From dca4eb48de136e15e09001cdf77cb8e8e29765cf Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 15 Aug 2023 21:48:48 +0000 Subject: [PATCH 3/4] fix(contactless): add back alt for contactless --- .../templates/eligibility/includes/modal--contactless.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html index 36ea937be..9220c1d7e 100644 --- a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html +++ b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html @@ -13,7 +13,7 @@

{% translate "Learn more about c

{% translate "The contactless symbol is four curved lines, like this:" %}

- + {% translate

{% translate "Your card must include a Visa or Mastercard logo." %}

From daca2744e0ddb5615ee641d1a557a92d87c85430 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 15 Aug 2023 21:49:20 +0000 Subject: [PATCH 4/4] chore: format --- .../templates/eligibility/includes/modal--contactless.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html index 9220c1d7e..0bf8f0337 100644 --- a/benefits/eligibility/templates/eligibility/includes/modal--contactless.html +++ b/benefits/eligibility/templates/eligibility/includes/modal--contactless.html @@ -13,7 +13,11 @@

{% translate "Learn more about c

{% translate "The contactless symbol is four curved lines, like this:" %}

- {% translate + {% translate

{% translate "Your card must include a Visa or Mastercard logo." %}