Merge branch 'mkirk/remove-explanatory-alert'

This commit is contained in:
Michael Kirk 2017-06-20 12:39:57 -04:00
commit dc69034b64
2 changed files with 1 additions and 7 deletions

View File

@ -164,10 +164,7 @@
cell.accessoryView = accessoryLabel;
return cell;
}
actionBlock:^{
[OWSAlerts showAlertWithTitle:NSLocalizedString(@"NETWORK_STATUS_HEADER", @"")
message:NSLocalizedString(@"NETWORK_STATUS_TEXT", @"")];
}]];
actionBlock:nil]];
}
[section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_INVITE_TITLE",
@"Settings table view cell label")

View File

@ -828,9 +828,6 @@
/* No comment provided by engineer. */
"NETWORK_STATUS_OFFLINE" = "Offline";
/* No comment provided by engineer. */
"NETWORK_STATUS_TEXT" = "You can check your network status by looking at the colored bar above your inbox.";
/* A label the cell that lets you add a new member to a group. */
"NEW_CONVERSATION_FIND_BY_PHONE_NUMBER" = "Find by Phone Number";