felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 01:22:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Arnfried Griesert
2023-03-20 07:33:28 +01:00
parent e5d97ed154
commit c61ddcf39a
8 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+4 -5
View File
@@ -396,11 +396,11 @@
switch (roomPowerLevel) {
case RoomPowerLevelAdmin:
self.roomMemberPowerLevelLabel.text = [BWIL10n roomMemberPowerLevelAdminIn:self.mxRoom.summary.displayname];
self.roomMemberPowerLevelLabel.text = [BWIL10n roomMemberPowerLevelAdminIn:self.mxRoom.summary.displayName];
self.roomMemberPowerLevelContainerView.hidden = NO;
break;
case RoomPowerLevelModerator:
self.roomMemberPowerLevelLabel.text = [BWIL10n roomMemberPowerLevelModeratorIn:self.mxRoom.summary.displayname];
self.roomMemberPowerLevelLabel.text = [BWIL10n roomMemberPowerLevelModeratorIn:self.mxRoom.summary.displayName];
self.roomMemberPowerLevelContainerView.hidden = NO;
break;
default:
@@ -447,7 +447,7 @@
NSString* userLabel = [self tmpUserLabel];
if (userLabel) {
self.roomMemberUserIdLabel.text = [BWIL10n bwiRoomMemberDetailsUserlabel:self.mxRoom.summary.displayname :userLabel];
self.roomMemberUserIdLabel.text = [BWIL10n bwiRoomMemberDetailsUserlabel:self.mxRoom.summary.displayName :userLabel];
} else {
self.roomMemberUserIdLabel.text = nil;
}
@@ -812,7 +812,7 @@
}
else if (section == bwiUserLabelsIndex)
{
return [BWIL10n bwiRoomMemberSectionUserlabels: self.mxRoom.summary.displayname];
return [BWIL10n bwiRoomMemberSectionUserlabels: self.mxRoom.summary.displayName];
}
return nil;
@@ -887,7 +887,6 @@
title = @"bwi functions desc";
break;
case MXKRoomMemberDetailsActionBwiUserLabel:
// $$$ string translation does not exist
title = @"";
break;
default: