Merge branch 'develop' into germain-gg/fix-right-panel-member

This commit is contained in:
Germain
2023-08-31 11:37:41 +01:00
97 changed files with 3236 additions and 2489 deletions
+1 -1
View File
@@ -897,7 +897,7 @@ const SpaceHierarchy: React.FC<IProps> = ({ space, initialText = "", showRoom, a
className="mx_SpaceHierarchy_list"
onKeyDown={onKeyDownHandler}
role="tree"
aria-label={_t("Space")}
aria-label={_t("common|space")}
>
{results}
</ul>
+2 -2
View File
@@ -304,8 +304,8 @@ const SpaceSetupFirstRooms: React.FC<{
const [busy, setBusy] = useState(false);
const [error, setError] = useState("");
const numFields = 3;
const placeholders = [_t("General"), _t("Random"), _t("Support")];
const [roomNames, setRoomName] = useStateArray(numFields, [_t("General"), _t("Random"), ""]);
const placeholders = [_t("General"), _t("common|random"), _t("common|support")];
const [roomNames, setRoomName] = useStateArray(numFields, [_t("General"), _t("common|random"), ""]);
const fields = new Array(numFields).fill(0).map((x, i) => {
const name = "roomName" + i;
return (