Merge branch 'florianduros/threads/labs-flag' into florianduros/threa…

…ds/pop-out-panel # Conflicts: # src/i18n/strings/en_EN.json
matrix-org · Jan 15, 2024 · 94ace6f · 94ace6f
2 parents 531e10a + b226a08
commit 94ace6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1460,6 +1460,7 @@
         "sliding_sync_server_no_support": "Your server lacks native support",
         "sliding_sync_server_specify_proxy": "Your server lacks native support, you must specify a proxy",
         "sliding_sync_server_support": "Your server has native support",
+        "threads_activity_centre": "Threads Activity Centre (in development). Currently this just removes thread notification counts from the count total in the room list",
         "under_active_development": "Under active development.",
         "unrealiable_e2e": "Unreliable in encrypted rooms",
         "video_rooms": "Video rooms",
@@ -3139,8 +3140,7 @@
         "match_system": "Match system"
     },
     "thread_activity_centre": {
-        "header": "Threads activity",
-        "title": "Thread activity centre"
+        "header": "Threads activity"
     },
     "thread_view_back_action_label": "Back to thread",
     "threads": {

diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
@@ -1106,10 +1106,10 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: [],
     },
-    "threadActivityCentre": {
+    "threadsActivityCentre": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         labsGroup: LabGroup.Threads,
-        displayName: _td("thread_activity_centre|title"),
+        displayName: _td("labs|threads_activity_centre"),
         default: false,
         isFeature: true,
     },