From aa9c6e1c51774e88f69cbdfe8ad520a762240c47 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 16 Sep 2024 16:28:23 +0100
Subject: [PATCH] Fix apostrophes and ampersands in other organisation related
 pages

---
 app/helpers/application_helper.rb                             | 2 +-
 app/views/organisations/_merged_organisation_details.html.erb | 2 +-
 app/views/organisations/edit.html.erb                         | 4 ++--
 app/views/organisations/show.html.erb                         | 2 +-
 app/views/organisations/toggle_active.html.erb                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 286409759..847318fb1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -34,7 +34,7 @@ module ApplicationHelper
   def sanitise_characters(string)
     return string unless string
 
-    string.gsub("'", "’").gsub("&", "and")
+    string.gsub("'", "’").gsub("&", "＆")
   end
 
 private
diff --git a/app/views/organisations/_merged_organisation_details.html.erb b/app/views/organisations/_merged_organisation_details.html.erb
index 020051156..72ec9b213 100644
--- a/app/views/organisations/_merged_organisation_details.html.erb
+++ b/app/views/organisations/_merged_organisation_details.html.erb
@@ -1,5 +1,5 @@
 <% if @organisation.organisations_absorbed_during_displayed_collection_period_grouped_by_merge_date.present? %>
-  <%= govuk_details(summary_text: "View all organisations that were merged into #{@organisation.name}") do %>
+  <%= govuk_details(summary_text: "View all organisations that were merged into #{sanitise_characters(@organisation.name)}") do %>
     <% @organisation.organisations_absorbed_during_displayed_collection_period_grouped_by_merge_date.each do |merge_date, organisations| %>
       <p><strong>Merge date:</strong> <%= merge_date&.to_formatted_s(:govuk_date) %></p>
       <%= govuk_table do |table| %>
diff --git a/app/views/organisations/edit.html.erb b/app/views/organisations/edit.html.erb
index b0bd05bf6..7718dbea4 100644
--- a/app/views/organisations/edit.html.erb
+++ b/app/views/organisations/edit.html.erb
@@ -1,4 +1,4 @@
-<% content_for :title, "Change #{@organisation.name}’s details" %>
+<% content_for :title, "Change #{sanitise_characters(@organisation.name)}’s details" %>
 
 <% content_for :before_content do %>
   <%= govuk_back_link(href: :back) %>
@@ -8,7 +8,7 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <h1 class="govuk-heading-l">
-        <%= content_for(:title) %>
+        <%= "Change #{@organisation.name}’s details" %>
       </h1>
 
       <% if current_user.support? %>
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb
index 214b988f0..f75d01e41 100644
--- a/app/views/organisations/show.html.erb
+++ b/app/views/organisations/show.html.erb
@@ -1,4 +1,4 @@
-<% title = current_user.support? ? "#{@organisation.name} (Organisation details)" : "Organisation details" %>
+<% title = current_user.support? ? "#{sanitise_characters(@organisation.name)} (Organisation details)" : "Organisation details" %>
 <% title = format_title(nil, current_user.support? ? "About this organisation" : "Your organisation", current_user, nil, nil, @organisation.name) %>
 <% content_for :title, title %>
 
diff --git a/app/views/organisations/toggle_active.html.erb b/app/views/organisations/toggle_active.html.erb
index 42f1e8403..192caa114 100644
--- a/app/views/organisations/toggle_active.html.erb
+++ b/app/views/organisations/toggle_active.html.erb
@@ -1,4 +1,4 @@
-<% title = "#{action.humanize} #{@organisation.name}" %>
+<% title = "#{action.humanize} #{sanitise_characters(@organisation.name)}" %>
 <% content_for :title, title %>
 
 <% content_for :before_content do %>