Index: simplenews.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.admin.inc,v retrieving revision 1.59.2.8 diff -u -p -r1.59.2.8 simplenews.admin.inc --- simplenews.admin.inc 19 Apr 2010 08:14:59 -0000 1.59.2.8 +++ simplenews.admin.inc 19 Apr 2010 08:47:06 -0000 @@ -191,7 +191,7 @@ function simplenews_admin_types_form(&$f '#title' => t('Opt-in/out method'), '#options' => $options, '#default_value' => variable_get('simplenews_opt_inout_'. $term->tid, 'double'), - '#description' => t('Hidden: This newsletter does not appear on subscription forms. No unsubscription footer in newsletter.
Single: Users are (un)subscribed immediately, no confirmation email is sent.
Double: When (un)subscribing at a subscription form, anonymous users receive an (un)subscription confirmation email. Authenticated users are (un)subscribed immediately.'), + '#description' => t('Hidden: This newsletter does not appear on subscription forms. No unsubscribe footer in newsletter.
Single: Users are (un)subscribed immediately, no confirmation email is sent.
Double: When (un)subscribing at a subscription form, anonymous users receive an (un)subscription confirmation email. Authenticated users are (un)subscribed immediately.'), ); $form['simplenews_sender_information'] = array( Index: simplenews.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.module,v retrieving revision 1.220.2.25 diff -u -p -r1.220.2.25 simplenews.module --- simplenews.module 19 Apr 2010 08:14:59 -0000 1.220.2.25 +++ simplenews.module 19 Apr 2010 08:47:08 -0000 @@ -1134,14 +1134,14 @@ function simplenews_subscribe_user($mail * * The $confirm parameter determines the action: * FALSE = The user is unsubscribed - * TRUE = User receives an email to verify the address and complete the unsubscription + * TRUE = User receives an email to verify the address and confirm unsubscribe * The subscription account is deleted when the user is unsubscribed to the last newsletter * * @param string $mail The email address to unsubscribe from the newsletter. * @param integer $tid The term ID of the newsletter. * @param boolean $confirm TRUE = send confirmation mail; FALSE = unsubscribe immediate from the newsletter * @param string $source - * Indication for source of unsubscription. Simplenews uses these sources: + * Indication for the unsubscribe source. Simplenews uses these sources: * website: via any website form (with or without confirmation email) * mass subscribe: mass admin UI * mass unsubscribe: mass admin UI @@ -1158,7 +1158,7 @@ function simplenews_unsubscribe_user($ma } if ($confirm) { - // Send confirmation email to user to complete unsubscription + // Send confirmation email to user to confirm unsubscribe // or to tell them that he or she is not subscribed // Confirmation mail is in the user preferred language. $params['from'] = _simplenews_set_from(); @@ -1449,7 +1449,7 @@ function simplenews_block_form_submit($f case 'unsubscribe': simplenews_unsubscribe_user($form_state['values']['mail'], $tid, $confirm, 'website'); if ($confirm) { - drupal_set_message(t('You will receive a confirmation email shortly containing further instructions on how to complete the unsubscription process.')); + drupal_set_message(t('You will receive a confirmation email shortly containing further instructions on how to cancel your subscription.')); } else { drupal_set_message(t('You have been unsubscribed.')); @@ -2295,16 +2295,16 @@ function simplenews_token_list($type = ' switch ($type) { case 'simplenews_subscription': - $tokens['simplenews']['simplenews-subscribe-url'] = t('URL of the subscription confirmation page'); - $tokens['simplenews']['simplenews-unsubscribe-url'] = t('URL of the unsubscription page'); + $tokens['simplenews']['simplenews-subscribe-url'] = t('URL of the subscribe confirmation page'); + $tokens['simplenews']['simplenews-unsubscribe-url'] = t('URL of the unsubscribe confirmation page'); $tokens['simplenews']['simplenews-receiver-mail'] = t('Email address of the newsletter receiver'); $tokens['simplenews']['simplenews-newsletters-name'] = t('The name of the newsletter series'); $tokens['simplenews']['simplenews-newsletters-url'] = t('URL of the taxonomy page listing the issues of this newsletter series'); break; case 'all': case 'simplenews': - $tokens['simplenews']['simplenews-subscribe-url'] = t('URL of the subscription confirmation page.'); - $tokens['simplenews']['simplenews-unsubscribe-url'] = t('URL of the unsubscription page'); + $tokens['simplenews']['simplenews-subscribe-url'] = t('URL of the subscribe confirmation page.'); + $tokens['simplenews']['simplenews-unsubscribe-url'] = t('URL of the unsubscribe confirmation page'); $tokens['simplenews']['simplenews-receiver-name'] = t('Username of the newsletter receiver or anonymous user name.'); $tokens['simplenews']['simplenews-receiver-mail'] = t('Email address of the newsletter receiver'); $tokens['simplenews']['simplenews-newsletter-url'] = t('URL of this newsletter issue'); @@ -2336,7 +2336,7 @@ function simplenews_token_values($type, $newsletter = $object['newsletter']; $language = isset($account->language->language) ? $account->language->language : language_default(); - // Build hash for subscription/unsubscription URL. + // Build hash for (un)subscribe URL. $hash = ''; if (isset($account->snid) && isset($newsletter->tid)) { $hash = _simplenews_generate_hash($account->mail, $account->snid, $newsletter->tid); @@ -2387,7 +2387,7 @@ function simplenews_help($path, $arg) { $help = "

". t('Simplenews publishes and sends newsletters to lists of subscribers. Both anonymous and authenticated users can opt-in to different mailing lists.') ."

\n"; $help .= "

". t('Simplenews uses nodes for newsletter issues. Newsletter issues are grouped by a newsletter taxonomy term. Node type and vocabulary are selectable. A newsletter is send to all email addresses which are subscribed to the newsletter. Newsletter issues can be sent only once. Large mailings should be sent by cron to balance the mailserver load.') ."

\n"; $help .= "

". t('Simplenews adds elements to the newsletter node add/edit form to manage newsletter format and sending of the newsletter issue. A newsletter issue can be sent for test before sending officially.') ."

\n"; - $help .= "

". t('Both anonymous and authenticated users can opt-in and opt-out to a newsletter. A confirmation message is sent to anonymous users at subscription and unsubscription. Users can (un)subscribe using a form and a block. A subscription block is available for each newsletter offering a subscription form, a link to recent newsletters and RSS feed. Email addresses can also be imported and exported via the subscription administration pages.') ."

\n"; + $help .= "

". t('Both anonymous and authenticated users can opt-in and opt-out to a newsletter. A confirmation message is sent to anonymous users when they (un)subscribe. Users can (un)subscribe using a form and a block. A subscription block is available for each newsletter offering a subscription form, a link to recent newsletters and RSS feed. Email addresses can also be imported and exported via the subscription administration pages.') ."

\n"; $help .= "

". t('Configuration') ."

\n"; $help .= "