Browse Source

Use smart quotes

pull/117/head
Paul Robert Lloyd 3 years ago
parent
commit
32184e2f4c
  1. 2
      app/views/case_logs/edit.html.erb
  2. 2
      app/views/case_logs/index.html.erb
  3. 6
      app/views/devise/shared/_links.html.erb
  4. 20
      config/forms/2021_2022.json
  5. 2
      config/locales/devise.en.yml
  6. 14
      docs/api/DLUHC-CORE-Data.v1.json
  7. 4
      public/404.html
  8. 2
      public/422.html
  9. 4
      spec/features/form/tasklist_page_spec.rb
  10. 4
      spec/fixtures/forms/test_validator.json
  11. 6
      spec/views/case_log_index_view_spec.rb

2
app/views/case_logs/edit.html.erb

@ -6,7 +6,7 @@
<h2 class="govuk-heading-s govuk-!-margin-bottom-2">This submission is <h2 class="govuk-heading-s govuk-!-margin-bottom-2">This submission is
<%= @case_log.status.to_s.humanize.downcase %></h2> <%= @case_log.status.to_s.humanize.downcase %></h2>
<p class="govuk-body govuk-!-margin-bottom-7">You've completed <%= get_subsections_count(@form, @case_log, :completed) %> of <%= get_subsections_count(@form, @case_log, :all) %> sections.</p> <p class="govuk-body govuk-!-margin-bottom-7">Youve completed <%= get_subsections_count(@form, @case_log, :completed) %> of <%= get_subsections_count(@form, @case_log, :all) %> sections.</p>
<p class="govuk-body govuk-!-margin-bottom-7"> <p class="govuk-body govuk-!-margin-bottom-7">
<% next_incomplete_section = get_next_incomplete_section(@form, @case_log).id %> <% next_incomplete_section = get_next_incomplete_section(@form, @case_log).id %>
<a class="govuk-link" href="#<%= next_incomplete_section %>" <a class="govuk-link" href="#<%= next_incomplete_section %>"

2
app/views/case_logs/index.html.erb

@ -11,7 +11,7 @@
<% end %> <% end %>
<% if @completed_case_logs.present? %> <% 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 youve submitted", date_title: "Date Submitted" } %>
<% end %> <% end %>
<p><a href="#" class="govuk-link">See all completed logs (<%= @completed_case_logs.count %>)</a></p> <p><a href="#" class="govuk-link">See all completed logs (<%= @completed_case_logs.count %>)</a></p>

6
app/views/devise/shared/_links.html.erb

@ -7,15 +7,15 @@
<% end %> <% end %>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
<p class="govuk-body"> You can <%= govuk_link_to "reset your password", new_password_path(resource_name) %> if you've forgotten it.<p><br /> <p class="govuk-body"> You can <%= govuk_link_to "reset your password", new_password_path(resource_name) %> if youve forgotten it.<p><br />
<% end %> <% end %>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%= govuk_link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br /> <%= govuk_link_to "Didnt receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
<% end %> <% end %>
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> <%- 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) %><br /> <%= govuk_link_to "Didnt receive unlock instructions?", new_unlock_path(resource_name) %><br />
<% end %> <% end %>
<%- if devise_mapping.omniauthable? %> <%- if devise_mapping.omniauthable? %>

20
config/forms/2021_2022.json

