Skip to content

Commit

Permalink
Make reCAPTCHA settings clearer
Browse files Browse the repository at this point in the history
  • Loading branch information
mattwire committed May 30, 2020
1 parent 48b3a75 commit dea7a35
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 5 deletions.
22 changes: 22 additions & 0 deletions Civi/Api4/Membership.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

/*
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC. All rights reserved. |
| |
| This work is published under the GNU AGPLv3 license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/

namespace Civi\Api4;

/**
* ContributionRecur entity.
*
* @package Civi\Api4
*/
class MembershipType extends Generic\DAOEntity {

}
22 changes: 22 additions & 0 deletions Civi/Api4/MembershipType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

/*
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC. All rights reserved. |
| |
| This work is published under the GNU AGPLv3 license with some |
| permitted exceptions and without any warranty. For full license |
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/

namespace Civi\Api4;

/**
* ContributionRecur entity.
*
* @package Civi\Api4
*/
class ContributionRecur extends Generic\DAOEntity {

}
6 changes: 3 additions & 3 deletions settings/Core.setting.php
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@
'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>.'),
Expand All @@ -563,7 +563,7 @@
'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,
Expand Down Expand Up @@ -597,7 +597,7 @@
'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,
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
</tr>
</table>

<h3>{ts}reCAPTCHA Keys{/ts}</h3>
<h3>{ts}reCAPTCHA v2 Checkbox{/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}
</div>
<table class="form-layout">
<tr class="crm-miscellaneous-form-block-recaptchaPublicKey">
Expand Down

0 comments on commit dea7a35

Please sign in to comment.