From 9c7b0ddb2f1c79474833bc4c4f23af31b8b4ae8c Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 7 Jan 2025 09:59:31 +1000
Subject: [PATCH] UX: Update email and security sidebar link copy (#30563)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* UX: Update email and security sidebar link copy

Followup b3fa335c7db3b92530625cbe37db32427f567ebc

Changes these sidebar links to better reflect
what these pages contain:

* (Email) Server setup → Server setup & logs
* (Security) Staff action logs → Logs & screening

* DEV: Test fix
---
 config/locales/client.en.yml                 | 6 +++---
 spec/system/admin_sidebar_navigation_spec.rb | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1c5f9520b5e..12156acbc1c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5664,7 +5664,7 @@ en:
         sidebar_link:
           appearance: "Appearance"
           server_setup:
-            title: "Server setup"
+            title: "Server setup & logs"
             keywords: "email|smtp|mailgun|sendgrid|sent|skipped|bounced|received|rejected|email logs|preview summary"
 
       security:
@@ -5673,8 +5673,8 @@ en:
           security: "Security settings"
           spam: "Spam settings"
           staff_action_logs:
-            title: "Staff action logs"
-            keywords: "error logs|screened emails|screened ips|screened urls|search logs"
+            title: "Logs & screening"
+            keywords: "error logs|staff action|screened emails|screened ips|screened urls|search logs"
 
       section_landing_pages:
         account:
diff --git a/spec/system/admin_sidebar_navigation_spec.rb b/spec/system/admin_sidebar_navigation_spec.rb
index bfbb8381368..68670ed11cc 100644
--- a/spec/system/admin_sidebar_navigation_spec.rb
+++ b/spec/system/admin_sidebar_navigation_spec.rb
@@ -127,7 +127,12 @@ describe "Admin | Sidebar Navigation", type: :system do
     # When match section title, display all links
     filter.filter("Email Sett")
     links = page.all(".sidebar-section-link-content-text")
-    expect(links.map(&:text)).to eq(["Server setup", "Appearance"])
+    expect(links.map(&:text)).to eq(
+      [
+        I18n.t("admin_js.admin.email_settings.sidebar_link.server_setup.title"),
+        I18n.t("admin_js.admin.email_settings.sidebar_link.appearance"),
+      ],
+    )
   end
 
   it "escapes the filtered expression for regex expressions" do