Merge branch '3.4' into 3

ENH Update translations

.upgrade.yml

@@ -0,0 +1,11 @@
+mappings:
+  SpamProtector: SilverStripe\SpamProtection\SpamProtector
+  CommentSpamProtection: SilverStripe\SpamProtection\Extension\CommentSpamProtection
+  EditableSpamProtectionField: SilverStripe\SpamProtection\EditableSpamProtectionField
+  FormSpamProtectionExtension: SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension
+  EditableSpamProtectionFieldTest: SilverStripe\SpamProtection\Tests\EditableSpamProtectionFieldTest
+  EditableSpamProtectionFieldTest_Protector: SilverStripe\SpamProtection\Tests\Stub\Protector
+  FormSpamProtectionExtensionTest: SilverStripe\SpamProtection\Tests\FormSpamProtectionExtensionTest
+  FormSpamProtectionExtensionTest_BarProtector: SilverStripe\SpamProtection\Tests\Stub\BarProtector
+  FormSpamProtectionExtensionTest_BazProtector: SilverStripe\SpamProtection\Tests\Stub\BazProtector
+  FormSpamProtectionExtensionTest_FooProtector: SilverStripe\SpamProtection\Tests\Stub\FooProtector

README.md

@@ -3,12 +3,6 @@
 [![CI](https://github.com/silverstripe/silverstripe-spamprotection/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-spamprotection/actions/workflows/ci.yml)
 [![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
-## Installation
-
-```sh
-composer require silverstripe/spamprotection
-```
-
 ## Maintainer Contact
 
  * Saophalkun Ponlu
@@ -17,6 +11,16 @@ composer require silverstripe/spamprotection
  * Will Rossiter
    <will (at) fullscreen (dot) io>
 
+## Requirements
+
+Silverstripe 4.0+
+
+**Note:** For Silverstripe 3.x, please use the [2.x release line](https://github.com/silverstripe/silverstripe-spamprotection/tree/2.0).
+
+## Install
+
+To install run `composer require silverstripe/spamprotection`.
+
 ## Documentation
 
 This module provides a generic, consistent API for adding spam protection to

composer.json

@@ -17,14 +17,14 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "silverstripe/framework": "^5"
+        "php": "^7.4 || ^8.0",
+        "silverstripe/framework": "^4.10"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "silverstripe/versioned": "^2",
-        "squizlabs/php_codesniffer": "^3",
-        "silverstripe/userforms": "^6"
+        "silverstripe/versioned": "^1.0",
+        "squizlabs/php_codesniffer": "^3.0",
+        "silverstripe/userforms": "^5"
     },
     "extra": {
         "expose": [

lang/en.yml

@@ -7,3 +7,4 @@ en:
     SINGULARNAME: 'Spam Protection Field'
     SPAMFIELDMAPPING: 'Spam Field Mapping'
     SPAMFIELDMAPPINGDESCRIPTION: 'Select the form fields that correspond to any relevant spam protection identifiers'
+    db_SpamFieldSettings: 'Spam field settings'

lang/eo.yml

@@ -7,3 +7,4 @@ eo:
     SINGULARNAME: 'Spamprotekta kampo'
     SPAMFIELDMAPPING: 'Spamkampa mapigo'
     SPAMFIELDMAPPINGDESCRIPTION: 'Elektu la kampojn kiuj rilatas al eventualaj rilataj spamprotektaj identigiloj'
+    db_SpamFieldSettings: 'Spamkampaj agordoj'

lang/it.yml

@@ -2,9 +2,9 @@ it:
   SilverStripe\SpamProtection\EditableSpamProtectionField:
     PLURALNAME: 'Campi di Prevenzione Spam'
     PLURALS:
+      many: '{count} Campi di Prevenzione Spam'
       one: 'Un Campo di Prevenzione Spam'
       other: '{count} Campi di Prevenzione Spam'
-      many: '{count} Campi di Prevenzione Spam'
     SINGULARNAME: 'Campo di Prevenzione Spam'
     SPAMFIELDMAPPING: 'Mappatura Campo Spam'
     SPAMFIELDMAPPINGDESCRIPTION: 'Selezionare i campi della form che forniscono una qualche protezione dallo spam'

lang/sk.yml

@@ -1,6 +1,12 @@
 sk:
   SilverStripe\SpamProtection\EditableSpamProtectionField:
     PLURALNAME: 'Polia ochrany proti spamu'
+    PLURALS:
+      few: '{count} polia ochrany proti spamu'
+      many: '{count} polí ochrany proti spamu'
+      one: 'Pole ochrany proti spamu'
+      other: '{count} polí ochrany proti spamu'
     SINGULARNAME: 'Pole ochrany proti spamu'
     SPAMFIELDMAPPING: 'Mapovanie spamového poľa'
     SPAMFIELDMAPPINGDESCRIPTION: 'Vyberte polia formulára, ktoré zodpovedajú všetkým príslušným identifikátorom ochrany proti spamu'
+    db_SpamFieldSettings: 'Nastavenia poľa spamu'

legacy.yml

@@ -0,0 +1,6 @@
+---
+Name: spamprotectionlegacy
+---
+SilverStripe\ORM\DatabaseAdmin:
+  classname_value_remapping:
+    EditableSpamProtectionField: 'SilverStripe\SpamProtection\EditableSpamProtectionField'