Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
manuroe
2021-10-12 13:43:16 +02:00
5 changed files with 29 additions and 17 deletions
@@ -121,7 +121,8 @@
// Joined members count
if (self.roomPreviewData.numJoinedMembers > 1)
{
self.roomMembers.text = [VectorL10n roomTitleMembers:@(self.roomPreviewData.numJoinedMembers)];
NSString *numJoinedMembers = [@(self.roomPreviewData.numJoinedMembers) description];
self.roomMembers.text = [VectorL10n roomTitleMembers:numJoinedMembers];
}
else if (self.roomPreviewData.numJoinedMembers == 1)
{