Fix Bug 69196 - Rooms.Info.History. In history, the room is recorded as a folder.

This commit is contained in:
Alexey Safronov 2024-07-16 13:32:52 +04:00
parent 0db439ed2d
commit 424cc315a0
4 changed files with 27 additions and 3 deletions

View File

@ -10,6 +10,7 @@
"ExpectUsers": "Expect users",
"FeedLinkWasDeleted": "Link was deleted",
"FeedLocationLabel": "Folder «{{folderTitle}}»",
"FeedLocationRoomLabel": "Room «{{folderTitle}}»",
"FileConverted": "File converted.",
"FileCopied": "Files copied.",
"FileCreated": "File created.",
@ -28,6 +29,7 @@
"GroupsEmptyScreenText": "See group details here",
"HistoryEmptyScreenText": "Activity history will be shown here",
"HistoryRoomCreated": "<1>«{{roomTitle}}»</1> room created",
"HistoryRoomCopied": "<1>«{{roomTitle}}»</1> room copied",
"HistoryThirdParty": "History display is not available for public rooms with connected third-party storages",
"InfoBanner": "The list of invited users includes the owner and/or admins of this {{productName}} with full access to all rooms. The owner and/or administrator cannot be assigned other access rights. Once added to the room, they will be notified of all changes.",
"ItemsSelected": "Items selected",

View File

@ -109,6 +109,11 @@ export const feedInfo = [
targetType: `${FeedTarget.Room}`,
actionType: `${FeedAction.Rename}`,
},
{
key: "RoomCopied",
targetType: `${FeedTarget.Room}`,
actionType: `${FeedAction.Copy}`,
},
// ROOM TAGS
{
key: "AddedRoomTags",

View File

@ -46,11 +46,18 @@ const HistoryMainTextFolderInfo = ({
)
return null;
const destination =
feed.data.parentType === 0 || feed.data.toParentType === 0
? t("FeedLocationLabel", {
folderTitle: feed.data.parentTitle || feed.data.toFolderTitle,
})
: t("FeedLocationRoomLabel", {
folderTitle: feed.data.parentTitle || feed.data.toFolderTitle,
});
return (
<StyledHistoryBlockMessage className="message">
<span className="folder-label">
{` ${t("FeedLocationLabel", { folderTitle: feed.data.parentTitle || feed.data.toFolderTitle })}`}
</span>
<span className="folder-label">{destination}</span>
</StyledHistoryBlockMessage>
);
};

View File

@ -43,6 +43,16 @@ export const useFeedTranslation = (
components={{ 1: <strong /> }}
/>
);
case "RoomCopied":
return (
<Trans
t={t}
ns="InfoPanel"
i18nKey="HistoryRoomCopied"
values={{ roomTitle: feed.data.title }}
components={{ 1: <strong /> }}
/>
);
case "RoomRenamed":
return (
<Trans