From f8a203e3fe769ba635c62d25dad8e9d1d2165da9 Mon Sep 17 00:00:00 2001
From: Kat <katrina@madetech.com>
Date: Tue, 31 May 2022 14:22:35 +0100
Subject: [PATCH] Add possessive gem for names formatting

---
 Gemfile                             | 1 +
 Gemfile.lock                        | 2 ++
 app/controllers/users_controller.rb | 4 ++--
 config/locales/devise.en.yml        | 6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 10ce38f07..4e49f43ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,6 +59,7 @@ gem "sentry-rails"
 gem "sentry-ruby"
 # Pagination
 gem "pagy"
+gem "possessive" 
 
 group :development, :test do
   # Check gems for known vulnerabilities
diff --git a/Gemfile.lock b/Gemfile.lock
index 71c6bd92f..1859e66a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,6 +253,7 @@ GEM
     parser (3.1.2.0)
       ast (~> 2.4.1)
     pg (1.3.5)
+    possessive (1.0.1)
     postcodes_io (0.4.0)
       excon (~> 0.39)
     propshaft (0.6.4)
@@ -452,6 +453,7 @@ DEPENDENCIES
   paper_trail
   paper_trail-globalid
   pg (~> 1.1)
+  possessive
   postcodes_io
   propshaft
   pry-byebug
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2e8b05e7f..ed27befa7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -44,10 +44,10 @@ class UsersController < ApplicationController
         case user_params[:active]
         when "false"
           @user.update!(confirmed_at: nil, sign_in_count: 0, encrypted_password: "")
-          flash[:notice] = I18n.t("devise.activation.deactivated", user_name: @user.name)
+          flash[:notice] = I18n.t("devise.activation.deactivated", user_name: @user.name.possessive)
         when "true"
           @user.send_confirmation_instructions
-          flash[:notice] = I18n.t("devise.activation.reactivated", user_name: @user.name)
+          flash[:notice] = I18n.t("devise.activation.reactivated", user_name: @user.name.possessive)
         end
         redirect_to user_path(@user)
       end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index a7a44b0d5..e0babe522 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -28,7 +28,7 @@ en:
       password_change:
         subject: "Password successfully changed"
     omniauth_callbacks:
-      failure: "We could not authenticate you from %{kind} because \"%{reason}\""
+      failure: 'We could not authenticate you from %{kind} because "%{reason}"'
       success: "Successfully authenticated from %{kind} account"
     passwords:
       no_token: "You can’t access this page unless you’re trying to reset your password. Check you’re using the correct URL in the email we sent you."
@@ -55,8 +55,8 @@ en:
       send_paranoid_instructions: "If your account exists, you will receive an email in a few minutes with instructions for how to unlock it"
       unlocked: "Your account has been successfully unlocked. Sign in to continue."
     activation:
-      deactivated: "%{user_name}’s account has been deactivated."
-      reactivated: "%{user_name}’s account has been reactivated."
+      deactivated: "%{user_name} account has been deactivated."
+      reactivated: "%{user_name} account has been reactivated."
 
   errors:
     messages: