Skip to content
This repository has been archived by the owner on Jun 4, 2021. It is now read-only.

Commit

Permalink
Merge pull request #218 from cfpb/target_blank
Browse files Browse the repository at this point in the history
Add rel attribute to links with target _blank
  • Loading branch information
anselmbradford authored May 8, 2018
2 parents 39db1a8 + 4737df0 commit a429fe7
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 27 deletions.
12 changes: 6 additions & 6 deletions retirement_api/fixtures/retiredata.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
{
"fields": {
"note": "",
"instructions": "Create a <a href=\"http://www.ssa.gov/myaccount/\" target=\"_blank\"><em>my</em> Social Security account</a> to review your expected benefits based on your actual Social Security record. You will also find additional information about your eligibility and other benefits including disability and survivor benefits.",
"instructions": "Create a <a href=\"http://www.ssa.gov/myaccount/\" target=\"_blank\" rel=\"noopener noreferrer\"><em>my</em> Social Security account</a> to review your expected benefits based on your actual Social Security record. You will also find additional information about your eligibility and other benefits including disability and survivor benefits.",
"title": "final_step_1"
},
"model": "retirement_api.step",
Expand All @@ -70,7 +70,7 @@
{
"fields": {
"note": "",
"instructions": "Your retirement income outside of Social Security will help you cover your expenses. You can increase your contributions to your retirement savings plans, or open and contribute to an <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\">IRA</a> plan.",
"instructions": "Your retirement income outside of Social Security will help you cover your expenses. You can increase your contributions to your retirement savings plans, or open and contribute to an <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\" rel=\"noopener noreferrer\">IRA</a> plan.",
"title": "final_step_2_under"
},
"model": "retirement_api.step",
Expand All @@ -97,7 +97,7 @@
{
"fields": {
"note": "",
"instructions": "While you wait to claim your benefits, you can continue growing your savings by making <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-catch-up-contributions\" target=\"_blank\">catchup contributions</a> to your existing accounts. You may also be able to open and contribute to an <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\">IRA</a>.",
"instructions": "While you wait to claim your benefits, you can continue growing your savings by making <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-catch-up-contributions\" target=\"_blank\" rel=\"noopener noreferrer\">catchup contributions</a> to your existing accounts. You may also be able to open and contribute to an <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\" rel=\"noopener noreferrer\">IRA</a>.",
"title": "final_step_2_equal"
},
"model": "retirement_api.step",
Expand All @@ -106,7 +106,7 @@
{
"fields": {
"note": "",
"instructions": "While you let your benefits continue to grow, you can keep working if you want. You can also stop working and use a portion of your savings to cover your needs. <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-required-minimum-distributions-rmds\" target=\"_blank\">Learn the rules about withdrawing money</a> from your retirement accounts.",
"instructions": "While you let your benefits continue to grow, you can keep working if you want. You can also stop working and use a portion of your savings to cover your needs. <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-required-minimum-distributions-rmds\" target=\"_blank\" rel=\"noopener noreferrer\">Learn the rules about withdrawing money</a> from your retirement accounts.",
"title": "final_step_2_over"
},
"model": "retirement_api.step",
Expand Down Expand Up @@ -258,15 +258,15 @@
},
{
"fields": {
"text": "If you and your spouse are full retirement age, you can apply for benefits but have the payments suspended. This allows your spouse to file for spousal benefits without affecting your personal benefits. For details, see <a href=\"http://www.socialsecurity.gov/planners/retire/suspend.html\" target=\"_blank\">Social Security's guide</a>.",
"text": "If you and your spouse are full retirement age, you can apply for benefits but have the payments suspended. This allows your spouse to file for spousal benefits without affecting your personal benefits. For details, see <a href=\"http://www.socialsecurity.gov/planners/retire/suspend.html\" target=\"_blank\" rel=\"noopener noreferrer\">Social Security's guide</a>.",
"title": "file_and_suspend"
},
"model": "retirement_api.tooltip",
"pk": 8
},
{
"fields": {
"text": "If both spouses are full retirement age, you can apply for spousal benefits if you haven't filed before and if your spouse has already filed (regardless of your spouse's suspension status). For details, see <a href=\"\" target=\"_blank\">Social Security's guide</a>.",
"text": "If both spouses are full retirement age, you can apply for spousal benefits if you haven't filed before and if your spouse has already filed (regardless of your spouse's suspension status). For details, see <a href=\"\" target=\"_blank\" rel=\"noopener noreferrer\">Social Security's guide</a>.",
"title": "restricted_application"
},
"model": "retirement_api.tooltip",
Expand Down
Binary file modified retirement_api/locale/es/LC_MESSAGES/django.mo
Binary file not shown.
25 changes: 12 additions & 13 deletions retirement_api/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ msgid "(This will not affect your Social Security account or begin an applicatio
msgstr "(Su selección no afectará sus beneficios, ni tampoco iniciará una solicitud para beneficios)."

#:
msgid "Create a <a href=\"http://www.ssa.gov/myaccount/\" target=\"_blank\">my Social Security account</a> to review your actual earnings history and expected benefits."
msgstr "Crear un <a href=\"http://www.ssa.gov/myaccount/\" target=\"_blank\">mi cuenta de Seguro Social</a> que revise su historial de ganancias reales y los beneficios esperados."
msgid "Create a <a href=\"http://www.ssa.gov/myaccount/\" target=\"_blank\" rel=\"noopener noreferrer\">my Social Security account</a> to review your actual earnings history and expected benefits."
msgstr "Crear un <a href=\"http://www.ssa.gov/myaccount/\" target=\"_blank\" rel=\"noopener noreferrer\">mi cuenta de Seguro Social</a> que revise su historial de ganancias reales y los beneficios esperados."

#:
msgid "Visit us again if your income, employment, or marital status changes.\n"
Expand Down Expand Up @@ -327,8 +327,8 @@ msgid "Age 66 to 67, depending on your birthdate"
msgstr "Edad 66 a 67, dependiendo de su fecha de nacimiento"

#:
msgid "If you and your spouse are full retirement age, you can apply for benefits but have the payments suspended. This allows your spouse to file for spousal benefits without affecting your personal benefits. For details, see <a href=\"http://www.socialsecurity.gov/planners/retire/suspend.html\" target=\"_blank\">Social Security's guide</a>."
msgstr "Si usted y su cónyuge son plena edad de jubilación, usted puede solicitar beneficios pero han suspendido los pagos. Esto permite que su cónyuge para solicitar beneficios cónyuge sin afectar sus beneficios personales. Para obtener más información, consulte <a href=\"http://www.socialsecurity.gov/planners/retire/suspend.html\" target=\"_blank\">a guía de la Seguridad Social.</a>"
msgid "If you and your spouse are full retirement age, you can apply for benefits but have the payments suspended. This allows your spouse to file for spousal benefits without affecting your personal benefits. For details, see <a href=\"http://www.socialsecurity.gov/planners/retire/suspend.html\" target=\"_blank\" rel=\"noopener noreferrer\">Social Security's guide</a>."
msgstr "Si usted y su cónyuge son plena edad de jubilación, usted puede solicitar beneficios pero han suspendido los pagos. Esto permite que su cónyuge para solicitar beneficios cónyuge sin afectar sus beneficios personales. Para obtener más información, consulte <a href=\"http://www.socialsecurity.gov/planners/retire/suspend.html\" target=\"_blank\" rel=\"noopener noreferrer\">a guía de la Seguridad Social.</a>"

#:
msgid "Age"
Expand Down Expand Up @@ -483,12 +483,12 @@ msgid "At this age you will receive less than your full benefit amount. Here are
msgstr "Por lo tanto la cantidad de sus beneficios será reducida. Estos son pasos que le ayudarán en los próximos años:"

#:
msgid "Create a <a href=\"http://www.ssa.gov/myaccount/\" target=\"_blank\"><em>my</em> Social Security account</a> to review your expected benefits based on your actual Social Security record. You will also find additional information about your eligibility and other benefits including disability and survivor benefits."
msgstr "Visite el <a href=\"http://www.ssa.gov/espanol/jubilacion2/calculadora.html\" target=\"_blank\">Calculador del Seguro Social</a> para ver la cantidad aproximada de sus beneficios basados en su propio registro de ganancias del Seguro Social. También encontrará información adicional sobre otros beneficios, incluyendo los beneficios por discapacidad y para sobrevivientes."
msgid "Create a <a href=\"http://www.ssa.gov/myaccount/\" target=\"_blank\" rel=\"noopener noreferrer\"><em>my</em> Social Security account</a> to review your expected benefits based on your actual Social Security record. You will also find additional information about your eligibility and other benefits including disability and survivor benefits."
msgstr "Visite el <a href=\"http://www.ssa.gov/espanol/jubilacion2/calculadora.html\" target=\"_blank\" rel=\"noopener noreferrer\">Calculador del Seguro Social</a> para ver la cantidad aproximada de sus beneficios basados en su propio registro de ganancias del Seguro Social. También encontrará información adicional sobre otros beneficios, incluyendo los beneficios por discapacidad y para sobrevivientes."

#:
msgid "Your retirement income outside of Social Security will help you cover your expenses. You can increase your contributions to your retirement savings plans, or open and contribute to an <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\">IRA</a> plan."
msgstr "Sus ahorros le ayudarán a cubrir sus gastos durante su jubilación. Usted puede aumentar sus contribuciones a sus planes de jubilación, o abrir una <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\">cuenta IRA</a> (en inglés) y hacer contribuciones a estas cuentas."
msgid "Your retirement income outside of Social Security will help you cover your expenses. You can increase your contributions to your retirement savings plans, or open and contribute to an <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\" rel=\"noopener noreferrer\">IRA</a> plan."
msgstr "Sus ahorros le ayudarán a cubrir sus gastos durante su jubilación. Usted puede aumentar sus contribuciones a sus planes de jubilación, o abrir una <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\" rel=\"noopener noreferrer\">cuenta IRA</a> (en inglés) y hacer contribuciones a estas cuentas."

#:
msgid "If your income, employment, or marital status changes, you may need to reconsider your claiming age. Visit us again!"
Expand All @@ -499,16 +499,16 @@ msgid "which is your Social Security full retirement claiming age."
msgstr " años, que es su plena edad de jubilación."

#:
msgid "While you wait to claim your benefits, you can continue growing your savings by making <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-catch-up-contributions\" target=\"_blank\">catchup contributions</a> to your existing accounts. You may also be able to open and contribute to an <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\">IRA</a>."
msgstr "Puede seguir aumentando sus ahorros y hacer contribuciones adicionales a las cuentas que ya tiene mientras espera para solicitar sus beneficios. También podría abrir una <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\">cuenta IRA</a> (en inglés) y hacer contribuciones a esta cuenta."
msgid "While you wait to claim your benefits, you can continue growing your savings by making <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-catch-up-contributions\" target=\"_blank\" rel=\"noopener noreferrer\">catchup contributions</a> to your existing accounts. You may also be able to open and contribute to an <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\" rel=\"noopener noreferrer\">IRA</a>."
msgstr "Puede seguir aumentando sus ahorros y hacer contribuciones adicionales a las cuentas que ya tiene mientras espera para solicitar sus beneficios. También podría abrir una <a href=\"https://www.irs.gov/retirement-plans/individuals-retirement-arrangements-getting-started\" target=\"_blank\" rel=\"noopener noreferrer\">cuenta IRA</a> (en inglés) y hacer contribuciones a esta cuenta."

#:
msgid ", which is later than your Social Security full retirement claiming age."
msgstr ", que es la edad máxima para reclamar sus beneficios de Seguro Social."

#:
msgid "While you let your benefits continue to grow, you can keep working if you want. You can also stop working and use a portion of your savings to cover your needs. <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-required-minimum-distributions-rmds\" target=\"_blank\">Learn the rules about withdrawing money</a> from your retirement accounts."
msgstr "Si lo desea, usted puede seguir trabajando mientras sus beneficios siguen aumentando. También puede dejar de trabajar y utilizar una parte de sus ahorros para cubrir sus necesidades económicas. Infórmese mejor sobre las normas para <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-required-minimum-distributions-rmds\" target=\"_blank\">retirar dinero</a> (en inglés) de sus cuentas para la jubilación."
msgid "While you let your benefits continue to grow, you can keep working if you want. You can also stop working and use a portion of your savings to cover your needs. <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-required-minimum-distributions-rmds\" target=\"_blank\" rel=\"noopener noreferrer\">Learn the rules about withdrawing money</a> from your retirement accounts."
msgstr "Si lo desea, usted puede seguir trabajando mientras sus beneficios siguen aumentando. También puede dejar de trabajar y utilizar una parte de sus ahorros para cubrir sus necesidades económicas. Infórmese mejor sobre las normas para <a href=\"https://www.irs.gov/retirement-plans/plan-participant-employee/retirement-topics-required-minimum-distributions-rmds\" target=\"_blank\" rel=\"noopener noreferrer\">retirar dinero</a> (en inglés) de sus cuentas para la jubilación."

#:
msgid "Working in your 60s may increase your monthly benefit in a few ways. Because your benefits are based on your highest 35 years of earnings, each year of work can add higher earnings to your record by replacing years with low earnings, such as those when you were a student, were unemployed, or took time off. When you work and wait to claim until age 70, you can increase your monthly benefit by more than 75 percent!<span data-tooltip-target=\"claim_early_and_work\" class=\"cf-icon cf-icon-help-round\"></span> Working in your 60s also gives you more time to save on your own for retirement."
Expand Down Expand Up @@ -870,4 +870,3 @@ msgstr "Planifique para su Jubilación: Antes de solicitar"
#:
msgid "About this tool"
msgstr "Más sobre esta herramienta"

8 changes: 6 additions & 2 deletions retirement_api/templates/claiming.html
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,11 @@ <h3 class="retirement-age">{% trans "About your early benefit claiming age:" %}<
<p>{% trans "Remember, claiming age here refers only to your Social Security retirement benefit, and not when you decide to stop working or apply for Medicare." %}</p>
</div>

<p class="learn-how"><a href="{% trans "about" %}" target="_blank">{% trans "Where do these numbers come from?" %}</a></p>
<p class="learn-how">
<a href="{% trans "about" %}" target="_blank" rel="noopener noreferrer">
{% trans "Where do these numbers come from?" %}
</a>
</p>

</div>
<div class="content-l_col content-l_col-2-3 canvas-container">
Expand Down Expand Up @@ -269,7 +273,7 @@ <h4>{% trans questions.sixties.answer_no_a_subhed|safe %}</h4>
<div class="lifestyle-response" data-responds-to="no-over50">
<h4>{% trans questions.sixties.answer_no_b_subhed|safe %}</h4>
<p>{% trans questions.sixties.answer_no_a|safe %}</p>
<p><a href="https://www.socialsecurity.gov/planners/retire/stopwork.html" class="external-link" target="_blank"></a></p>
<p><a href="https://www.socialsecurity.gov/planners/retire/stopwork.html" class="external-link" target="_blank" rel="noopener noreferrer"></a></p>
</div>
<div class="lifestyle-response" data-responds-to="notsure-under50">
<h4>{% trans questions.sixties.answer_unsure_a_subhed|safe %}</h4>
Expand Down
16 changes: 10 additions & 6 deletions retirement_api/utils/ss_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,25 @@
if you are under 22 years of age.</span> Please visit the \
Social Security Administration's \
<a href="http://www.ssa.gov/people/youngpeople/" \
target="blank">advice page</a> for students and younger workers.\
target="_blank" rel="noopener noreferrer">advice page</a> \
for students and younger workers.\
"""
TOO_YOUNG_ES = """\
Lo sentimos. No podemos estimar sus beneficios si usted \
es menor de 22 años de edad.</span> \
Visite <a href="http://www.ssa.gov/people/youngpeople/" \
target="_blank">la página</a> (en inglés) de la Administración \
target="_blank" rel="noopener noreferrer">la página</a> \
(en inglés) de la Administración \
del Seguro Social para estudiantes y trabajadores jóvenes.\
"""
TOO_OLD = """\
<span class="h4">Sorry, our tool cannot provide an estimate because \
your birthdate, {0}, means you are older than 70 and may already be receiving \
benefits.</span> To check your benefits based on your actual \
earnings record, contact the Social Security Administration or \
open a <a href="http://www.socialsecurity.gov/myaccount/" target="_blank">\
<em>my</em> Social Security</a> account.
open a <a href="http://www.socialsecurity.gov/myaccount/" \
target="_blank" rel="noopener noreferrer">\
<em>my</em> Social Security</a> account.\
"""
TOO_OLD_ES = """\
<span class="h4">Lo sentimos. No podemos estimar sus beneficios ya que \
Expand All @@ -35,9 +38,10 @@
Verifique sus beneficios basados en su propio registro de ingresos \
del Seguro Social \
<a href="http://www.ssa.gov/espanol/jubilacion2/calculadora.html" \
target="_blank">aquí</a> o \
target="_blank" rel="noopener noreferrer">aquí</a> o \
<a href="http://www.socialsecurity.gov/espanol/agencia/contacto/" \
target="_blank">comuníquese</a> con la Administración del Seguro Social.\
target="_blank" rel="noopener noreferrer">comuníquese</a> \
con la Administración del Seguro Social.\
"""

AGE_ERROR_NOTES = {
Expand Down

0 comments on commit a429fe7

Please sign in to comment.