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 #246 from cfpb/content-updates
Browse files Browse the repository at this point in the history 
Update English content
  • Loading branch information
@niqjohnson
niqjohnson authored Sep 12, 2019
2 parents a9245e4 + 3a337ed commit 4aa8a11
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 140 deletions.
114 changes: 41 additions & 73 deletions retirement_api/fixtures/retiredata.json
View file

Large diffs are not rendered by default.

Binary file modified retirement_api/locale/es/LC_MESSAGES/django.mo
View file
Binary file not shown.
74 changes: 37 additions & 37 deletions retirement_api/locale/es/LC_MESSAGES/django.po
View file

Large diffs are not rendered by default.

Binary file added retirement_api/static/retirement/images/step_check.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions retirement_api/templates/retirement_api/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,17 @@
{% endblock %}

{% block page_meta %}
{% if es %}
<link rel="canonical" href="https://www.consumerfinance.gov/consumer-tools/retirement/before-you-claim/about/es/">
{% else %}
<link rel="canonical" href="https://www.consumerfinance.gov/consumer-tools/retirement/before-you-claim/about/">
{% endif %}
<meta property="og:title" content="{{ TITLE }} &gt; Consumer Financial Protection Bureau"/>
<meta property="og:url" content="{{ URL }}"/>

<meta name="description" content="The age you claim Social Security affects your lifetime income. Our Planning for Retirement tool helps you think through this decision."/>
<meta name="description" content="The age you start collecting Social Security affects your income in retirement. You need more than a calculator! This online tool will help you think through this decision."/>

<meta property="og:description" content="The age you claim Social Security affects your lifetime income. Our Planning for Retirement tool helps you think through this decision."/>
<meta property="og:description" content="The age you start collecting Social Security affects your income in retirement. You need more than a calculator! This online tool will help you think through this decision."/>
{% endblock %}
{% block open_graph_image %}
<meta property="og:image"
Expand All @@ -54,7 +59,7 @@ <h1>
{% trans "About this tool" %}
</h1>
<h2 class="about-subhead">
{% trans "Planning for Retirement: Before you claim" %}
{% trans "Planning your Social Security claiming age" %}
</h2>
<h3>
{% trans "How do we generate your estimates?" %}
Expand Down
33 changes: 16 additions & 17 deletions retirement_api/templates/retirement_api/claiming.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@
{% endblock %}

