Skip to content

Commit

Permalink
Merge pull request #3138 from DFE-Digital/LUPEYALPHA-934-FE-LUP-name-…
Browse files Browse the repository at this point in the history
…change

[LUPEYALPHA-934] FE LUP name change
  • Loading branch information
alkesh authored Sep 4, 2024
2 parents b2cacbf + c6ae33b commit 790f32c
Show file tree
Hide file tree
Showing 29 changed files with 61 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</h1>

<p class="govuk-body">
In order to claim a levelling up premium payment, you must teach an <%= govuk_link_to "eligible FE course", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers#eligible-fe-courses", new_tab: true %>.
In order to claim a targeted retention incentive payment, you must teach an <%= govuk_link_to "eligible FE course", "#{t("further_education_payments.eligibility_criteria_link.url")}#eligible-fe-courses", new_tab: true %>.
</p>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<%= govuk_button_link_to "Change FE provider", claim_path(current_journey_routing_name, "further-education-provision-search") %>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</h1>

<p class="govuk-body">
In order to claim a levelling up premium payment, you must be employed as a member of staff with teaching responsibilities.
In order to claim a targeted retention incentive payment, you must be employed as a member of staff with teaching responsibilities.
</p>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</h1>

<p class="govuk-body">
In order to claim an incentive payment, you must:
In order to claim a targeted retention incentive payment, you must:
</p>

<%= govuk_list [
Expand All @@ -15,7 +15,7 @@
], type: :bullet %>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</h1>

<p class="govuk-body">
In order to claim a financial incentive payment, at least half of your timetabled teaching hours should be spent teaching an <%= govuk_link_to "eligible FE course", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers#eligible-fe-courses", new_tab: true %>.
In order to claim a targeted retention incentive payment, at least half of your timetabled teaching hours should be spent teaching an <%= govuk_link_to "eligible FE course", "#{t("further_education_payments.eligibility_criteria_link.url")}#eligible-fe-courses", new_tab: true %>.
</p>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</h1>

<p class="govuk-body">
In order to claim a financial incentive payment, half of your timetabled teaching hours must include:
In order to claim a targeted retention incentive payment, half of your timetabled teaching hours must include:
</p>

<%= govuk_list [
Expand All @@ -14,7 +14,7 @@
], type: :bullet %>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</h1>

<p class="govuk-body">
In order to claim a financial incentive payment, you must be in the first 5 years of your further education teaching career in England.
In order to claim a targeted retention incentive payment, you must be in the first 5 years of your further education teaching career in England.
</p>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</p>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</h1>

<p class="govuk-body">
In order to claim a levelling up premium payment, you must teach an <%= govuk_link_to "eligible FE subject", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers#eligible-fe-courses", new_tab: true %>.
In order to claim a targeted retention incentive payment, you must teach an <%= govuk_link_to "eligible FE subject", "#{t("further_education_payments.eligibility_criteria_link.url")}#eligible-fe-courses", new_tab: true %>.
</p>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</h1>

<p class="govuk-body">
In order to claim an incentive payment, you must not currently be subject to any:
In order to claim a targeted retention incentive payment, you must not currently be subject to any:
</p>

<%= govuk_list [
Expand All @@ -15,7 +15,7 @@
type: :bullet %>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</h1>

<p class="govuk-body">
In order to claim an incentive payment, you must be timetabled to teach at least 2.5 hours per week in the current term.
In order to claim a targeted retention incentive payment, you must be timetabled to teach at least 2.5 hours per week in the current term.
</p>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</p>

<p class="govuk-body">
For more information, check the eligibility criteria for <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information, check the eligibility criteria for <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<p class="govuk-body">
Expand Down
4 changes: 2 additions & 2 deletions app/views/further_education_payments/claims/eligible.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
) %>

<div class="govuk-heading-m">
Based on what you’ve told us, you can apply for an early career further education financial incentive payment of:
Based on what you’ve told us, you can apply for a targeted retention incentive payment of:
</div>

<div class="govuk-heading-l">
<%= number_to_currency(@form.award_amount, precision: 0) %>
</div>

<div class="govuk-body">
For more information about why you are eligible, read about the <%= govuk_link_to "levelling up premium payments for early career further education teachers", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
For more information about why you are eligible, read about the <%= govuk_link_to t("further_education_payments.eligibility_criteria_link.text"), t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</div>

<%= f.govuk_submit "Apply now" %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

<p class="govuk-body">
For more details, you can read about payments and deductions for the
<%= govuk_link_to "levelling up premium payment", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", new_tab: true %>.
<%= govuk_link_to "targeted retention incentive payment", t("further_education_payments.eligibility_criteria_link.url"), new_tab: true %>.
</p>

<%= govuk_button_to "Continue", claim_path(current_journey_routing_name), method: :patch %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-l">
To apply for a further education financial incentive payment, you must be employed as a member of staff with teaching responsibilities
To apply for a targeted retention incentive payment, you must be employed as a member of staff with teaching responsibilities
</h1>

<p class="govuk-body">
Expand Down
2 changes: 1 addition & 1 deletion app/views/further_education_payments/landing_page.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
], type: :bullet %>

<p class="govuk-body">
Further information about the eligibility criteria can be found in the <%= govuk_link_to "levelling up premium payments for FE teachers guidance", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers", target: "_blank" %>.
Further information about the eligibility criteria can be found in the <%= govuk_link_to "targeted retention incentive payments for FE teachers guidance", t("further_education_payments.eligibility_criteria_link.url"), target: "_blank" %>.
</p>

<h2 class="govuk-heading-m govuk-!-margin-top-6">Application process</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</h1>

<p class="govuk-body govuk-!-margin-top-6">
Email <%= govuk_mail_to("[email protected]") %>
Email <%= govuk_mail_to t("further_education_payments_provider.support_email_address") %>
if you need to:
</p>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
</p>

<p class="govuk-body govuk-!-margin-top-6">
Email <%= govuk_mail_to("[email protected]") %>
Email <%= govuk_mail_to t("further_education_payments_provider.support_email_address") %>
if you have logged in with the correct organisation and need support.
</p>
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@
<h2 class="govuk-heading-s">What happens next</h2>

<p class="govuk-body">
We’ve sent your response to the Further education levelling up premium
payments team.
We have sent your response to the Further education targeted retention incentive payments team. They will:
</p>

<%= govuk_list [
"decide whether to accept or reject the claim",
"let the claimant know the outcome of their claim via email",
], type: :bullet %>

<p class="govuk-body">
They may contact you again to ask for further information.
The Further education targeted retention incentive payments team may contact you again to ask for further information.
</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<% content_for(
:page_title,
page_title(
"Verify a further education retention payment",
"Verify a targeted retention incentive payment for further education teachers",
journey: current_journey_routing_name
)
) %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">
Verify a further education retention payment
Verify a targeted retention incentive payment for further education teachers
</h1>

<p class="govuk-body govuk-!-margin-top-6">
Use this service to verify a retention payment for further education
Use this service to verify a targeted retention incentive payment for early career further education
teachers.
</p>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<p class="govuk-body">
If you have any questions or need support, email:
<%= govuk_mail_to("[email protected]") %>
<%= govuk_mail_to t("further_education_payments_provider.support_email_address") %>.
</p>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<div class="govuk-panel govuk-panel--confirmation">
<h1 class="govuk-panel__title" id="submitted-title">
You applied for a further education retention payment
You applied for a targeted retention incentive payment
</h1>

<div class="govuk-panel__body">
Expand Down Expand Up @@ -44,7 +44,7 @@
</h2>

<p class="govuk-body">
As long as you continue to meet the <%= govuk_link_to "eligibility criteria", "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers#eligibility" %>, you could claim a retention payment in future academic years.
As long as you continue to meet the <%= govuk_link_to "eligibility criteria", "#{t("further_education_payments.eligibility_criteria_link.url")}#eligibility" %>, you could claim a retention payment in future academic years.
</p>

<p class="govuk-body">
Expand Down
13 changes: 8 additions & 5 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ en:
further_education_payments:
landing_page: Find out if you are eligible for a targeted retention incentive payment for further education teachers
claim_description: for further education payments
journey_name: Claim incentive payments for further education teachers
journey_name: Claim a targeted retention incentive payment for further education teachers
feedback_email: "[email protected]"
support_email_address: "[email protected]"
claim_subject: "Further education payment"
Expand All @@ -833,6 +833,9 @@ en:
task_questions:
matching_details:
title: Is this claim still valid despite having matching details with other claims?
eligibility_criteria_link:
text: targeted retention incentive payments for early career further education teachers
url: "https://www.gov.uk/guidance/levelling-up-premium-payments-for-fe-teachers"
forms:
ineligible:
courses:
Expand All @@ -846,7 +849,7 @@ en:
must_be_recent_further_education_teacher:
heading: You are not eligible
must_teach_at_least_one_term:
heading: You are not eligible for a financial incentive payment yet
heading: You are not eligible for a retention payment yet
subject_to_problematic_actions:
heading: You are not eligible
teaching_less_than_2_5:
Expand Down Expand Up @@ -1081,7 +1084,7 @@ en:
Select yes if at least half your timetabled teaching hours are spent teaching 16-19-year-olds, including
those up to 25 with an Education, Health and Care Plan
eligible:
heading: You’re eligible for a financial incentive payment
heading: You’re eligible for a targeted retention incentive payment
gender:
questions:
payroll_gender: "How is your gender recorded on your employer’s payroll system?"
Expand Down Expand Up @@ -1109,12 +1112,12 @@ en:
correct.
btn_text: Accept and send
further_education_payments_provider:
journey_name: Claim incentive payments for further education teachers - provider
journey_name: Claim a targeted retention incentive payment for further education teachers - provider
feedback_email: "[email protected]"
support_email_address: "[email protected]"
forms:
verify_claim:
title: "Review a financial incentive payment claim"
title: "Review a targeted retention incentive payment claim"
declaration_title: "Declaration"
declaration: "To the best of my knowledge, I confirm that the information provided in this form is correct."
claim_reference: "Claim reference"
Expand Down
2 changes: 1 addition & 1 deletion spec/features/admin/admin_configure_services_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
sign_in_as_service_operator

click_on "Manage services"
click_on "Change Claim incentive payments for further education teachers"
click_on "Change Claim a targeted retention incentive payment for further education teachers"

expect(page).not_to have_content("Sign in with DfE Identity")
end
Expand Down
2 changes: 1 addition & 1 deletion spec/features/admin/eligible_fe_providers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
sign_in_as_service_operator

click_link "Manage services"
click_link "Change Claim incentive payments for further education teachers"
click_link "Change Claim a targeted retention incentive payment for further education teachers"

select "2024/2025", from: "eligible-fe-providers-upload-academic-year-field"
attach_file "eligible-fe-providers-upload-file-field", eligible_fe_providers_csv_file.path
Expand Down
Loading

0 comments on commit 790f32c

Please sign in to comment.