Skip to content

Commit

Permalink
Merge branch 'master' into ao-spreadsheet
Browse files Browse the repository at this point in the history
  • Loading branch information
martyn-w committed Nov 14, 2024
2 parents 675acae + f0fbf39 commit 2cbf4fb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions app/components/funding_widget_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
</div>
<% end %>
</div>

<% if form.subject.present? %>
<% if funding_results.blank? %>
<div class="call-to-action__text">
Expand All @@ -42,7 +41,7 @@
<div class="call-to-action__text">
<h3><%= sub_head %></h3>
<div>
<%= helpers.safe_format(funding_results) %>
<%= helpers.safe_html_format(funding_results) %>
<p>You can receive this alongside a <a href="/funding-and-support/tuition-fee-and-maintenance-loans">tuition fee and maintenance loan</a>.</p>
<p>You could also get extra funding support <a href="/funding-and-support/if-youre-a-parent-or-carer">if you're a parent or carer</a> or <a href="/funding-and-support/if-youre-disabled">if you're disabled</a>.</p>
<%= render Content::InsetTextComponent.new(
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ en:
name: "Biology"
group: "Secondary"
sub_head: "Biology - Secondary"
funding: "Bursaries of %{bursaries_postgraduate_biology} are available for trainee biology teachers if you're eligible."
funding: "Bursaries of %{bursaries_postgraduate_biology} are available for <a href=\"/life-as-a-teacher/explore-subjects/biology\">trainee biology teachers</a> if you're eligible."
business_studies:
name: "Business studies"
group: "Secondary"
Expand Down

0 comments on commit 2cbf4fb

Please sign in to comment.