{% block page_meta %}
{% if es %}
<link rel="canonical" href="https://www.consumerfinance.gov/consumer-tools/retirement/before-you-claim/es/">
{% endif %}
{% if not es %}
<meta name="description" content="The age you claim Social Security affects your lifetime income. Our Planning for Retirement tool helps you think through this decision."/>
<meta property="og:description" content="The age you claim Social Security affects your lifetime income. Our Planning for Retirement tool helps you think through this decision."/>
<meta name="description" content="The age you start collecting Social Security affects your income in retirement. You need more than a calculator! This online tool will help you think through this decision."/>
<meta property="og:description" content="The age you start collecting Social Security affects your income in retirement. You need more than a calculator! This online tool will help you think through this decision."/>
<link rel="canonical" href="https://www.consumerfinance.gov/consumer-tools/retirement/before-you-claim/">
{% endif %}
<meta property="og:title" content="{% trans page.title %} &gt; Consumer Financial Protection Bureau"/>
<meta property="og:url" content="{{ request.build_absolute_uri }}"/>
Expand Down Expand Up @@ -408,16 +412,16 @@ <h3 class="lifestyle-question">{% trans questions.longlife.question %}</h3>
</div>
</div>
<div class="lifestyle-response" data-responds-to="yes">
<h4>{% trans questions.longlife.answer_yes_a_subhed %}</h4>
<p>{% trans questions.longlife.answer_yes_a %}</p>
<h4>{% trans questions.longlife.answer_yes_a_subhed|safe %}</h4>
<p>{% trans questions.longlife.answer_yes_a|safe %}</p>
</div>
<div class="lifestyle-response" data-responds-to="no">
<h4>{% trans questions.longlife.answer_no_a_subhed %}</h4>
<p>{% trans questions.longlife.answer_no_a %}</p>
<h4>{% trans questions.longlife.answer_no_a_subhed|safe %}</h4>
<p>{% trans questions.longlife.answer_no_a|safe %}</p>
</div>
<div class="lifestyle-response" data-responds-to="notsure">
<h4>{% trans questions.longlife.answer_unsure_a_subhed %}</h4>
<p>{% trans questions.longlife.answer_unsure_a %}</p>
<h4>{% trans questions.longlife.answer_unsure_a_subhed|safe %}</h4>
<p>{% trans questions.longlife.answer_unsure_a|safe %}</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -449,27 +453,22 @@ <h3>{% trans page.step3.instructions %}</h3>
<hr>
<div class="next-step-description next-steps_max">
<h3>{% trans "You’ve chosen age" %} <span class="age-response-value"></span>, {% trans "which is your maximum Social Security benefit claiming age." %}</h3>
<p>{% trans "This means you will get your maximum possible monthly benefit! Here are steps to help you in the next few years." %}</p>
<p>{% trans "This means you will get your maximum possible monthly benefit! Here are a few things to keep in mind in the next few years." %}</p>
</div>
<div class="next-step-description next-steps_over">
<h3>{% trans "You’ve chosen age" %} <span class="age-response-value"></span>, {% trans "which is later than your Social Security full retirement claiming age." %}</h3>
<p>{% trans "This means you will get an increase in your monthly benefits! Here are steps to help you in the next few years." %}</p>
<p>{% trans "This means you will get an increase in your monthly benefits! Here are a few things to keep in mind in the next few years." %}</p>
</div>
<div class="next-step-description next-steps_equal">
<h3>{% trans "You’ve chosen age" %} <span class="age-response-value"></span>, {% trans "which is your Social Security full retirement claiming age." %}</h3>
<p>{% trans "That means you’ll receive your full benefit with no reductions! Here are steps to help you in the next few years." %}</p>
<p>{% trans "That means you’ll receive your full benefit with no reductions! Here are a few things to keep in mind in the next few years." %}</p>
</div>
<div class="next-step-description next-steps_under">
<h3>{% trans "You’ve chosen age" %} <span class="age-response-value"></span>, {% trans "which is earlier than your Social Security full retirement claiming age." %}</h3>
<p>{% trans "At this age you will receive less than your full benefit amount. Here are steps to help you in the next few years." %}</p>
<p>{% trans "If you start collecting at this age you will receive less than your full benefit amount. Here are a few things to keep in mind in the next few years." %}</p>
</div>
<ol class="next-steps content-l">
<li class="content-l_col content-l_col-1-3 next-step-one">{% autoescape off %}{{ steps.final_step_1 }}</li>
<li class="content-l_col content-l_col-1-3 next-step-two">
<span class="step-two_option next-steps_under">{{ steps.final_step_2_under }}</span>
<span class="step-two_option next-steps_equal">{{ steps.final_step_2_equal }}</span>
<span class="step-two_option next-steps_over next-steps_max">{{ steps.final_step_2_over }}</span>
</li>
<li class="content-l_col content-l_col-1-3 next-step-three">{{ steps.final_step_3 }}{% endautoescape %}</li>
</ol>
<p class="h3">{{ steps.final_step_4 }}</p>
Expand Down
2 changes: 1 addition & 1 deletion retirement_api/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def claiming(request, es=False):
ages = {}
for age in AgeChoice.objects.all():
ages[age.age] = _(age.aside)
page = Page.objects.get(title='Before You Claim')
page = Page.objects.get(title='Planning your Social Security claiming age')
tips = {}
for tooltip in Tooltip.objects.all():
tips[tooltip.title] = tooltip.text
Expand Down
12 changes: 3 additions & 9 deletions src/css/claiming.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,16 +522,10 @@ form {
padding-left: 34px;
}

#claiming-social-security #age-selector-response .next-steps li.next-step-one {
background-image: url('../images/step_1.png');
}

#claiming-social-security #age-selector-response .next-steps li.next-step-two {
background-image: url('../images/step_2.png');
}

#claiming-social-security #age-selector-response .next-steps li.next-step-one,
#claiming-social-security #age-selector-response .next-steps li.next-step-two,
#claiming-social-security #age-selector-response .next-steps li.next-step-three {
background-image: url('../images/step_3.png');
background-image: url('../images/step_check.png');
}

#claiming-social-security .step-three .helpful-btn {
Expand Down

0 comments on commit 4aa8a11

Please sign in to comment.