diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m index 11de12304..910314cd4 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m @@ -118,7 +118,17 @@ NS_ASSUME_NONNULL_BEGIN - (void)configureWithThread:(TSThread *)thread { + OWSAssert(thread); self.thread = thread; + + if ([self.thread isKindOfClass:[TSContactThread class]]) { + self.title = NSLocalizedString( + @"CONVERSATION_SETTINGS_CONTACT_INFO_TITLE", @"Navbar title when viewing settings for a 1-on-1 thread"); + } else { + self.title = NSLocalizedString( + @"CONVERSATION_SETTINGS_GROUP_INFO_TITLE", @"Navbar title when viewing settings for a group thread"); + } + [self updateEditButton]; } @@ -173,9 +183,6 @@ NS_ASSUME_NONNULL_BEGIN { [super viewDidLoad]; - // Translations - self.title = NSLocalizedString(@"CONVERSATION_SETTINGS", @"title for conversation settings screen"); - _disappearingMessagesDurationLabel = [UILabel new]; self.disappearingMessagesDurations = [OWSDisappearingMessagesConfiguration validDurationsSeconds]; diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 844a40799..2f5ef8bda 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -256,6 +256,12 @@ /* table cell label in conversation settings */ "CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Block this user"; +/* Navbar title when viewing settings for a 1-on-1 thread */ +"CONVERSATION_SETTINGS_CONTACT_INFO_TITLE" = "Contact Info"; + +/* Navbar title when viewing settings for a group thread */ +"CONVERSATION_SETTINGS_GROUP_INFO_TITLE" = "Group Info"; + /* Title of the 'mute this thread' action sheet. */ "CONVERSATION_SETTINGS_MUTE_ACTION_SHEET_TITLE" = "Mute";