@ -822,11 +822,11 @@
"15": "Under occupation - no incentive", "15": "Under occupation - no incentive",
"16": "Property unsuitable because of ill health / disability", "16": "Property unsuitable because of ill health / disability",
"17": "Property unsuitable because of poor condition", "17": "Property unsuitable because of poor condition",
"18": "Couldn't afford fees attached to renewing the tenancy", "18": "Couldnt afford fees attached to renewing the tenancy",
"19": "Couldn't afford increase in rent", "19": "Couldnt afford increase in rent",
"20": "Couldn't afford rent or mortgage - welfare reforms", "20": "Couldnt afford rent or mortgage - welfare reforms",
"21": "Couldn't afford rent or mortgage - employment", "21": "Couldnt afford rent or mortgage - employment",
"22": "Couldn't afford rent or mortgage - other", "22": "Couldnt afford rent or mortgage - other",
"23": "To move nearer to family / friends / school", "23": "To move nearer to family / friends / school",
"24": "To move nearer to work", "24": "To move nearer to work",
"25": "To move to accomodation with support", "25": "To move to accomodation with support",
@ -1546,8 +1546,8 @@
"header": "What is the reason for the property vacancy?", "header": "What is the reason for the property vacancy?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
"0": "Renewal of fixed-term tenancy", "0": "Renewal of fixed-term tenancy",
"1": "Internal transfer (excluding renewals of a fixed-term tenancy)", "1": "Internal transfer (excluding renewals of a fixed-term tenancy)",
"2": "Relet to tenant who occupied same property as temporary accommodation", "2": "Relet to tenant who occupied same property as temporary accommodation",
"3": "Tenant involved in a succession downsize", "3": "Tenant involved in a succession downsize",
@ -1557,7 +1557,7 @@
"7": "Tenant abandoned property", "7": "Tenant abandoned property",
"8": "Tenant evicted due to arrears", "8": "Tenant evicted due to arrears",
"9": "Tenant evicted due to ASB or other reason", "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?", "header": "What is the reason for the property vacancy?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
"11": "First let of newbuild property", "11": "First let of newbuild property",
"12": "First let of conversion/rehabilitation/acquired property", "12": "First let of conversion/rehabilitation/acquired property",
"13": "First let of leased property" "13": "First let of leased property"
} }
} }
}, },

2
config/locales/devise.en.yml

@ -31,7 +31,7 @@ en:
failure: "Could not authenticate you from %{kind} because \"%{reason}\"." failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
success: "Successfully authenticated from %{kind} account." success: "Successfully authenticated from %{kind} account."
passwords: 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 cant 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_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." 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." updated: "Your password has been changed successfully. You are now signed in."

14
docs/api/DLUHC-CORE-Data.v1.json

@ -740,19 +740,19 @@
"Other problems with neighbours", "Other problems with neighbours",
"Property unsuitable because of overcrowding", "Property unsuitable because of overcrowding",
"End of assured shorthold tenancy - no fault", "End of assured shorthold tenancy - no fault",
"End of assured shorthold tenancy - tenant's fault", "End of assured shorthold tenancy - tenants fault",
"End of fixed term tenancy - no fault", "End of fixed term tenancy - no fault",
"End of fixed term tenancy - tenant's fault", "End of fixed term tenancy - tenants fault",
"Repossession", "Repossession",
"Under occupation - offered incentive to downsize", "Under occupation - offered incentive to downsize",
"Under occupation - no incentive", "Under occupation - no incentive",
"Property unsuitable because of ill health / disability", "Property unsuitable because of ill health / disability",
"Property unsuitable because of poor condition", "Property unsuitable because of poor condition",
"Couldn't afford fees attached to renewing the tenancy", "Couldnt afford fees attached to renewing the tenancy",
"Couldn't afford increase in rent", "Couldnt afford increase in rent",
"Couldn't afford rent or mortgage - welfare reforms", "Couldnt afford rent or mortgage - welfare reforms",
"Couldn't afford rent or mortgage - employment", "Couldnt afford rent or mortgage - employment",
"Couldn't afford rent or mortgage - other", "Couldnt afford rent or mortgage - other",
"To move nearer to family / friends / school", "To move nearer to family / friends / school",
"To move nearer to work", "To move nearer to work",
"To move to accomodation with support", "To move to accomodation with support",

