diff --git a/mollom.admin.inc b/mollom.admin.inc index d113fc5..fef0925 100644 --- a/mollom.admin.inc +++ b/mollom.admin.inc @@ -188,6 +188,7 @@ function mollom_admin_configure_form($form, &$form_state, $mollom_form = NULL) { case 'configure': drupal_set_title(t('Configure %form-title protection', array('%form-title' => $mollom_form['title'])), PASS_THROUGH); + $recommended = t('recommended'); $form['mollom']['form_id'] = array( '#type' => 'value', @@ -195,8 +196,11 @@ function mollom_admin_configure_form($form, &$form_state, $mollom_form = NULL) { ); $modes = array(); - $modes[MOLLOM_MODE_ANALYSIS] = t('Text analysis'); - $modes[MOLLOM_MODE_CAPTCHA] = t('CAPTCHA'); + $modes[MOLLOM_MODE_ANALYSIS] = t('!option (!recommended)', array( + '!option' => t('Text analysis'), + '!recommended' => $recommended, + )); + $modes[MOLLOM_MODE_CAPTCHA] = t('CAPTCHA only'); $form['mollom']['mode'] = array( '#type' => 'radios', @@ -204,9 +208,13 @@ function mollom_admin_configure_form($form, &$form_state, $mollom_form = NULL) { '#options' => $modes, '#default_value' => isset($mollom_form['mode']) ? $mollom_form['mode'] : key($modes), ); + $form['mollom']['mode'][MOLLOM_MODE_ANALYSIS] = array( + '#description' => t('Mollom will analyze the posted content and will only show a CAPTCHA when necessary (and configured to do so).'), + ); $form['mollom']['mode'][MOLLOM_MODE_CAPTCHA] = array( - '#description' => t('Only choose CAPTCHA if text analysis is not suitable. Page caching is disabled on all pages containing CAPTCHA-only protected forms.'), + '#description' => t('A CAPTCHA will be shown for every post. Only choose this if there are too few text fields to analyze.'), ); + $form['mollom']['mode'][MOLLOM_MODE_CAPTCHA]['#description'] .= '
' . t('Note: The page cache is disabled on all pages containing CAPTCHA-only protected forms.'); $all_permissions = array(); foreach (module_implements('permission') as $module) { @@ -300,8 +308,11 @@ function mollom_admin_configure_form($form, &$form_state, $mollom_form = NULL) { '#type' => 'radios', '#title' => t('Text analysis strictness'), '#options' => array( + 'normal' => t('!option (!recommended)', array( + '!option' => t('Normal'), + '!recommended' => $recommended, + )), 'strict' => t('Strict: Posts are more likely classified as spam'), - 'normal' => t('Normal'), 'relaxed' => t('Relaxed: Posts are more likely classified as ham'), ), '#default_value' => $mollom_form['strictness'], @@ -317,7 +328,10 @@ function mollom_admin_configure_form($form, &$form_state, $mollom_form = NULL) { '#title' => t('When text analysis is unsure'), '#default_value' => $mollom_form['unsure'], '#options' => array( - 'captcha' => t('Show a CAPTCHA'), + 'captcha' => t('!option (!recommended)', array( + '!option' => t('Show a CAPTCHA'), + '!recommended' => $recommended, + )), 'moderate' => t('Retain the post for manual moderation'), 'binary' => t('Accept the post'), ), @@ -338,8 +352,11 @@ function mollom_admin_configure_form($form, &$form_state, $mollom_form = NULL) { '#title' => t('When text analysis identifies spam'), '#default_value' => $mollom_form['discard'], '#options' => array( + 1 => t('!option (!recommended)', array( + '!option' => t('Discard the post'), + '!recommended' => $recommended, + )), 0 => t('Retain the post for manual moderation'), - 1 => t('Discard the post'), ), '#required' => $mollom_form['mode'] == MOLLOM_MODE_ANALYSIS, // Only possible for forms supporting moderation of unpublished posts.