diff --git a/retirement_api/fixtures/retiredata.json b/retirement_api/fixtures/retiredata.json index 4a1eded..3111192 100644 --- a/retirement_api/fixtures/retiredata.json +++ b/retirement_api/fixtures/retiredata.json @@ -61,7 +61,7 @@ { "fields": { "note": "", - "instructions": "Create a my Social Security account 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 my Social Security account 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", @@ -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 IRA 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 IRA plan.", "title": "final_step_2_under" }, "model": "retirement_api.step", @@ -97,7 +97,7 @@ { "fields": { "note": "", - "instructions": "While you wait to claim your benefits, you can continue growing your savings by making catchup contributions to your existing accounts. You may also be able to open and contribute to an IRA.", + "instructions": "While you wait to claim your benefits, you can continue growing your savings by making catchup contributions to your existing accounts. You may also be able to open and contribute to an IRA.", "title": "final_step_2_equal" }, "model": "retirement_api.step", @@ -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. Learn the rules about withdrawing money 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. Learn the rules about withdrawing money from your retirement accounts.", "title": "final_step_2_over" }, "model": "retirement_api.step", @@ -258,7 +258,7 @@ }, { "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 Social Security's guide.", + "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 Social Security's guide.", "title": "file_and_suspend" }, "model": "retirement_api.tooltip", @@ -266,7 +266,7 @@ }, { "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 Social Security's guide.", + "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 Social Security's guide.", "title": "restricted_application" }, "model": "retirement_api.tooltip", diff --git a/retirement_api/locale/es/LC_MESSAGES/django.mo b/retirement_api/locale/es/LC_MESSAGES/django.mo index 396e581..58048d1 100644 Binary files a/retirement_api/locale/es/LC_MESSAGES/django.mo and b/retirement_api/locale/es/LC_MESSAGES/django.mo differ diff --git a/retirement_api/locale/es/LC_MESSAGES/django.po b/retirement_api/locale/es/LC_MESSAGES/django.po index 0cca70b..f3b52c8 100644 --- a/retirement_api/locale/es/LC_MESSAGES/django.po +++ b/retirement_api/locale/es/LC_MESSAGES/django.po @@ -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 my Social Security account to review your actual earnings history and expected benefits." -msgstr "Crear un mi cuenta de Seguro Social que revise su historial de ganancias reales y los beneficios esperados." +msgid "Create a my Social Security account to review your actual earnings history and expected benefits." +msgstr "Crear un mi cuenta de Seguro Social que revise su historial de ganancias reales y los beneficios esperados." #: msgid "Visit us again if your income, employment, or marital status changes.\n" @@ -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 Social Security's guide." -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 guía de la Seguridad Social." +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 Social Security's guide." +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 guía de la Seguridad Social." #: msgid "Age" @@ -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 my Social Security account 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 Calculador del Seguro Social 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 my Social Security account 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 Calculador del Seguro Social 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 IRA 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 cuenta IRA (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 IRA 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 cuenta IRA (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!" @@ -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 catchup contributions to your existing accounts. You may also be able to open and contribute to an IRA." -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 cuenta IRA (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 catchup contributions to your existing accounts. You may also be able to open and contribute to an IRA." +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 cuenta IRA (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. Learn the rules about withdrawing money 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 retirar dinero (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. Learn the rules about withdrawing money 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 retirar dinero (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! Working in your 60s also gives you more time to save on your own for retirement." @@ -870,4 +870,3 @@ msgstr "Planifique para su Jubilación: Antes de solicitar" #: msgid "About this tool" msgstr "Más sobre esta herramienta" - diff --git a/retirement_api/templates/claiming.html b/retirement_api/templates/claiming.html index 1e95507..b5b5efb 100644 --- a/retirement_api/templates/claiming.html +++ b/retirement_api/templates/claiming.html @@ -181,7 +181,11 @@

{% trans "About your early benefit claiming age:" %}<

{% 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." %}

-

{% trans "Where do these numbers come from?" %}

+

+ + {% trans "Where do these numbers come from?" %} + +

@@ -269,7 +273,7 @@

{% trans questions.sixties.answer_no_a_subhed|safe %}

{% trans questions.sixties.answer_no_b_subhed|safe %}

{% trans questions.sixties.answer_no_a|safe %}

-

+

{% trans questions.sixties.answer_unsure_a_subhed|safe %}

diff --git a/retirement_api/utils/ss_utilities.py b/retirement_api/utils/ss_utilities.py index 470e07f..a838916 100755 --- a/retirement_api/utils/ss_utilities.py +++ b/retirement_api/utils/ss_utilities.py @@ -11,13 +11,15 @@ if you are under 22 years of age. Please visit the \ Social Security Administration's \ advice page for students and younger workers.\ +target="_blank" rel="noopener noreferrer">advice page \ +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. \ Visite la página (en inglés) de la Administración \ +target="_blank" rel="noopener noreferrer">la página \ +(en inglés) de la Administración \ del Seguro Social para estudiantes y trabajadores jóvenes.\ """ TOO_OLD = """\ @@ -25,8 +27,9 @@ your birthdate, {0}, means you are older than 70 and may already be receiving \ benefits. To check your benefits based on your actual \ earnings record, contact the Social Security Administration or \ -open a \ -my Social Security account. +open a \ +my Social Security account.\ """ TOO_OLD_ES = """\ Lo sentimos. No podemos estimar sus beneficios ya que \ @@ -35,9 +38,10 @@ Verifique sus beneficios basados en su propio registro de ingresos \ del Seguro Social \ aquí o \ +target="_blank" rel="noopener noreferrer">aquí o \ comuníquese con la Administración del Seguro Social.\ +target="_blank" rel="noopener noreferrer">comuníquese \ +con la Administración del Seguro Social.\ """ AGE_ERROR_NOTES = {