From 83ec1e4a4df8594c978db2cd718a6295e5a0efb8 Mon Sep 17 00:00:00 2001
From: yashu <ydk31137@gmail.com>
Date: Mon, 16 Sep 2024 13:52:10 -0600
Subject: [PATCH 1/4] String changes to the SSO CILogon Sing-in button

---
 app/views/shared/_sign_in_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_sign_in_form.html.erb b/app/views/shared/_sign_in_form.html.erb
index af54f9896a..1d48a2674f 100644
--- a/app/views/shared/_sign_in_form.html.erb
+++ b/app/views/shared/_sign_in_form.html.erb
@@ -40,7 +40,7 @@
       <p class="text-center fontsize-h4">- <%= _('or') %> -</p>
       <div class="form-group">
         <span class="center-block btn-group-justified">
-          <%= link_to _("Sign in with CILogon"), user_openid_connect_omniauth_authorize_path, method: :post, data: { turbo: false }, class: 'btn btn-default' %>
+          <%= link_to _("Sign in with institutional or social ID"), user_openid_connect_omniauth_authorize_path, method: :post, data: { turbo: false }, class: 'btn btn-default' %>
         </span>
       </div>
     <% else %>

From 679aab2526ff0d435af26e74c4960fd39ee7bb36 Mon Sep 17 00:00:00 2001
From: aaronskiba <askiba@ualberta.ca>
Date: Tue, 17 Sep 2024 10:52:04 -0600
Subject: [PATCH 2/4] Update test to correspond with update of SSO button

---
 spec/integration/openid_connect_sso_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/integration/openid_connect_sso_spec.rb b/spec/integration/openid_connect_sso_spec.rb
index 2bf8ce472b..f582626c0a 100644
--- a/spec/integration/openid_connect_sso_spec.rb
+++ b/spec/integration/openid_connect_sso_spec.rb
@@ -26,7 +26,7 @@
 
     it 'creates account from external credentials' do
       visit root_path
-      click_link 'Sign in with CILogon'
+      click_link 'Sign in with institutional or social ID'
 
       identifier = Identifier.last
       expect(identifier.value).to eql('https://www.cilogon.org/12345')

From 29df6de790965a31db6b4cfc6da60fac05f6cfcb Mon Sep 17 00:00:00 2001
From: aaronskiba <askiba@ualberta.ca>
Date: Tue, 17 Sep 2024 10:58:46 -0600
Subject: [PATCH 3/4] Set text as `.html_safe` to use `<br>` tag

The corresponding French translation of this text is too long to only be a single line long. To address that, `.html_safe` has been added here, which enables the correct behaviour when adding the `<br>` tag for the French translation on translation.io
---
 app/views/shared/_sign_in_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_sign_in_form.html.erb b/app/views/shared/_sign_in_form.html.erb
index 1d48a2674f..72f4f2b973 100644
--- a/app/views/shared/_sign_in_form.html.erb
+++ b/app/views/shared/_sign_in_form.html.erb
@@ -40,7 +40,7 @@
       <p class="text-center fontsize-h4">- <%= _('or') %> -</p>
       <div class="form-group">
         <span class="center-block btn-group-justified">
-          <%= link_to _("Sign in with institutional or social ID"), user_openid_connect_omniauth_authorize_path, method: :post, data: { turbo: false }, class: 'btn btn-default' %>
+          <%= link_to _("Sign in with institutional or social ID").html_safe, user_openid_connect_omniauth_authorize_path, method: :post, data: { turbo: false }, class: 'btn btn-default' %>
         </span>
       </div>
     <% else %>

From 20a2bf00750eb571102bf36fbab2b3c2e49c9711 Mon Sep 17 00:00:00 2001
From: Omar Rodriguez Arenas <orodrigu@ualberta.ca>
Date: Wed, 18 Sep 2024 11:18:59 -0600
Subject: [PATCH 4/4] Update CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d12bd7146..e7196a7f1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [Unreleased]
+
+### Changed
+
+ - Updated SSO button string [portagenetwork/roadmap#903](https://github.com/portagenetwork/roadmap/issues/903)
+
 ## [4.1.1+portage-4.2.1] - 2024-09-12
 
 ### Changed