mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-21 17:12:45 +02:00
MESSENGER fix some merge issues
This commit is contained in:
@@ -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];
|
||||
|
||||
Reference in New Issue
Block a user