Merge branch '3.1' into 3

This commit is contained in:
Steve Boyd 2021-05-21 14:03:17 +12:00
commit 9c9900f75a
8 changed files with 54 additions and 17 deletions

View File

@ -2,14 +2,20 @@
"name": "silverstripe/spamprotection", "name": "silverstripe/spamprotection",
"description": "Spam protection module for SilverStripe.", "description": "Spam protection module for SilverStripe.",
"type": "silverstripe-vendormodule", "type": "silverstripe-vendormodule",
"keywords": ["silverstripe", "spamprotection"], "keywords": [
"authors": [{ "silverstripe",
"name": "Saophalkun Ponlu", "spamprotection"
"email": "phalkunz@silverstripe.com" ],
}, { "authors": [
"name": "Will Rossiter", {
"email": "will@fullscreen.io" "name": "Saophalkun Ponlu",
}], "email": "phalkunz@silverstripe.com"
},
{
"name": "Will Rossiter",
"email": "will@fullscreen.io"
}
],
"require": { "require": {
"silverstripe/framework": "^4.0" "silverstripe/framework": "^4.0"
}, },
@ -21,10 +27,7 @@
"extra": { "extra": {
"expose": [ "expose": [
"images" "images"
], ]
"branch-alias": {
"dev-master": "3.x-dev"
}
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -32,7 +35,7 @@
"SilverStripe\\SpamProtection\\Tests\\": "tests/" "SilverStripe\\SpamProtection\\Tests\\": "tests/"
} }
}, },
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true "prefer-stable": true
} }

9
lang/da.yml Normal file
View File

@ -0,0 +1,9 @@
da:
SilverStripe\SpamProtection\EditableSpamProtectionField:
PLURALNAME: 'Spam beskyttelsefelter'
PLURALS:
one: 'Et spam beskyttelsefelt'
other: '{count} Spambeskyttelsefelter'
SINGULARNAME: 'Spam beskyttelsesfelt'
SPAMFIELDMAPPING: 'Spam felt mapping'
SPAMFIELDMAPPINGDESCRIPTION: 'Vælg de formfelter der matcher relevante spam beskyttelses identifikatorer'

View File

@ -1,6 +1,9 @@
de: de:
SilverStripe\SpamProtection\EditableSpamProtectionField: SilverStripe\SpamProtection\EditableSpamProtectionField:
PLURALNAME: Spamschutzfelder PLURALNAME: Spamschutzfelder
PLURALS:
one: 'Ein Spamschutzfeld'
other: '{count} Spamschutzfelder'
SINGULARNAME: Spamschutzfeld SINGULARNAME: Spamschutzfeld
SPAMFIELDMAPPING: 'Spamschutzfeld Zuordnung' SPAMFIELDMAPPING: 'Spamschutzfeld Zuordnung'
SPAMFIELDMAPPINGDESCRIPTION: 'Wähle die Formularfelder, die mit Spamschutz verbunden sind' SPAMFIELDMAPPINGDESCRIPTION: 'Wähle die Formularfelder, die mit Spamschutz verbunden sind'

View File

@ -1,6 +1,9 @@
eo: eo:
SilverStripe\SpamProtection\EditableSpamProtectionField: SilverStripe\SpamProtection\EditableSpamProtectionField:
PLURALNAME: 'Spamprotektaj kampoj' PLURALNAME: 'Spamprotektaj kampoj'
PLURALS:
one: 'Unu spamprotekta kampo'
other: '{count} spamprotektaj kampoj'
SINGULARNAME: 'Spamprotekta kampo' SINGULARNAME: 'Spamprotekta kampo'
SPAMFIELDMAPPING: 'Spamkampa mapigo' SPAMFIELDMAPPING: 'Spamkampa mapigo'
SPAMFIELDMAPPINGDESCRIPTION: 'Elektu la kampojn kiuj rilatas al eventualaj rilataj spamprotektaj identigiloj' SPAMFIELDMAPPINGDESCRIPTION: 'Elektu la kampojn kiuj rilatas al eventualaj rilataj spamprotektaj identigiloj'

View File

@ -1,6 +1,9 @@
fi: fi:
SilverStripe\SpamProtection\EditableSpamProtectionField: SilverStripe\SpamProtection\EditableSpamProtectionField:
PLURALNAME: 'Roskapostisuojauksen kentät' PLURALNAME: 'Roskapostisuojauksen kentät'
PLURALS:
one: 'Roskapostin suodatuskenttä'
other: '{count} Roskapostin suodatuskenttää'
SINGULARNAME: 'Roskapostisuojauksen kenttä' SINGULARNAME: 'Roskapostisuojauksen kenttä'
SPAMFIELDMAPPING: 'Roskapostikentän kuvaus' SPAMFIELDMAPPING: 'Roskapostikentän kuvaus'
SPAMFIELDMAPPINGDESCRIPTION: 'Valitse lomakekenttä, joka vastaa mitä tahansa oleellista roskapostisuodatuksen tunnistetta' SPAMFIELDMAPPINGDESCRIPTION: 'Valitse lomakekenttä, joka vastaa mitä tahansa oleellista roskapostisuodatuksen tunnistetta'

View File

@ -1,6 +1,9 @@
fi_FI: fi_FI:
SilverStripe\SpamProtection\EditableSpamProtectionField: SilverStripe\SpamProtection\EditableSpamProtectionField:
PLURALNAME: 'Roskapostisuotimen kentät' PLURALNAME: 'Roskapostisuojauksen kentät'
SINGULARNAME: 'Roskapostisuotimen kenttä' PLURALS:
one: 'Roskapostin suodatuskenttä'
other: '{count} Roskapostin suodatuskenttää'
SINGULARNAME: 'Roskapostisuojauksen kenttä'
SPAMFIELDMAPPING: 'Roskapostikentän kuvaus' SPAMFIELDMAPPING: 'Roskapostikentän kuvaus'
SPAMFIELDMAPPINGDESCRIPTION: 'Valitse lomakekentät, jotka vastaavat mitä tahansa oleellista roskapostisuotimen tunnistetta' SPAMFIELDMAPPINGDESCRIPTION: 'Valitse lomakekenttä, joka vastaa mitä tahansa oleellista roskapostisuodatuksen tunnistetta'

9
lang/nl.yml Normal file
View File

@ -0,0 +1,9 @@
nl:
SilverStripe\SpamProtection\EditableSpamProtectionField:
PLURALNAME: 'Anti-spam velden'
PLURALS:
one: 'Een anti-spam veld'
other: '{count} Anti-spam velden'
SINGULARNAME: 'Anti-spam veld'
SPAMFIELDMAPPING: 'Spam-velden koppelen'
SPAMFIELDMAPPINGDESCRIPTION: 'Kies de velden die overeenkomen met de anti-spam identifiers'

4
lang/sl.yml Normal file
View File

@ -0,0 +1,4 @@
sl:
SilverStripe\SpamProtection\EditableSpamProtectionField:
PLURALNAME: 'Polja za zaščito pred neželeno pošto'
SINGULARNAME: 'Polje za zaščito pred neželeno pošto'