Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change wording on the Opt Out and Unsubscribe pages #18338

Merged
merged 1 commit into from
Sep 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CRM/Mailing/Form/Optout.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function preProcess() {

public function buildQuickForm() {
CRM_Utils_System::addHTMLHead('<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">');
CRM_Utils_System::setTitle(ts('Please Confirm Your Opt Out'));
CRM_Utils_System::setTitle(ts('Opt Out Confirmation'));

$this->add('text', 'email_confirm', ts('Verify email address to opt out:'));
$this->addRule('email_confirm', ts('Email address is required to opt out.'), 'required');
Expand Down Expand Up @@ -89,15 +89,15 @@ public function postProcess() {
CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response($queue_id, NULL, TRUE, $job_id);
}

$statusMsg = ts('Email: %1 has been successfully opted out',
$statusMsg = ts('%1 opt out confirmed.',
[1 => $values['email_confirm']]
);

CRM_Core_Session::setStatus($statusMsg, '', 'success');
}
elseif ($result == FALSE) {
// Email address not verified
$statusMsg = ts('The email address: %1 you have entered does not match the email associated with this opt out request.',
$statusMsg = ts('%1 is not associated with this opt out request.',
[1 => $values['email_confirm']]
);

Expand Down
8 changes: 4 additions & 4 deletions CRM/Mailing/Form/Unsubscribe.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function preProcess() {
}
}
if (!$groupExist) {
$statusMsg = ts('Email: %1 has been successfully unsubscribed from this Mailing List/Group.',
$statusMsg = ts('%1 has been unsubscribed.',
[1 => $email]
);
CRM_Core_Session::setStatus($statusMsg, '', 'error');
Expand All @@ -72,7 +72,7 @@ public function preProcess() {

public function buildQuickForm() {
CRM_Utils_System::addHTMLHead('<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">');
CRM_Utils_System::setTitle(ts('Please Confirm Your Unsubscribe from this Mailing/Group'));
CRM_Utils_System::setTitle(ts('Unsubscribe Confirmation'));

$this->add('text', 'email_confirm', ts('Verify email address to unsubscribe:'));
$this->addRule('email_confirm', ts('Email address is required to unsubscribe.'), 'required');
Expand Down Expand Up @@ -114,15 +114,15 @@ public function postProcess() {
CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response($queue_id, $groups, FALSE, $job_id);
}

$statusMsg = ts('Email: %1 has been successfully unsubscribed from this Mailing List/Group.',
$statusMsg = ts('%1 is unsubscribed.',
[1 => $values['email_confirm']]
);

CRM_Core_Session::setStatus($statusMsg, '', 'success');
}
elseif ($result == FALSE) {
// Email address not verified
$statusMsg = ts('The email address: %1 you have entered does not match the email associated with this unsubscribe request.',
$statusMsg = ts('%1 is not associated with this unsubscribe request.',
[1 => $values['email_confirm']]
);

Expand Down