4
public/404.html

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>The page you were looking for doesn't exist (404)</title> <title>The page you were looking for doesnt exist (404)</title>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<style> <style>
.rails-default-error-page { .rails-default-error-page {
@ -58,7 +58,7 @@
<!-- This file lives in public/404.html --> <!-- This file lives in public/404.html -->
<div class="dialog"> <div class="dialog">
<div> <div>
<h1>The page you were looking for doesn't exist.</h1> <h1>The page you were looking for doesnt exist.</h1>
<p>You may have mistyped the address or the page may have moved.</p> <p>You may have mistyped the address or the page may have moved.</p>
</div> </div>
<p>If you are the application owner check the logs for more information.</p> <p>If you are the application owner check the logs for more information.</p>

2
public/422.html

@ -59,7 +59,7 @@
<div class="dialog"> <div class="dialog">
<div> <div>
<h1>The change you wanted was rejected.</h1> <h1>The change you wanted was rejected.</h1>
<p>Maybe you tried to change something you didn't have access to.</p> <p>Maybe you tried to change something you didnt have access to.</p>
</div> </div>
<p>If you are the application owner check the logs for more information.</p> <p>If you are the application owner check the logs for more information.</p>
</div> </div>

4
spec/features/form/tasklist_page_spec.rb

@ -42,12 +42,12 @@ RSpec.describe "Task List" do
it "shows the number of completed sections if no sections are completed" do it "shows the number of completed sections if no sections are completed" do
visit("/case_logs/#{empty_case_log.id}") visit("/case_logs/#{empty_case_log.id}")
expect(page).to have_content("You've completed 0 of 9 sections.") expect(page).to have_content("Youve completed 0 of 9 sections.")
end end
it "shows the number of completed sections if one section is completed" do it "shows the number of completed sections if one section is completed" do
answer_all_questions_in_income_subsection(empty_case_log) answer_all_questions_in_income_subsection(empty_case_log)
visit("/case_logs/#{empty_case_log.id}") visit("/case_logs/#{empty_case_log.id}")
expect(page).to have_content("You've completed 1 of 9 sections.") expect(page).to have_content("Youve completed 1 of 9 sections.")
end end
end end

4
spec/fixtures/forms/test_validator.json vendored

@ -8,12 +8,12 @@
"subsections": { "subsections": {
"household_characteristics": { "household_characteristics": {
"label": "Household characteristics", "label": "Household characteristics",
"ShouldThrowError": "Shouldn't be here but what you gonna do?", "ShouldThrowError": "Shouldnt be here but what you gonna do?",
"pages": { "pages": {
"tenant_code": { "tenant_code": {
"header": "", "header": "",
"description": "", "description": "",
"ShouldThrowError": "Shouldn't be here but what you gonna do?", "ShouldThrowError": "Shouldnt be here but what you gonna do?",
"questions": { "questions": {
"tenant_code": { "tenant_code": {
"check_answer_label": "Tenant code", "check_answer_label": "Tenant code",

6
spec/views/case_log_index_view_spec.rb

@ -10,7 +10,7 @@ RSpec.describe "case_logs/index" do
render render
expect(rendered).to match(/<table class="govuk-table">/) expect(rendered).to match(/<table class="govuk-table">/)
expect(rendered).to match(/Logs you need to complete/) expect(rendered).to match(/Logs you need to complete/)
expect(rendered).not_to match(/Logs you&#39;ve submitted/) expect(rendered).not_to match(/Logs youve submitted/)
expect(rendered).to match(in_progress_log.tenant_code) expect(rendered).to match(in_progress_log.tenant_code)
expect(rendered).to match(in_progress_log.property_postcode) expect(rendered).to match(in_progress_log.property_postcode)
end end
@ -22,7 +22,7 @@ RSpec.describe "case_logs/index" do
assign(:completed_case_logs, [completed_log]) assign(:completed_case_logs, [completed_log])
render render
expect(rendered).to match(/<table class="govuk-table">/) expect(rendered).to match(/<table class="govuk-table">/)
expect(rendered).to match(/Logs you&#39;ve submitted/) expect(rendered).to match(/Logs youve submitted/)
expect(rendered).not_to match(/Logs you need to complete/) expect(rendered).not_to match(/Logs you need to complete/)
expect(rendered).to match(completed_log.tenant_code) expect(rendered).to match(completed_log.tenant_code)
expect(rendered).to match(completed_log.property_postcode) expect(rendered).to match(completed_log.property_postcode)
@ -35,7 +35,7 @@ RSpec.describe "case_logs/index" do
assign(:completed_case_logs, [completed_log]) assign(:completed_case_logs, [completed_log])
render render
expect(rendered).to match(/<table class="govuk-table">/) expect(rendered).to match(/<table class="govuk-table">/)
expect(rendered).to match(/Logs you&#39;ve submitted/) expect(rendered).to match(/Logs youve submitted/)
expect(rendered).to match(/Logs you need to complete/) expect(rendered).to match(/Logs you need to complete/)
end end
end end

Loading…
Cancel
Save