From a9afb2d1d10ec53ac56a14a8aafbafc587218a99 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Wed, 26 Apr 2023 16:18:36 +1000 Subject: [PATCH] Accessibility and copy tweaks --- Session/Conversations/ConversationVC.swift | 4 ++-- Session/Meta/Translations/de.lproj/Localizable.strings | 1 - Session/Meta/Translations/en.lproj/Localizable.strings | 1 - Session/Meta/Translations/es.lproj/Localizable.strings | 1 - Session/Meta/Translations/fi.lproj/Localizable.strings | 1 - Session/Meta/Translations/fr.lproj/Localizable.strings | 1 - Session/Meta/Translations/hi.lproj/Localizable.strings | 1 - Session/Meta/Translations/hr.lproj/Localizable.strings | 1 - Session/Meta/Translations/id-ID.lproj/Localizable.strings | 1 - Session/Meta/Translations/it.lproj/Localizable.strings | 1 - Session/Meta/Translations/ja.lproj/Localizable.strings | 1 - Session/Meta/Translations/nl.lproj/Localizable.strings | 1 - Session/Meta/Translations/pl.lproj/Localizable.strings | 1 - Session/Meta/Translations/pt_BR.lproj/Localizable.strings | 1 - Session/Meta/Translations/ru.lproj/Localizable.strings | 1 - Session/Meta/Translations/si.lproj/Localizable.strings | 1 - Session/Meta/Translations/sk.lproj/Localizable.strings | 1 - Session/Meta/Translations/sv.lproj/Localizable.strings | 1 - Session/Meta/Translations/th.lproj/Localizable.strings | 1 - Session/Meta/Translations/vi-VN.lproj/Localizable.strings | 1 - Session/Meta/Translations/zh-Hant.lproj/Localizable.strings | 1 - Session/Meta/Translations/zh_CN.lproj/Localizable.strings | 1 - Session/Utilities/UIContextualAction+Utilities.swift | 2 +- 23 files changed, 3 insertions(+), 24 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 7ee477e53..274d3679a 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -325,10 +325,10 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers private lazy var messageRequestDeleteButton: UIButton = { let result: SessionButton = SessionButton(style: .destructive, size: .medium) - result.accessibilityLabel = "Decline message request" + result.accessibilityLabel = "Delete message request" result.isAccessibilityElement = true result.translatesAutoresizingMaskIntoConstraints = false - result.setTitle("TXT_DECLINE_TITLE".localized(), for: .normal) + result.setTitle("TXT_DELETE_TITLE".localized(), for: .normal) result.addTarget(self, action: #selector(deleteMessageRequest), for: .touchUpInside) return result diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index d3ed55f01..8833e453f 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Fehler"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index 74cef4b39..26c888e98 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Error"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/es.lproj/Localizable.strings b/Session/Meta/Translations/es.lproj/Localizable.strings index ce988d646..94d8cb40e 100644 --- a/Session/Meta/Translations/es.lproj/Localizable.strings +++ b/Session/Meta/Translations/es.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Fallo"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index d3abeb90d..7480fcb7d 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "Sinulla on uusi viestipyyntö"; "TXT_HIDE_TITLE" = "Piilota"; "TXT_DELETE_ACCEPT" = "Hyväksy"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Virhe"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index 00a2401da..2de5b60dc 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "Vous avez une nouvelle demande de message"; "TXT_HIDE_TITLE" = "Masquer"; "TXT_DELETE_ACCEPT" = "Accepter"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Erreur"; "modal_call_permission_request_title" = "Autorisations d'appel requises"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index 7df908ba8..727d53c93 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Error"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index 13e448075..c3f7d04bd 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Greška"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/id-ID.lproj/Localizable.strings b/Session/Meta/Translations/id-ID.lproj/Localizable.strings index 3ad886270..43c2f55e9 100644 --- a/Session/Meta/Translations/id-ID.lproj/Localizable.strings +++ b/Session/Meta/Translations/id-ID.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Galat"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index cb679a67e..c0747756b 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "Hai una nuova richiesta di messaggio"; "TXT_HIDE_TITLE" = "Nascondi"; "TXT_DELETE_ACCEPT" = "Accetta"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Errore"; "modal_call_permission_request_title" = "Permessi Di Chiamata Richiesti"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index b8b24667a..96c28bfe7 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "新しいリクエストがあります"; "TXT_HIDE_TITLE" = "非表示"; "TXT_DELETE_ACCEPT" = "許可"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "エラー"; "modal_call_permission_request_title" = "許可が必要です"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index e15af72a9..6036e56a9 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Fout"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 50c5895f1..0e4b181ea 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "Masz nowe żądanie wiadomości"; "TXT_HIDE_TITLE" = "Ukryj"; "TXT_DELETE_ACCEPT" = "Zaakceptuj"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Błąd"; "modal_call_permission_request_title" = "Wymagane uprawnienia połączenia"; diff --git a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings index e4435383d..45b6eaac3 100644 --- a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Erro"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index f3cda8946..4095c858d 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Скрыть"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Ошибка"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/si.lproj/Localizable.strings b/Session/Meta/Translations/si.lproj/Localizable.strings index f20d67f22..73fe4b973 100644 --- a/Session/Meta/Translations/si.lproj/Localizable.strings +++ b/Session/Meta/Translations/si.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Error"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index e9e1c61c7..aca8b82b1 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "Máte novú žiadosť o správu"; "TXT_HIDE_TITLE" = "Skryť"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Error"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/sv.lproj/Localizable.strings b/Session/Meta/Translations/sv.lproj/Localizable.strings index eab9e754e..f55527c47 100644 --- a/Session/Meta/Translations/sv.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Fel"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index cba1fe5f1..e626b036d 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "ข้อผิดพลาด"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings index 00440530d..ba08816f3 100644 --- a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Error"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings index 3f4b33302..ba5d76ba1 100644 --- a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request"; "TXT_HIDE_TITLE" = "Hide"; "TXT_DELETE_ACCEPT" = "Accept"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "Error"; "modal_call_permission_request_title" = "Call Permissions Required"; diff --git a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings index ba2f7dd0c..a75f4c4cc 100644 --- a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings @@ -407,7 +407,6 @@ "MESSAGE_REQUESTS_NOTIFICATION" = "您有一个新的消息请求"; "TXT_HIDE_TITLE" = "隐藏"; "TXT_DELETE_ACCEPT" = "接受"; -"TXT_DECLINE_TITLE" = "Decline"; "TXT_BLOCK_USER_TITLE" = "Block User"; "ALERT_ERROR_TITLE" = "错误"; "modal_call_permission_request_title" = "请授予通话权限"; diff --git a/Session/Utilities/UIContextualAction+Utilities.swift b/Session/Utilities/UIContextualAction+Utilities.swift index 75f18f96a..b5ce85911 100644 --- a/Session/Utilities/UIContextualAction+Utilities.swift +++ b/Session/Utilities/UIContextualAction+Utilities.swift @@ -503,7 +503,7 @@ public extension UIContextualAction { attributedExplanation: confirmationModalExplanation, confirmTitle: "TXT_DELETE_TITLE".localized(), confirmAccessibility: Accessibility( - identifier: "Delete" + identifier: "Confirm delete" ), confirmStyle: .danger, cancelStyle: .alert_text,