MESSENGER fix some merge issues

This commit is contained in:
Frank Rotermund
2022-09-19 12:05:24 +02:00
parent 5d09c62e90
commit e6854a4e60
8 changed files with 24 additions and 25 deletions
@@ -1186,14 +1186,7 @@
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
CGFloat height = 0.0;
if (section == invitedSection)
{
height = 30.0;
}
return height;
return 30.0;
}
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
@@ -1216,13 +1209,13 @@
headerLabel.text = [VectorL10n roomParticipantsInvitedSection];
} else if (section == adminSection)
{
headerLabel.text = NSLocalizedStringFromTable(@"bwi_room_participants_section_admin", @"Bwi", nil);
headerLabel.text = BWIL10n.bwiRoomParticipantsSectionAdmin;
} else if (section == modSection)
{
headerLabel.text = NSLocalizedStringFromTable(@"bwi_room_participants_section_moderator", @"Bwi", nil);
headerLabel.text = BWIL10n.bwiRoomParticipantsSectionModerator;
} else if (section == participantsSection)
{
headerLabel.text = NSLocalizedStringFromTable(@"bwi_room_participants_section_member", @"Bwi", nil);
headerLabel.text = BWIL10n.bwiRoomParticipantsSectionMember;
}
[sectionHeader addSubview:headerLabel];