Merge pull request #208 from communitiesuk/707-ampersands

Remove all ampersands from the service

Gemfile

@@ -19,7 +19,7 @@ gem "bootsnap", ">= 1.4.4", require: false
 gem "govuk-components"
 # GOV UK component form builder DSL
 gem "govuk_design_system_formbuilder"
-# Turbo & Stimulus
+# Turbo and Stimulus
 gem "hotwire-rails"
 # Soft delete ActiveRecords objects
 gem "discard"

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Ministry of Housing, Communities & Local Government
+Copyright (c) 2021 Department for Levelling Up, Housing & Communities
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app/models/constants/case_log.rb

@@ -39,9 +39,9 @@ module Constants::CaseLog
     "White: Irish" => 2,
     "White: Gypsy/Irish Traveller" => 18,
     "White: Other" => 3,
-    "Mixed: White & Black Caribbean" => 4,
-    "Mixed: White & Black African" => 5,
-    "Mixed: White & Asian" => 6,
+    "Mixed: White and Black Caribbean" => 4,
+    "Mixed: White and Black African" => 5,
+    "Mixed: White and Asian" => 6,
     "Mixed: Other" => 7,
     "Asian or Asian British: Indian" => 8,
     "Asian or Asian British: Pakistani" => 9,
@@ -113,13 +113,13 @@ module Constants::CaseLog
     "Living with friends or family" => 28,
     "Refuge" => 21,
     "Hospital" => 10,
-    "Prison / approved probation hostel" => 29,
+    "Prison or approved probation hostel" => 29,
     "Direct access hostel" => 7,
-    "Bed & Breakfast" => 14,
-    "Mobile home / caravan" => 23,
+    "Bed and breakfast" => 14,
+    "Mobile home or caravan" => 23,
     "Any other temporary accommodation" => 18,
     "Home Office Asylum Support" => 24,
-    "Children’s home / foster care" => 13,
+    "Children’s home or foster care" => 13,
     "Rough sleeping" => 19,
     "Other" => 25,
     "Fixed term Local Authority General Needs tenancy" => 30,
@@ -1024,7 +1024,7 @@ module Constants::CaseLog
   }.freeze
 
   LONDON_BOROUGHS = ["City of London",
-                     "Barking & Dagenham",
+                     "Barking and Dagenham",
                      "Barnet",
                      "Bexley",
                      "Brent",
@@ -1035,14 +1035,14 @@ module Constants::CaseLog
                      "Enfield",
                      "Greenwich",
                      "Hackney",
-                     "Hammersmith & Fulham",
+                     "Hammersmith and Fulham",
                      "Haringey",
                      "Harrow",
                      "Havering",
                      "Hillingdon",
                      "Hounslow",
                      "Islington",
-                     "Kensington & Chelsea",
+                     "Kensington and Chelsea",
                      "Kingston-upon-Thames",
                      "Lambeth",
                      "Lewisham",

config/forms/2021_2022.json

@@ -280,9 +280,9 @@
                     "1": "White: Irish",
                     "2": "White: Gypsy/Irish Traveller",
                     "3": "White: Other",
-                    "4": "Mixed: White & Black Caribbean",
-                    "5": "Mixed: White & Black African",
-                    "6": "Mixed: White & Asian",
+                    "4": "Mixed: White and Black Caribbean",
+                    "5": "Mixed: White and Black African",
+                    "6": "Mixed: White and Asian",
                     "7": "Mixed: Other",
                     "8": "Asian or Asian British: Indian",
                     "9": "Asian or Asian British: Pakistani",
@@ -795,18 +795,18 @@
                     "2": "Private sector tenancy",
                     "3": "Tied housing or rented with job",
                     "4": "Supported housing",
-                    "5": "Sheltered accomodation",
+                    "5": "Sheltered accommodation",
                     "6": "Residential care home",
                     "7": "Living with friends or family",
                     "8": "Refuge",
                     "9": "Hospital",
-                    "10": "Prison / approved probation hostel",
+                    "10": "Prison or approved probation hostel",
                     "11": "Direct access hostel",
-                    "12": "Bed & Breakfast",
-                    "13": "Mobile home / caravan",
+                    "12": "Bed and breakfast",
+                    "13": "Mobile home or caravan",
                     "14": "Any other temporary accommodation",
                     "15": "Home Office Asylum Support",
-                    "16": "Children’s home / foster care",
+                    "16": "Children’s home or foster care",
                     "17": "Rough sleeping",
                     "18": "Other",
                     "19": "Fixed term Local Authority General Needs tenancy",
@@ -1927,7 +1927,7 @@
               "description": "",
               "questions": {
                 "hb": {
-                  "check_answer_label": "Universal Credit & Housing Benefit",
+                  "check_answer_label": "Housing-related benefits received",
                   "header": "Is the tenant likely to be in receipt of any of these housing-related benefits?",
                   "hint_text": "",
                   "type": "radio",

docs/adr/adr-001-initial-architecture-decisions.md

@@ -18,7 +18,7 @@ Front end
 - In the same app codebase
 - ERB templates
 
-Code Style & Linting
+Code style and linting
 - Gov.uk Rubocop for Ruby style
 - .editorconfig for whitespace, newlines etc
 

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

@@ -205,7 +205,7 @@
                   "properties": {}
                 },
                 "examples": {
-                  "Invalid Age & Reasonable Preference": {
+                  "Invalid Age and Reasonable Preference": {
                     "value": {
                       "errors": {
                         "reasonable_preference_reason": [
@@ -393,9 +393,9 @@
               "White: Irish",
               "White: Gypsy/Irish Traveller",
               "White: Other",
-              "Mixed: White & Black Caribbean",
-              "Mixed: White & Black African",
-              "Mixed: White & Asian",
+              "Mixed: White and Black Caribbean",
+              "Mixed: White and Black African",
+              "Mixed: White and Asian",
               "Mixed: Other",
               "Asian or Asian British: Indian",
               "Asian or Asian British: Pakistani",

spec/fixtures/forms/2021_2022.json

@@ -413,7 +413,7 @@
               "housing_benefit": {
                 "questions": {
                   "hb": {
-                    "check_answer_label": "Universal Credit & Housing Benefit",
+                    "check_answer_label": "Housing-related benefits received",
                     "header": "Is the tenant likely to be in receipt of any of these housing-related benefits?",
                     "type": "radio",
                     "answer_options": {