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.

Sign up for GitHub

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

DM external : affichage des rooms en attendant que les correspondants… #883

Merged
merged 1 commit into from
Oct 5, 2023
Merged

DM external : affichage des rooms en attendant que les correspondants… #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion Riot/Assets/fr.lproj/Vector.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2488,11 +2488,15 @@
// Mark: - Space Selector

"space_selector_title" = "Mes espaces";
"room_invites_empty_view_information" = "C’est ici que vos invitations apparaîtront.";

// Mark: - Room invites

"room_invites_empty_view_title" = "Rien de neuf.";
"room_invites_empty_view_information" = "C’est ici que vos invitations apparaîtront.";

"room_waiting_other_participants_title" = "En attente d'invités sur %@"; // Tchap
"room_waiting_other_participants_message" = "Dès que les invités auront rejoint %@, vous pourrez discuter avec eux et le salon sera chiffré de bout en bout."; // Tchap

"all_chats_edit_menu_space_settings" = "Paramètres de l’espace";
"all_chats_edit_menu_leave_space" = "Quitter %@";
"all_chats_user_menu_settings" = "Paramètres utilisateur";
Expand Down
24 changes: 2 additions & 22 deletions Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,31 +152,11 @@ - (void)dealloc
}
- (NSArray<id<MXRoomSummaryProtocol>> *)breadcrumbsRoomCellDataArray
{
// Tchap: Hide the rooms created to invite some non-tchap contact by email.
NSMutableArray<id<MXRoomSummaryProtocol>> *rooms = [NSMutableArray new];
for (MXRoom *room in self.recentsListService.breadcrumbsRoomListData.rooms)
{
if (room.isDirect && [MXTools isEmailAddress:room.directUserId])
{
continue;
}
[rooms addObject:room];
}
return rooms;
return self.recentsListService.breadcrumbsRoomListData.rooms;
}
- (NSArray<id<MXRoomSummaryProtocol>> *)allChatsRoomCellDataArray
{
// Tchap: Hide the rooms created to invite some non-tchap contact by email.
NSMutableArray<id<MXRoomSummaryProtocol>> *rooms = [NSMutableArray new];
for (MXRoom *room in self.recentsListService.allChatsRoomListData.rooms)
{
if (room.isDirect && [MXTools isEmailAddress:room.directUserId])
{
continue;
}
[rooms addObject:room];
}
return rooms;
return self.recentsListService.allChatsRoomListData.rooms;
}

- (NSInteger)totalVisibleItemCount
Expand Down
1 change: 1 addition & 0 deletions changelog.d/876.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Suppression du masquage des salons de messagerie direct (DM) avec externes pendant l'attente de l'inscription des correspondants
Loading