feat: simplify rendering of roomfacepile

Author: justjanne

src/components/views/elements/RoomFacePile.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021-2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { FC, HTMLAttributes, ReactNode, useContext } from "react";
+import React, { FC, HTMLAttributes, useContext } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { sortBy } from "lodash";
@@ -60,36 +60,18 @@ const RoomFacePile: FC<IProps> = (
     // reverse members in tooltip order to make the order between the two match up.
     const commaSeparatedMembers = shownMembers.map(m => m.name).reverse().join(", ");
 
-    let tooltip: ReactNode;
-    if (props.onClick) {
-        let subText: string;
-        if (isJoined) {
-            subText = _t("Including you, %(commaSeparatedMembers)s", { commaSeparatedMembers });
-        } else {
-            subText = _t("Including %(commaSeparatedMembers)s", { commaSeparatedMembers });
-        }
-
-        tooltip = <div>
-            <div className="mx_Tooltip_title">
-                { _t("View all %(count)s members", { count }) }
-            </div>
-            <div className="mx_Tooltip_sub">
-                { subText }
-            </div>
-        </div>;
-    } else {
-        if (isJoined) {
-            tooltip = _t("%(count)s members including you, %(commaSeparatedMembers)s", {
-                count: count - 1,
-                commaSeparatedMembers,
-            });
-        } else {
-            tooltip = _t("%(count)s members including %(commaSeparatedMembers)s", {
-                count,
-                commaSeparatedMembers,
-            });
-        }
-    }
+    const tooltip = <div>
+        <div className="mx_Tooltip_title">
+            { props.onClick
+                ? _t("View all %(count)s members", { count })
+                : _t("%(count)s members", { count }) }
+        </div>
+        <div className="mx_Tooltip_sub">
+            { isJoined
+                ? _t("Including you, %(commaSeparatedMembers)s", { commaSeparatedMembers })
+                : _t("Including %(commaSeparatedMembers)s", { commaSeparatedMembers }) }
+        </div>
+    </div>;
 
     return <FacePile
         members={shownMembers}

src/i18n/strings/en_EN.json

@@ -2364,15 +2364,10 @@
     "This address is available to use": "This address is available to use",
     "This address is already in use": "This address is already in use",
     "This address had invalid server or is already in use": "This address had invalid server or is already in use",
-    "Including you, %(commaSeparatedMembers)s": "Including you, %(commaSeparatedMembers)s",
-    "Including %(commaSeparatedMembers)s": "Including %(commaSeparatedMembers)s",
     "View all %(count)s members|other": "View all %(count)s members",
     "View all %(count)s members|one": "View 1 member",
-    "%(count)s members including you, %(commaSeparatedMembers)s|other": "%(count)s members including you, %(commaSeparatedMembers)s",
-    "%(count)s members including you, %(commaSeparatedMembers)s|zero": "You",
-    "%(count)s members including you, %(commaSeparatedMembers)s|one": "%(count)s members including you and %(commaSeparatedMembers)s",
-    "%(count)s members including %(commaSeparatedMembers)s|other": "%(count)s members including %(commaSeparatedMembers)s",
-    "%(count)s members including %(commaSeparatedMembers)s|one": "%(commaSeparatedMembers)s",
+    "Including you, %(commaSeparatedMembers)s": "Including you, %(commaSeparatedMembers)s",
+    "Including %(commaSeparatedMembers)s": "Including %(commaSeparatedMembers)s",
     "%(count)s people you know have already joined|other": "%(count)s people you know have already joined",
     "%(count)s people you know have already joined|one": "%(count)s person you know has already joined",
     "Message search initialisation failed, check <a>your settings</a> for more information": "Message search initialisation failed, check <a>your settings</a> for more information",