CIVICRM-2190 CiviCRM defaults, incorrectly describes opt-out action as "unsubscribe...

diff --git a/sql/civicrm_data/civicrm_mailing_component.sqldata.php b/sql/civicrm_data/civicrm_mailing_component.sqldata.php
index 7c9d2ee5ddf7b08deb1c7d04231c88d951ff6032..4bc340c09ac10ee5784fe1632b8974afcd8211e8 100644 (file)
--- a/sql/civicrm_data/civicrm_mailing_component.sqldata.php
+++ b/sql/civicrm_data/civicrm_mailing_component.sqldata.php
@@ -24,8 +24,8 @@ return CRM_Core_CodeGen_SqlData::create('civicrm_mailing_component')
       'name' => ts("Mailing Footer"),
       "component_type" => "Footer",
       'subject' => ts("Descriptive Title for this Footer."),
-      'body_html' => ts('Sample Footer for HTML formatted content<br/><a href="{action.optOutUrl}">Unsubscribe</a>  <br/> {domain.address}'),
-      'body_text' => ts("to unsubscribe: {action.optOutUrl}\n{domain.address}"),
+      'body_html' => ts('Sample Footer for HTML formatted content<br/><a href="{action.optOutUrl}">Opt out of any future emails</a>  <br/> {domain.address}'),
+      'body_text' => ts("Opt out of any future emails: {action.optOutUrl}\n{domain.address}"),
     ],
     [
       'name' => ts('Subscribe Message'),

diff --git a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
index ec0b581f2d9a8ac76eb0b1775f43e520d58718e2..e4744a12d3ffee21475c0c6c9725fb3b63e25edb 100644 (file)
--- a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
+++ b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php
@@ -165,7 +165,7 @@ abstract class CRM_Mailing_BaseMailingSystemTest extends CiviUnitTestCase {
         //  body_html, filtered
         "You can go to \\[Google\\]\\(http://example.net/first\?cs=[0-9a-f_]+\\) or \\[opt out\\]\\(http.*civicrm/mailing/optout.*\\)\\.\n" .
         // Default footer
-        "to unsubscribe: http.*civicrm/mailing/optout" .
+        "Opt out of any future emails: http.*civicrm/mailing/optout" .
         ";",
         $textPart->text
       );