From 68d2c3ce29af336b071bb5ec3bfae596155fd402 Mon Sep 17 00:00:00 2001 From: Nora Trapp Date: Sat, 27 Mar 2021 12:20:12 -0700 Subject: [PATCH] Copy tweaks --- .../ConversationSettingsViewController.swift | 7 ++++++- Signal/translations/en.lproj/Localizable.strings | 15 +++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController.swift b/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController.swift index b18bbce2f9..0021ca20f1 100644 --- a/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController.swift +++ b/Signal/src/ViewControllers/ThreadSettings/ConversationSettingsViewController.swift @@ -767,7 +767,12 @@ class ConversationSettingsViewController: OWSTableViewController2 { } func showMuteUnmuteActionSheet() { - let actionSheet = ActionSheetController() + let actionSheet = ActionSheetController( + message: thread.isMuted ? nil : NSLocalizedString( + "CONVERSATION_SETTINGS_MUTE_ACTION_SHEET_TITLE", + comment: "Title for the mute action sheet" + ) + ) if thread.isMuted { let action = diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index eb3bcd3983..2a774c11e0 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -832,11 +832,14 @@ /* label for 'mentions' cell in conversation settings */ "CONVERSATION_SETTINGS_MENTIONS_LABEL" = "Mentions"; +/* Title for the mute action sheet */ +"CONVERSATION_SETTINGS_MUTE_ACTION_SHEET_TITLE" = "Mute this chat for…"; + /* Label for button to mute a thread forever. */ -"CONVERSATION_SETTINGS_MUTE_ALWAYS_ACTION" = "Mute always"; +"CONVERSATION_SETTINGS_MUTE_ALWAYS_ACTION" = "Always"; /* Label for button to mute a thread for eight hours. */ -"CONVERSATION_SETTINGS_MUTE_EIGHT_HOUR_ACTION" = "Mute for eight hours"; +"CONVERSATION_SETTINGS_MUTE_EIGHT_HOUR_ACTION" = "8 hours"; /* label for 'mute thread' cell in conversation settings */ "CONVERSATION_SETTINGS_MUTE_LABEL" = "Mute"; @@ -845,16 +848,16 @@ "CONVERSATION_SETTINGS_MUTE_NOT_MUTED" = "Not muted"; /* Label for button to mute a thread for a day. */ -"CONVERSATION_SETTINGS_MUTE_ONE_DAY_ACTION" = "Mute for one day"; +"CONVERSATION_SETTINGS_MUTE_ONE_DAY_ACTION" = "1 day"; /* Label for button to mute a thread for a hour. */ -"CONVERSATION_SETTINGS_MUTE_ONE_HOUR_ACTION" = "Mute for one hour"; +"CONVERSATION_SETTINGS_MUTE_ONE_HOUR_ACTION" = "1 hour"; /* Label for button to mute a thread for a minute. */ -"CONVERSATION_SETTINGS_MUTE_ONE_MINUTE_ACTION" = "Mute for one minute"; +"CONVERSATION_SETTINGS_MUTE_ONE_MINUTE_ACTION" = "1 minute"; /* Label for button to mute a thread for a week. */ -"CONVERSATION_SETTINGS_MUTE_ONE_WEEK_ACTION" = "Mute for one week"; +"CONVERSATION_SETTINGS_MUTE_ONE_WEEK_ACTION" = "1 week"; /* Indicates that this thread is muted forever. */ "CONVERSATION_SETTINGS_MUTED_ALWAYS" = "Always";