--- subscription.module 2005-09-02 14:21:02.000000000 -0400 +++ subscription.module.new 2005-09-06 23:55:34.000000000 -0400 @@ -4,7 +4,7 @@ function subscription_help($section) { switch ($section) { case 'admin/modules#description': - $output = t("Enables subscribe to contents."); + $output = t("Enables subscription to content."); break; } return $output; @@ -23,12 +23,12 @@ 'callback' => 'subscription_list', 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'subscription/add', - 'title' => t('Subscribe to a content'), + 'title' => t('Subscribe to content'), 'access' => user_access('manage subscriptions'), 'callback' => 'subscription_subscribe', 'type' => MENU_CALLBACK); $items[] = array('path' => 'subscription/del', - 'title' => t('Unsubscribe from a content'), + 'title' => t('Unsubscribe from content'), 'access' => user_access('manage subscriptions'), 'callback' => 'subscription_unsubscribe', 'type' => MENU_CALLBACK); @@ -89,7 +89,7 @@ $new_objects['comment'] = $comments; return array($new_objects); case 'special': - return '

'.l(t("Subscribe to all of comments"), 'subscription/add/comment').'

'; + return '

'.l(t("Subscribe to all comments"), 'subscription/add/comment').'

'; } } /** @@ -176,20 +176,20 @@ $name = node_invoke($node, 'node_name'); if ($main) { if (arg(0) == 'taxonomy' && arg(1) == 'term') { - $links[] = l(t('subscribe to this category'), 'subscription/add/taxonomy/'. arg(2), array('title' => t('Receive an e-mail whenever a comment is posted to this %n.', array('%n' => $name)))); + $links[] = l(t('subscribe to this category'), 'subscription/add/taxonomy/'. arg(2), array('title' => t('Receive e-mail whenever a comment is posted to this %n.', array('%n' => $name)))); } else { - $links[] = l(t('subscribe '.$node->type.'s'), 'subscription/add/node/'. $node->type, array('title' => t('Receive an e-mail whenever a comment is posted to this %n.', array('%n' => $name)))); + $links[] = l(t('subscribe to'.$node->type.'s'), 'subscription/add/node/'. $node->type, array('title' => t('Receive e-mail whenever a comment is posted to this %n.', array('%n' => $name)))); } } else { // Attention, we use $node, because $node is about some format as $comment // ex. exists an 'uid' key if (subscription_subscribed('comment', $node)) { - $links[] = l(t('unsubscribe'), 'user/'.$user->uid.'/subscriptions', array('title' => t('Stop receiving an e-mail whenever a new comment is posted to here.'))); + $links[] = l(t('unsubscribe'), 'user/'.$user->uid.'/subscriptions', array('title' => t('Stop receiving e-mail whenever a new comment is posted here.'))); } else { - $links[] = l(t('subscribe comments'), 'subscription/add/comment/'. $node->nid, array('title' => t('Receive an e-mail whenever a comment is posted to here.'))); + $links[] = l(t('subscribe to comments'), 'subscription/add/comment/'. $node->nid, array('title' => t('Receive e-mail whenever a comment is posted here.'))); } } } @@ -499,19 +499,19 @@ 'subscription_channel', subscription_get_default_channel(), $channel_select, - t('Select the currnet destination of subscriptions.')); + t('Select the current destination for subscriptions.')); $group .= form_checkbox(t('Automatically subscribe to threads in which you post.'), 'subscription_auto', 1, isset($edit->subscriptions_auto) ? $edit->subscriptions_auto : $user->subscriptions_auto, - t('Checking this box allows you to be automatically subscribe to any thread you create or post a comment to.')); + t('Checking this box allows you to be automatically subscribed to any thread you create, or post a comment to.')); } return array(array('title '=> t('Subscription settings'), 'data' => $group, 'weight' => 2)); case 'view': if (user_access('manage subscriptions')) { return array(t('Subscribe') => '

'.l(t("Subscribe to content created by this user"), 'subscription/add/user/all/' . $user->uid).'

' . - '

'.l(t("Subscribe to commments witch attached to user contents"), 'subscription/add/user/comment/' . $user->uid).'

'); + '

'.l(t("Subscribe to commments attached to user's content"), 'subscription/add/user/comment/' . $user->uid).'

'); } } } @@ -580,12 +580,12 @@ $page .= form($form); } else { - $page .= t("Currently there isn't any subscription."); + $page .= t("Currently there are no subscriptions."); } $page .= "

".t("There is an OR relationship between the lines. If you would like to use" . - " AND relationships you should use merge button.")."

". - $page .= "

".t("Depend on the channels maybe you receive one message per channels with all of events.")."

"; - $page .= "

".t("You can change the susbcription target channel from your ").l(t("asd"),'user/'.$user->uid.'/subscription')."

"; + " AND relationships, use the 'Merge' button.")."

"; + $page .= "

".t("Depending on the channels used, you may receive one message per channel with all events.")."

"; + $page .= "

".t("You can change the subscription target channel from your ").l(t("subscription management page"),'user/'.$user->uid.'/subscription')."

"; $page .= "

". t("Available special subscriptions") ."

"; $page .= implode(" ", module_invoke_all('subscription', 'special')); @@ -610,11 +610,11 @@ * Settings menu to the administration section */ function subscription_settings() { - $output = form_select(t('Default mode for non diggest events'), + $output = form_select(t('Default mode for non-digest events'), 'subscription_instant_mode', variable_get('subscription_instant_mode', 0), array('0' => 'instant (small sites)', '1' => 'cronned (big sites)'), - t('When look for new contents. After somebody created the content (suggest to small sites), or with most frequent cron time (suggest with big sites) ')); + t('When to look for new content: immediately after content is created (suggested for small sites), or with most frequent cron time (suggested for big sites) ')); return $output; } /* DEFAULT CHANNELS */ @@ -651,7 +651,7 @@ */ function subscription_simpleformat($objects, $channel) { $global_header = - t("There are new contents:") ."\n\n". + t("There is new content:") ."\n\n". ""; $group_header = "========================================================================\n".