Merge pull request #17426 from mattwire/recaptcha

Make reCAPTCHA settings clearer

settings/Core.setting.php

@@ -544,7 +544,7 @@ return [
     'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => ts('Recaptcha Options'),
+    'title' => ts('reCAPTCHA Options'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => ts('You can specify the reCAPTCHA theme options as comma separated data.(eg: theme:\'blackglass\', lang : \'fr\' ). Check the available options at <a href="https://developers.google.com/recaptcha/docs/display#config">Customizing the Look and Feel of reCAPTCHA</a>.'),
@@ -563,7 +563,7 @@ return [
     'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => ts('Recaptcha Site Key'),
+    'title' => ts('reCAPTCHA Site Key'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -597,7 +597,7 @@ return [
     'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => ts('Recaptcha Secret Key'),
+    'title' => ts('reCAPTCHA Secret Key'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,

templates/CRM/Admin/Form/Setting/Miscellaneous.tpl

@@ -77,10 +77,10 @@
       </tr>
     </table>
 
-    <h3>{ts}reCAPTCHA Keys{/ts}</h3>
-
+    <h3>{ts}reCAPTCHA v2{/ts}</h3>
     <div class="description">
-      {ts 1='href="https://www.google.com/recaptcha" target="_blank"'}reCAPTCHA is a free service that helps prevent automated abuse of your site. To use reCAPTCHA on public-facing CiviCRM forms: sign up at <a %1>Google's reCaptcha site</a>; enter the provided public and private reCAPTCHA keys here; then enable reCAPTCHA under Advanced Settings in any Profile.{/ts}
+      {ts 1='href="https://www.google.com/recaptcha" target="_blank"'}reCAPTCHA is a free service that helps prevent automated abuse of your site. To use it on public-facing CiviCRM forms: sign up at <a %1>Google's reCaptcha site</a>; enter the provided public and private keys here; then enable reCAPTCHA under Advanced Settings in any Profile.{/ts}
+      <br/><strong>{ts}Only the reCAPTCHA v2 checkbox type is supported.{/ts}</strong>
     </div>
     <table class="form-layout">
       <tr class="crm-miscellaneous-form-block-recaptchaPublicKey">