From 385869aea17f1fb0017b16914cd9af90de4c817e Mon Sep 17 00:00:00 2001 From: sun Date: Sun, 31 Mar 2013 23:04:22 +0200 Subject: [PATCH] - #1957516 by sun: Updated administrative user interface strings. --- mollom.admin.inc | 38 ++++++++++++++++++++------------------ mollom.module | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/mollom.admin.inc b/mollom.admin.inc index 62098cf..ca77782 100644 --- a/mollom.admin.inc +++ b/mollom.admin.inc @@ -317,15 +317,18 @@ function mollom_admin_configure_form(&$form_state, $mollom_form = NULL) { $form['mollom']['moderation'] = array( '#type' => 'checkbox', - '#title' => t('Allow content to be moderated from the hosted @moderation-product', array( - '@moderation-url' => 'http://mollom.com/moderation', - '@moderation-product' => 'Mollom moderation system', + '#title' => t('Allow content to be moderated from the @moderation-product', array( + '@moderation-url' => '//mollom.com/moderation', + '@moderation-product' => 'Mollom Content Moderation Platform', )), '#default_value' => $mollom_form['moderation'], // Only possible for forms which result in a locally stored entity. '#access' => !empty($mollom_form['entity']), - '#description' => t('Provides a unified moderation interface, supporting multiple sites, moderation teams, and detailed analytics.'), + '#description' => t('Provides a unified moderation interface supporting multiple sites, moderation teams, and detailed analytics.'), ); + $form['mollom']['moderation']['#description'] .= '
' . t('Note: All content that was created while this option was disabled cannot be moderated from the @moderation-product; only new content will appear.', array( + '@moderation-product' => 'Mollom Content Moderation Platform', + )); $form['actions']['submit'] = array( '#type' => 'submit', @@ -713,10 +716,9 @@ function mollom_admin_settings(&$form_state) { $form['access-keys'] = array( '#type' => 'fieldset', '#title' => t('Access keys'), - '#description' => t('To use Mollom, you need a public and private key. To obtain your keys, register and login on mollom.com, and create a subscription for your site. Once you created a subscription, copy your private and public access keys from the site manager into the form fields below, and you are ready to go.', array( - '@mollom-login-url' => 'http://mollom.com/user', - '@mollom-manager-add-url' => 'http://mollom.com/site-manager/add', - '@mollom-manager-url' => 'http://mollom.com/site-manager', + '#description' => t('To use Mollom, you need a public and private key. To obtain Mollom API keys, register and login on mollom.com, create a subscription for your site, and copy the API keys from your site manager into the fields below.', array( + '@mollom-login-url' => '//mollom.com/user', + '@mollom-manager-url' => '//mollom.com/site-manager', )), '#collapsible' => TRUE, // Only show key configuration fields if they are not configured or invalid. @@ -730,7 +732,7 @@ function mollom_admin_settings(&$form_state) { '#title' => t('Public key'), '#default_value' => $mollom->loadConfiguration('publicKey'), '#element_validate' => array('mollom_admin_settings_validate_key'), - '#description' => t('Used to uniquely identify you.'), + '#description' => t('Used to uniquely identify this site.'), // Expose this input element as 'mollom_public_key', but ensure // system_settings_form_submit() saves it into the class-specific variable. '#name' => 'mollom_public_key', @@ -757,18 +759,18 @@ function mollom_admin_settings(&$form_state) { MOLLOM_FALLBACK_BLOCK => t('Block all form submissions'), MOLLOM_FALLBACK_ACCEPT => t('Accept all form submissions'), ), - '#description' => t('In case the Mollom services are unreachable, no text analysis can be performed and no CAPTCHAs can be generated. Subscribers to Mollom Plus receive access to Mollom\'s high-availability backend infrastructure, not available to free users, reducing potential downtime.', array( - '@pricing-url' => 'http://mollom.com/pricing', - '@sla-url' => 'http://mollom.com/standard-service-level-agreement', + '#description' => t('In case Mollom services are unreachable, no text analysis can be performed and no CAPTCHAs can be generated. Customers on paid plans have access to Mollom\'s high-availability backend infrastructure, not available to free users, reducing potential downtime.', array( + '@pricing-url' => '//mollom.com/pricing', + '@sla-url' => '//mollom.com/standard-service-level-agreement', )), ); $form['mollom_moderation_redirect'] = array( '#type' => 'checkbox', - '#title' => t('Redirect local moderation pages to the hosted @moderation-product', array( + '#title' => t('Redirect local moderation pages to the @moderation-product', array( '@local-moderation-url' => url('admin/content/comment'), - '@moderation-url' => 'http://mollom.com/moderation', - '@moderation-product' => 'Mollom moderation system', + '@moderation-url' => '//mollom.com/moderation', + '@moderation-product' => 'Mollom Content Moderation Platform', )), '#return_value' => 1, '#default_value' => variable_get('mollom_moderation_redirect', 0), @@ -780,9 +782,9 @@ function mollom_admin_settings(&$form_state) { '#return_value' => 1, '#default_value' => variable_get('mollom_privacy_link', 1), '#description' => t('Displays a link to the recommended privacy policy on mollom.com on all forms that are protected via textual analysis. When disabling this option, you are required to inform visitors about data privacy through other means, as stated in the terms of service.', array( - '@privacy-policy-url' => 'http://mollom.com/web-service-privacy-policy', + '@privacy-policy-url' => '//mollom.com/web-service-privacy-policy', '@help-url' => url('admin/help/mollom'), - '@terms-of-service-url' => 'http://mollom.com/terms-of-service', + '@terms-of-service-url' => '//mollom.com/terms-of-service', )), ); @@ -790,7 +792,7 @@ function mollom_admin_settings(&$form_state) { '#type' => 'checkbox', '#title' => t('Enable testing mode'), '#default_value' => variable_get('mollom_testing_mode', 0), - '#description' => t('Submitting "ham", "unsure", or "spam" on a protected form will trigger the corresponding behavior, and similarly, word verifications will only respond to "correct" and "incorrect", instead of the actual characters asked for. This option should be disabled in production environments.'), + '#description' => t('Submitting "ham", "unsure", or "spam" on a protected form will trigger the corresponding behavior. Image CAPTCHAs will only respond to "correct" and audio CAPTCHAs only respond to "demo". This option should be disabled in production environments.'), ); return system_settings_form($form); diff --git a/mollom.module b/mollom.module index e91a6d1..5a3d357 100644 --- a/mollom.module +++ b/mollom.module @@ -56,24 +56,33 @@ function mollom_help($path, $arg) { if ($path == 'admin/help#mollom') { $output = '

