oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR. 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-04-11 18:04:44 -04:00
parent 4e3fbac107
commit 0a8c9e5622
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ViewControllers/BlockListUIUtils.m
View File

@ -100,8 +100,8 @@ typedef void (^BlockAlertCompletionBlock)();
UIAlertController *actionSheetController = UIAlertController *actionSheetController =
[UIAlertController alertControllerWithTitle:title [UIAlertController alertControllerWithTitle:title
message:NSLocalizedString(@"BLOCK_LIST_BLOCK_ALERT_MESSAGE", message:NSLocalizedString(@"BLOCK_BEHAVIOR_EXPLANATION",
@"The message of the 'block user' action sheet.") @"An explanation of the consequences of blocking another user.")
preferredStyle:UIAlertControllerStyleActionSheet]; preferredStyle:UIAlertControllerStyleActionSheet];
UIAlertAction *unblockAction = [UIAlertAction UIAlertAction *unblockAction = [UIAlertAction

5
Signal/src/ViewControllers/BlockListViewController.m
View File

@ -100,8 +100,9 @@ typedef NS_ENUM(NSInteger, BlockListViewControllerSection) {
{ {
switch (section) { switch (section) {
case BlockListViewControllerSection_Add: case BlockListViewControllerSection_Add:
return NSLocalizedString(@"SETTINGS_BLOCK_LIST_FOOTER_TITLE", @"A footer title for the block list table."); return NSLocalizedString(@"BLOCK_BEHAVIOR_EXPLANATION",
default: @"An explanation of the consequences of blocking another user.");
default:
return nil; return nil;
} }
} }

4
Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m
View File

@ -261,8 +261,8 @@ static NSString *const OWSConversationSettingsTableViewControllerSegueShowGroupM
items:@[ items:@[
item, item,
]]; ]];
section.footerTitle = NSLocalizedString(@"CONVERSATION_SETTINGS_BLOCK_FOOTER_TITLE", section.footerTitle = NSLocalizedString(@"BLOCK_BEHAVIOR_EXPLANATION",
@"A footer title for the block user option in the conversation settings"); @"An explanation of the consequences of blocking another user.");
[contents addSection:section]; [contents addSection:section];
} }

10
Signal/translations/en.lproj/Localizable.strings
View File

@ -97,8 +97,8 @@
/* No comment provided by engineer. */ /* No comment provided by engineer. */
"ATTACHMENT_QUEUED" = "New attachment queued for retrieval."; "ATTACHMENT_QUEUED" = "New attachment queued for retrieval.";
/* The message of the 'block user' action sheet. */ /* An explanation of the consequences of blocking another user. */
"BLOCK_LIST_BLOCK_ALERT_MESSAGE" = "Blocked users will not be able to call you or send you messages."; "BLOCK_BEHAVIOR_EXPLANATION" = "Blocked users will not be able to call you or send you messages.";
/* Button label for the 'block' button */ /* Button label for the 'block' button */
"BLOCK_LIST_BLOCK_BUTTON" = "Block"; "BLOCK_LIST_BLOCK_BUTTON" = "Block";
@ -220,9 +220,6 @@
/* title for conversation settings screen */ /* title for conversation settings screen */
"CONVERSATION_SETTINGS" = "Conversation Settings"; "CONVERSATION_SETTINGS" = "Conversation Settings";
/* A footer title for the block user option in the conversation settings */
"CONVERSATION_SETTINGS_BLOCK_FOOTER_TITLE" = "Blocked users will not be able to call you or send you messages.";
/* table cell label in conversation settings */ /* table cell label in conversation settings */
"CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Block this user"; "CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Block this user";
@ -889,9 +886,6 @@
/* A label for the 'add phone number' button in the block list table. */ /* A label for the 'add phone number' button in the block list table. */
"SETTINGS_BLOCK_LIST_ADD_BUTTON" = "Add…"; "SETTINGS_BLOCK_LIST_ADD_BUTTON" = "Add…";
/* A footer title for the block list table. */
"SETTINGS_BLOCK_LIST_FOOTER_TITLE" = "Blocked users will not be able to call you or send you messages.";
/* A label that indicates the user has no Signal contacts. */ /* A label that indicates the user has no Signal contacts. */
"SETTINGS_BLOCK_LIST_NO_CONTACTS" = "You have no contacts on Signal."; "SETTINGS_BLOCK_LIST_NO_CONTACTS" = "You have no contacts on Signal.";