pull/16/head
Niels Andriesse 7 years ago
parent 75d52d7b7a
commit b4ca385028

@ -96,8 +96,14 @@
label.text = text label.text = text
case .outgoing: case .outgoing:
guard let message = message as? TSOutgoingMessage else { preconditionFailure() } guard let message = message as? TSOutgoingMessage else { preconditionFailure() }
label.isHidden = didAcceptRequest let text: String = {
label.text = String(format: NSLocalizedString("You've sent %@ a friend request", comment: ""), message.thread.contactIdentifier()!) if didAcceptRequest {
return String(format: NSLocalizedString("%@ accepted your friend request", comment: ""), message.thread.contactIdentifier()!)
} else {
return String(format: NSLocalizedString("You've sent %@ a friend request", comment: ""), message.thread.contactIdentifier()!)
}
}()
label.text = text
} }
} }
@ -133,7 +139,6 @@
let buttonHeight = dummyFriendRequestView.buttonStackView.isHidden ? 0 : dummyFriendRequestView.buttonHeight let buttonHeight = dummyFriendRequestView.buttonStackView.isHidden ? 0 : dummyFriendRequestView.buttonHeight
return topSpacing + messageHeight + buttonHeight return topSpacing + messageHeight + buttonHeight
case .outgoing: case .outgoing:
let messageHeight = dummyFriendRequestView.label.isHidden ? 0 : messageHeight
return topSpacing + messageHeight return topSpacing + messageHeight
} }
}() }()

@ -2581,3 +2581,4 @@
"Session" = "Session"; "Session" = "Session";
"You've declined %@'s friend request" = "You've declined %@'s friend request"; "You've declined %@'s friend request" = "You've declined %@'s friend request";
"You've accepted %@'s friend request" = "You've accepted %@'s friend request"; "You've accepted %@'s friend request" = "You've accepted %@'s friend request";
"%@ accepted your friend request" = "%@ accepted your friend request";

Loading…
Cancel
Save