diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb index c87ce14f0..9549285cc 100644 --- a/app/views/case_logs/edit.html.erb +++ b/app/views/case_logs/edit.html.erb @@ -6,7 +6,7 @@
You've completed <%= get_subsections_count(@form, @case_log, :completed) %> of <%= get_subsections_count(@form, @case_log, :all) %> sections.
+You’ve completed <%= get_subsections_count(@form, @case_log, :completed) %> of <%= get_subsections_count(@form, @case_log, :all) %> sections.
<% next_incomplete_section = get_next_incomplete_section(@form, @case_log).id %>
<% if @completed_case_logs.present? %>
- <%= render partial: "log_list", locals: { case_logs: @completed_case_logs, title: "Logs you've submitted", date_title: "Date Submitted" } %>
+ <%= render partial: "log_list", locals: { case_logs: @completed_case_logs, title: "Logs you’ve submitted", date_title: "Date Submitted" } %>
<% end %>
See all completed logs (<%= @completed_case_logs.count %>) You can <%= govuk_link_to "reset your password", new_password_path(resource_name) %> if you've forgotten it. You can <%= govuk_link_to "reset your password", new_password_path(resource_name) %> if you’ve forgotten it.
+
<% end %>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
- <%= govuk_link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= govuk_link_to "Didn’t receive confirmation instructions?", new_confirmation_path(resource_name) %>
<% end %>
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
- <%= govuk_link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= govuk_link_to "Didn’t receive unlock instructions?", new_unlock_path(resource_name) %>
<% end %>
<%- if devise_mapping.omniauthable? %>
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 0b62cef59..ed055cc3c 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -822,11 +822,11 @@
"15": "Under occupation - no incentive",
"16": "Property unsuitable because of ill health / disability",
"17": "Property unsuitable because of poor condition",
- "18": "Couldn't afford fees attached to renewing the tenancy",
- "19": "Couldn't afford increase in rent",
- "20": "Couldn't afford rent or mortgage - welfare reforms",
- "21": "Couldn't afford rent or mortgage - employment",
- "22": "Couldn't afford rent or mortgage - other",
+ "18": "Couldn’t afford fees attached to renewing the tenancy",
+ "19": "Couldn’t afford increase in rent",
+ "20": "Couldn’t afford rent or mortgage - welfare reforms",
+ "21": "Couldn’t afford rent or mortgage - employment",
+ "22": "Couldn’t afford rent or mortgage - other",
"23": "To move nearer to family / friends / school",
"24": "To move nearer to work",
"25": "To move to accomodation with support",
@@ -1546,8 +1546,8 @@
"header": "What is the reason for the property vacancy?",
"hint_text": "",
"type": "radio",
- "answer_options": {
- "0": "Renewal of fixed-term tenancy",
+ "answer_options": {
+ "0": "Renewal of fixed-term tenancy",
"1": "Internal transfer (excluding renewals of a fixed-term tenancy)",
"2": "Relet to tenant who occupied same property as temporary accommodation",
"3": "Tenant involved in a succession downsize",
@@ -1557,7 +1557,7 @@
"7": "Tenant abandoned property",
"8": "Tenant evicted due to arrears",
"9": "Tenant evicted due to ASB or other reason",
- "10": "Previous tenant passed away (no succession)"
+ "10": "Previous tenant passed away (no succession)"
}
}
},
@@ -1572,10 +1572,10 @@
"header": "What is the reason for the property vacancy?",
"hint_text": "",
"type": "radio",
- "answer_options": {
+ "answer_options": {
"11": "First let of newbuild property",
"12": "First let of conversion/rehabilitation/acquired property",
- "13": "First let of leased property"
+ "13": "First let of leased property"
}
}
},
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 260e1c4ba..ba36d7bf2 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -31,7 +31,7 @@ en:
failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
success: "Successfully authenticated from %{kind} account."
passwords:
- no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+ no_token: "You can’t access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
updated: "Your password has been changed successfully. You are now signed in."
diff --git a/docs/api/DLUHC-CORE-Data.v1.json b/docs/api/DLUHC-CORE-Data.v1.json
index b7d0c44c7..7f85e2096 100644
--- a/docs/api/DLUHC-CORE-Data.v1.json
+++ b/docs/api/DLUHC-CORE-Data.v1.json
@@ -740,19 +740,19 @@
"Other problems with neighbours",
"Property unsuitable because of overcrowding",
"End of assured shorthold tenancy - no fault",
- "End of assured shorthold tenancy - tenant's fault",
+ "End of assured shorthold tenancy - tenant’s fault",
"End of fixed term tenancy - no fault",
- "End of fixed term tenancy - tenant's fault",
+ "End of fixed term tenancy - tenant’s fault",
"Repossession",
"Under occupation - offered incentive to downsize",
"Under occupation - no incentive",
"Property unsuitable because of ill health / disability",
"Property unsuitable because of poor condition",
- "Couldn't afford fees attached to renewing the tenancy",
- "Couldn't afford increase in rent",
- "Couldn't afford rent or mortgage - welfare reforms",
- "Couldn't afford rent or mortgage - employment",
- "Couldn't afford rent or mortgage - other",
+ "Couldn’t afford fees attached to renewing the tenancy",
+ "Couldn’t afford increase in rent",
+ "Couldn’t afford rent or mortgage - welfare reforms",
+ "Couldn’t afford rent or mortgage - employment",
+ "Couldn’t afford rent or mortgage - other",
"To move nearer to family / friends / school",
"To move nearer to work",
"To move to accomodation with support",
diff --git a/public/404.html b/public/404.html
index 2be3af26f..4b9cf8b1b 100644
--- a/public/404.html
+++ b/public/404.html
@@ -1,7 +1,7 @@