| Index: civicrm/trunk/sites/all/modules/civicrm/CRM/Utils/Token.php |
| — | — | @@ -88,14 +88,8 @@ |
| 89 | 89 | public static function requiredTokens(&$str) |
| 90 | 90 | { |
| 91 | 91 | if (self::$_requiredTokens == null) { |
| 92 | | - self::$_requiredTokens = array ( |
| 93 | | - 'domain.address' => ts("Displays your organization's postal address."), |
| 94 | | - 'action.optOut' => |
| 95 | | - array( |
| 96 | | - 'action.optOut' => ts("Creates a link for recipients to opt out of receiving emails from your organization."), |
| 97 | | - 'action.optOutUrl' => ts("Creates a link for recipients to opt out of receiving emails from your organization."), |
| 98 | | - ), |
| 99 | | - ); |
| | 92 | + // Make all tokens optional. |
| | 93 | + self::$_requiredTokens = array(); |
| 100 | 94 | } |
| 101 | 95 | |
| 102 | 96 | $missing = array( ); |
| Index: civicrm/trunk/sites/all/modules/civicrm/CRM/Mailing/BAO/Mailing.php |
| — | — | @@ -1334,7 +1334,7 @@ |
| 1335 | 1335 | 'footer' => ts('Footer'), |
| 1336 | 1336 | 'reply' => ts('Reply'), |
| 1337 | 1337 | 'unsubscribe' => ts('Unsubscribe'), |
| 1338 | | - 'optout' => ts('Opt-Out') |
| | 1338 | + 'optout' => ts('Unsubscribe') |
| 1339 | 1339 | ); |
| 1340 | 1340 | foreach(array_keys($components) as $type) { |
| 1341 | 1341 | $query[] = "SELECT {$t['component']}.name as name, |
| Index: civicrm/trunk/sites/all/modules/civicrm/CRM/Mailing/DAO/Component.php |
| — | — | @@ -292,7 +292,7 @@ |
| 293 | 293 | 'Subscribe' => ts('Subscribe') , |
| 294 | 294 | 'Welcome' => ts('Welcome') , |
| 295 | 295 | 'Unsubscribe' => ts('Unsubscribe') , |
| 296 | | - 'OptOut' => ts('OptOut') , |
| | 296 | + 'OptOut' => ts('Unsubscribe') , |
| 297 | 297 | 'Reply' => ts('Reply') , |
| 298 | 298 | 'Resubscribe' => ts('Resubscribe') , |
| 299 | 299 | ) , |
| Index: civicrm/trunk/sites/all/modules/civicrm/templates/CRM/Mailing/Page/Optout.tpl |
| — | — | @@ -2,19 +2,16 @@ |
| 3 | 3 | <div class="messages status"> |
| 4 | 4 | <dl> |
| 5 | 5 | <dt><img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}" /></dt> |
| 6 | | - <dd><label>{$display_name} ({$email})</label> has been successfully opted out.</dd> |
| | 6 | + <dd><label>{$display_name} ({$email})</label> has been successfully unsubscribed.</dd> |
| 7 | 7 | </dl> |
| 8 | 8 | </div> |
| 9 | 9 | {else} |
| 10 | 10 | <div> |
| 11 | 11 | <form action="{$confirmURL}" method="post"> |
| 12 | | -{ts 1=$display_name 2=$email}Are you sure you want to optout: %1 (%2){/ts} |
| | 12 | +<div style="font-size: 150%; width: 400px;">{ts 1=$display_name 2=$email}Are you sure you want to unsubscribe <em>%2</em> from receiving future e-mail updates from the Wikimedia Foundation?{/ts}</div> |
| 13 | 13 | <br/> |
| 14 | | -<center> |
| 15 | | -<input type="submit" name="_qf_optout_next" value="{ts}Optout{/ts}" class="form-submit" /> |
| 16 | | - |
| 17 | | -<input type="submit" name="_qf_optout_cancel" value="{ts}Cancel{/ts}" class="form-submit" /> |
| 18 | | -</center> |
| | 14 | +<br/> |
| | 15 | +<input type="submit" name="_qf_optout_next" value="{ts}Yes, please remove me{/ts}" class="form-submit" /> |
| 19 | 16 | </form> |
| 20 | 17 | </div> |
| 21 | 18 | {/if} |
| \ No newline at end of file |