Merge branch '3.4' into 3

ENH Update translations

.github/workflows/ci.yml

@@ -4,13 +4,8 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Saturday at 11:10am UTC
-  schedule:
-    - cron: '10 11 * * 6'
 
 jobs:
   ci:
     name: CI
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 11:10 AM UTC, only on Saturday and Sunday
+  schedule:
+    - cron: '10 11 * * 6,0'
+
+jobs:
+  dispatch-ci:
+    name: Dispatch CI
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch CI
+        uses: silverstripe/gha-dispatch-ci@v1

_config.php

@@ -1,14 +0,0 @@
-<?php
-
-/**
- * Default configuration settings for the Spam Protection module.
- *
- * You should not put your own configuration in here rather use your
- * mysite/_config.php file
- *
- * @package spamprotection
- */
-
-use SilverStripe\Dev\Deprecation;
-
-Deprecation::notification_version('3.0', 'spamprotection');

composer.json

@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "4.13.0-beta1"
+        "silverstripe/framework": "^4.10"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

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'