From 56d834783cc00fc9cdbff6842175aa9cde3f0222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Sun, 15 Oct 2023 16:47:53 +0200
Subject: [PATCH] Open links to social networks in the same window

As mentioned in earlier commits, opening external links in a new
tab/window results in usability and accessibility issues.

Since these links are usually at the top or bottom of the page and
contain icons of well-known sites, IMHO there's no need to even notify
people that these are external links.

Since we're no longer using the `shared.target_blank` translation inside
a sentence, we can remove the space and parenthesis in the translations.
---
 app/components/layout/social_component.html.erb                 | 2 +-
 app/components/layout/social_component.rb                       | 2 +-
 config/locales/en/general.yml                                   | 2 +-
 config/locales/es/general.yml                                   | 2 +-
 .../shared/agree_with_terms_of_service_field_component_spec.rb  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/components/layout/social_component.html.erb b/app/components/layout/social_component.html.erb
index 8476e0bcb..c2e95e471 100644
--- a/app/components/layout/social_component.html.erb
+++ b/app/components/layout/social_component.html.erb
@@ -2,7 +2,7 @@
   <ul>
     <% sites.each do |name, url| %>
       <li>
-        <%= link_to "#{url}/#{setting["#{name}_handle"]}", target: "_blank", title: link_title(name) do %>
+        <%= link_to "#{url}/#{setting["#{name}_handle"]}", title: link_title(name) do %>
           <span class="show-for-sr"><%= link_text(name) %></span>
           <span class="icon-<%= name %>" aria-hidden="true"></span>
         <% end %>
diff --git a/app/components/layout/social_component.rb b/app/components/layout/social_component.rb
index 108e3f066..a75bbfded 100644
--- a/app/components/layout/social_component.rb
+++ b/app/components/layout/social_component.rb
@@ -18,7 +18,7 @@ class Layout::SocialComponent < ApplicationComponent
     end
 
     def link_title(site_name)
-      t("shared.go_to_page") + link_text(site_name) + t("shared.target_blank")
+      t("shared.go_to_page") + link_text(site_name)
     end
 
     def link_text(site_name)
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 4f58a19c3..7a4d4aa44 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -719,7 +719,7 @@ en:
       districts: "Districts"
       districts_list: "Districts list"
       categories: "Categories"
-    target_blank: " (link opens in new window)"
+    target_blank: "Link opens in new window"
     you_are_in: "You are in"
     unflag: Unflag
     unfollow_entity: "Unfollow %{entity}"
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index dd2380dbd..b2d332d99 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -719,7 +719,7 @@ es:
       districts: "Distritos"
       districts_list: "Listado de distritos"
       categories: "Categorías"
-    target_blank: " (se abre en ventana nueva)"
+    target_blank: "Se abre en ventana nueva"
     you_are_in: "Estás en"
     unflag: Deshacer denuncia
     unfollow_entity: "Dejar de seguir %{entity}"
diff --git a/spec/components/shared/agree_with_terms_of_service_field_component_spec.rb b/spec/components/shared/agree_with_terms_of_service_field_component_spec.rb
index 455346b7f..1c79271ea 100644
--- a/spec/components/shared/agree_with_terms_of_service_field_component_spec.rb
+++ b/spec/components/shared/agree_with_terms_of_service_field_component_spec.rb
@@ -25,6 +25,6 @@ describe Shared::AgreeWithTermsOfServiceFieldComponent do
     expect(page).to have_link count: 2
     expect(page).to have_link "Privacy Policy"
     expect(page).to have_link "Terms and conditions of use"
-    expect(page).to have_link " (link opens in new window)", count: 2
+    expect(page).to have_link "Link opens in new window", count: 2
   end
 end