'; - $output .= t("Allowing users to react, participate and contribute while still keeping your site's content under control can be a huge challenge. Mollom is a web service that helps you identify content quality and, more importantly, helps you stop spam. When content moderation becomes easier, you have more time and energy to interact with your web community. More information about Mollom is available on the Mollom website or in the Mollom FAQ.", - array( - '@mollom-website' => 'http://mollom.com', - '@mollom-faq' => 'http://mollom.com/faq', - ) - ); + $output .= t('Allowing users to react, participate and contribute while still keeping your site\'s content under control can be a huge challenge. Mollom is a web service that helps you identify content quality and, most importantly, helps you stop spam. When content moderation becomes easier, you have more time and energy to interact with your site visitors and community. For more information, see How Mollom Works and the Mollom FAQ.', array( + '@mollom-website' => '//mollom.com', + '@mollom-works' => '//mollom.com/how-mollom-works', + '@mollom-faq' => '//mollom.com/faq', + )); $output .= '

'; - $output .= t("Mollom can be used to block all types of spam received on your website's protected forms. Each form can be set to one of the following options:"); - $output .= '

'; - $output .= t("Data is processed and stored as explained in our Web Service Privacy Policy. It is your responsibility to provide any necessary notices and obtain the appropriate consent regarding Mollom's use of your data. For more information, see How Mollom Works and the Mollom FAQ.", array( - '@mollom-privacy' => 'http://mollom.com/service-agreement-free-subscriptions', - '@mollom-works' => 'http://mollom.com/how-mollom-works', - '@mollom-faq' => 'http://mollom.com/faq') - ); + $output .= t('Mollom can protect forms your site from unwanted posts. Each form can be set to one of the following options:'); + $output .= '

'; + $output .= t('Data is processed and stored as explained in the Mollom Web Service Privacy Policy. It is your responsibility to provide necessary notices and obtain the appropriate consent regarding Mollom\'s use of submitted data.', array( + '@mollom-privacy' => '//mollom.com/web-service-privacy-policy', + '@mollom-works' => '//mollom.com/how-mollom-works', + '@mollom-faq' => '//mollom.com/faq', + )); + $output .= '

'; + $output .= '

'; + $output .= t('If Mollom may not block a spam post for any reason, you can help to train and improve its filters by choosing the appropriate feedback option when deleting the post on your site.'); $output .= '

'; $output .= '

' . t('Mollom blacklist') . '

'; $output .= '

'; -- 1.7.11.msysgit.1