Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change labels personalMessages and People #469

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions patches/patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,6 @@
"res/css/views/elements/_TooltipButton.pcss"
]
},
"use-the-term-person-not-message-direct": {
"comments" : "add RoomContextMenu and SpacePreferencesDialog under the same patch (same update)",
"github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/365",
"package": "matrix-react-sdk",
"files": [
"src/components/views/right_panel/RoomSummaryCard.tsx"
]
},
"cross-signing-ui": {
"comments": "reword cross-signing dialogs and remove confirmation dialog",
"github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/406",
Expand Down Expand Up @@ -214,5 +206,17 @@
"files": [
"src/components/views/dialogs/security/AccessSecretStorageDialog.tsx"
]
},
"use-the-term-people-not-direct-messages": {
"github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/448",
"package": "matrix-react-sdk",
"files": [
"src/components/views/dialogs/SpacePreferencesDialog.tsx",
"src/components/views/context_menus/RoomContextMenu.tsx",
"src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx",
"src/components/views/spaces/QuickSettingsButton.tsx",
"src/components/views/rooms/RoomList.tsx",
"src/stores/spaces/index.ts"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
diff --git a/node_modules/matrix-react-sdk/src/components/views/context_menus/RoomContextMenu.tsx b/node_modules/matrix-react-sdk/src/components/views/context_menus/RoomContextMenu.tsx
index c4a3c2a..5d6d1df 100644
--- a/node_modules/matrix-react-sdk/src/components/views/context_menus/RoomContextMenu.tsx
+++ b/node_modules/matrix-react-sdk/src/components/views/context_menus/RoomContextMenu.tsx
@@ -222,7 +222,8 @@ const RoomContextMenu = ({ room, onFinished, ...props }: IProps) => {
onFinished();
PosthogTrackers.trackInteraction("WebRoomHeaderContextMenuPeopleItem", ev);
}}
- label={_t("People")}
+ // label={TCHAP: change label _t("People")}
+ label={_t("Direct Messages") /* end TCHAP */}
iconClassName="mx_RoomTile_iconPeople"
>
<span className="mx_IconizedContextMenu_sublabel">{room.getJoinedMemberCount()}</span>
diff --git a/node_modules/matrix-react-sdk/src/components/views/dialogs/SpacePreferencesDialog.tsx b/node_modules/matrix-react-sdk/src/components/views/dialogs/SpacePreferencesDialog.tsx
index 61c9de1..5833e76 100644
--- a/node_modules/matrix-react-sdk/src/components/views/dialogs/SpacePreferencesDialog.tsx
+++ b/node_modules/matrix-react-sdk/src/components/views/dialogs/SpacePreferencesDialog.tsx
@@ -52,7 +52,9 @@ const SpacePreferencesAppearanceTab = ({ space }: Pick<IProps, "space">) => {
);
}}
>
- {_t("People")}
+ {/* TCHAP: change label {_t("People")} */}
+ {_t("Direct Messages")}
+ {/* end TCHAP */}
</StyledCheckbox>
<p>
{_t(
diff --git a/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx b/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx
index 90c53d5..cffe6f9 100644
--- a/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx
+++ b/node_modules/matrix-react-sdk/src/components/views/rooms/RoomList.tsx
@@ -397,7 +397,7 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
defaultHidden: false,
},
[DefaultTagID.DM]: {
- sectionLabel: _td("People"),
+ sectionLabel: _td("Direct Messages"),
isInvite: false,
defaultHidden: false,
AuxButtonComponent: DmAuxButton,
diff --git a/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx b/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
index 4518fcf..845641a 100644
--- a/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
+++ b/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
@@ -105,7 +105,9 @@ const SidebarUserSettingsTab = () => {
onChange={onMetaSpaceChangeFactory(MetaSpace.People, "WebSettingsSidebarTabSpacesCheckbox")}
className="mx_SidebarUserSettingsTab_peopleCheckbox"
>
- {_t("People")}
+ {/* TCHAP: change label {_t("People")} */}
+ {_t("Direct Messages")}
+ {/* end TCHAP */}
</StyledCheckbox>
<div className="mx_SidebarUserSettingsTab_checkboxMicrocopy">
{_t("Group all your people in one place.")}
diff --git a/node_modules/matrix-react-sdk/src/components/views/spaces/QuickSettingsButton.tsx b/node_modules/matrix-react-sdk/src/components/views/spaces/QuickSettingsButton.tsx
index 2402907..6b81b41 100644
--- a/node_modules/matrix-react-sdk/src/components/views/spaces/QuickSettingsButton.tsx
+++ b/node_modules/matrix-react-sdk/src/components/views/spaces/QuickSettingsButton.tsx
@@ -103,7 +103,9 @@ const QuickSettingsButton = ({ isPanelCollapsed = false }) => {
onChange={onMetaSpaceChangeFactory(MetaSpace.People, "WebQuickSettingsPinToSidebarCheckbox")}
>
<MembersIcon className="mx_QuickSettingsButton_icon" />
- {_t("People")}
+ {/* TCHAP: change label {_t("People")} */}
+ {_t("Direct Messages")}
+ {/* end TCHAP */}
</StyledCheckbox>
<AccessibleButton
className="mx_QuickSettingsButton_moreOptionsButton"
diff --git a/node_modules/matrix-react-sdk/src/stores/spaces/index.ts b/node_modules/matrix-react-sdk/src/stores/spaces/index.ts
index 77d65c1..d08c798 100644
--- a/node_modules/matrix-react-sdk/src/stores/spaces/index.ts
+++ b/node_modules/matrix-react-sdk/src/stores/spaces/index.ts
@@ -42,7 +42,10 @@ export const getMetaSpaceName = (spaceKey: MetaSpace, allRoomsInHome = false): s
case MetaSpace.Favourites:
return _t("Favourites");
case MetaSpace.People:
- return _t("People");
+ // TCHAP:
+ // return _t("People")
+ return _t("Direct Messages");
+ // end TCHAP
case MetaSpace.Orphans:
return _t("Other rooms");
}

This file was deleted.

5 changes: 0 additions & 5 deletions src/i18n/strings/tchap_translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -534,11 +534,6 @@
"en": "Ban from space",
"fr": "Interdire l’accès à l'espace (définitif)"
},
"People": {
"comments" : "in element, People label is used to title direct messages room and sometimes room members, use Room Members label in this case)",
"en": "Direct messages",
"fr": "Messages directs"
},
"Group all your people in one place.": {
"en":"Group all your direct message room in one place.",
"fr":"Regroupe tous vos salons de message directs au même endroit."
Expand Down