From d92b24b8a198a770a257500750defe4c3906a4b7 Mon Sep 17 00:00:00 2001
From: Felanbird <41973452+Felanbird@users.noreply.github.com>
Date: Tue, 5 Nov 2024 14:53:43 -0500
Subject: [PATCH] chore: standardize references to FrankerFaceZ & BetterTTV in
 settings (#5698)

---
 CHANGELOG.md                              |  1 +
 src/widgets/settingspages/GeneralPage.cpp | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf2cf960e..036b53e57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 - Minor: Make raid entry message usernames clickable. (#5651)
 - Minor: Tabs unhighlight when their content is read in other tabs. (#5649)
 - Minor: Made usernames in bits and sub messages clickable. (#5686)
+- Minor: Mentions of FrankerFaceZ and BetterTTV in settings are standardized as such. (#5698)
 - Bugfix: Fixed tab move animation occasionally failing to start after closing a tab. (#5426, #5612)
 - Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378)
 - Bugfix: Fixed restricted users usernames not being clickable. (#5405)
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index 7103fb527..84ebaaf1b 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -614,12 +614,16 @@ void GeneralPage::initLayout(GeneralPageView &layout)
                            "Google",
                        },
                        s.emojiSet);
-    layout.addCheckbox("Show BTTV global emotes", s.enableBTTVGlobalEmotes);
-    layout.addCheckbox("Show BTTV channel emotes", s.enableBTTVChannelEmotes);
-    layout.addCheckbox("Enable BTTV live emote updates (requires restart)",
+    layout.addCheckbox("Show BetterTTV global emotes",
+                       s.enableBTTVGlobalEmotes);
+    layout.addCheckbox("Show BetterTTV channel emotes",
+                       s.enableBTTVChannelEmotes);
+    layout.addCheckbox("Enable BetterTTV live emote updates (requires restart)",
                        s.enableBTTVLiveUpdates);
-    layout.addCheckbox("Show FFZ global emotes", s.enableFFZGlobalEmotes);
-    layout.addCheckbox("Show FFZ channel emotes", s.enableFFZChannelEmotes);
+    layout.addCheckbox("Show FrankerFaceZ global emotes",
+                       s.enableFFZGlobalEmotes);
+    layout.addCheckbox("Show FrankerFaceZ channel emotes",
+                       s.enableFFZChannelEmotes);
     layout.addCheckbox("Show 7TV global emotes", s.enableSevenTVGlobalEmotes);
     layout.addCheckbox("Show 7TV channel emotes", s.enableSevenTVChannelEmotes);
     layout.addCheckbox("Enable 7TV live emote updates (requires restart)",