From c2c4342c01c8711c28d2ba0b9e57783319d45a3a Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Wed, 5 May 2021 11:17:33 +1200 Subject: [PATCH 1/2] MNT Remove obsolete branch-alias --- composer.json | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index a41a028..ce0f2a7 100644 --- a/composer.json +++ b/composer.json @@ -2,14 +2,20 @@ "name": "silverstripe/spamprotection", "description": "Spam protection module for SilverStripe.", "type": "silverstripe-vendormodule", - "keywords": ["silverstripe", "spamprotection"], - "authors": [{ - "name": "Saophalkun Ponlu", - "email": "phalkunz@silverstripe.com" - }, { - "name": "Will Rossiter", - "email": "will@fullscreen.io" - }], + "keywords": [ + "silverstripe", + "spamprotection" + ], + "authors": [ + { + "name": "Saophalkun Ponlu", + "email": "phalkunz@silverstripe.com" + }, + { + "name": "Will Rossiter", + "email": "will@fullscreen.io" + } + ], "require": { "silverstripe/framework": "^4.0" }, @@ -21,10 +27,7 @@ "extra": { "expose": [ "images" - ], - "branch-alias": { - "dev-master": "3.x-dev" - } + ] }, "autoload": { "psr-4": { @@ -32,7 +35,7 @@ "SilverStripe\\SpamProtection\\Tests\\": "tests/" } }, - "license": "BSD-3-Clause", + "license": "BSD-3-Clause", "minimum-stability": "dev", "prefer-stable": true -} +} \ No newline at end of file From ca6f507af825dc62f936e635622a4f58d23e3405 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Mon, 17 May 2021 15:09:54 +1200 Subject: [PATCH 2/2] Update translations --- lang/da.yml | 9 +++++++++ lang/de.yml | 3 +++ lang/eo.yml | 3 +++ lang/fi.yml | 3 +++ lang/fi_FI.yml | 9 ++++++--- lang/nl.yml | 9 +++++++++ lang/sl.yml | 4 ++++ 7 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 lang/da.yml create mode 100644 lang/nl.yml create mode 100644 lang/sl.yml diff --git a/lang/da.yml b/lang/da.yml new file mode 100644 index 0000000..56ef680 --- /dev/null +++ b/lang/da.yml @@ -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' diff --git a/lang/de.yml b/lang/de.yml index 06c7d4a..3ab1c1b 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -1,6 +1,9 @@ de: SilverStripe\SpamProtection\EditableSpamProtectionField: PLURALNAME: Spamschutzfelder + PLURALS: + one: 'Ein Spamschutzfeld' + other: '{count} Spamschutzfelder' SINGULARNAME: Spamschutzfeld SPAMFIELDMAPPING: 'Spamschutzfeld Zuordnung' SPAMFIELDMAPPINGDESCRIPTION: 'Wähle die Formularfelder, die mit Spamschutz verbunden sind' diff --git a/lang/eo.yml b/lang/eo.yml index e41380c..2ea758f 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -1,6 +1,9 @@ eo: SilverStripe\SpamProtection\EditableSpamProtectionField: PLURALNAME: 'Spamprotektaj kampoj' + PLURALS: + one: 'Unu spamprotekta kampo' + other: '{count} spamprotektaj kampoj' SINGULARNAME: 'Spamprotekta kampo' SPAMFIELDMAPPING: 'Spamkampa mapigo' SPAMFIELDMAPPINGDESCRIPTION: 'Elektu la kampojn kiuj rilatas al eventualaj rilataj spamprotektaj identigiloj' diff --git a/lang/fi.yml b/lang/fi.yml index bc9c359..d412cc4 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -1,6 +1,9 @@ fi: SilverStripe\SpamProtection\EditableSpamProtectionField: PLURALNAME: 'Roskapostisuojauksen kentät' + PLURALS: + one: 'Roskapostin suodatuskenttä' + other: '{count} Roskapostin suodatuskenttää' SINGULARNAME: 'Roskapostisuojauksen kenttä' SPAMFIELDMAPPING: 'Roskapostikentän kuvaus' SPAMFIELDMAPPINGDESCRIPTION: 'Valitse lomakekenttä, joka vastaa mitä tahansa oleellista roskapostisuodatuksen tunnistetta' diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml index cd10e41..9afa2a3 100644 --- a/lang/fi_FI.yml +++ b/lang/fi_FI.yml @@ -1,6 +1,9 @@ fi_FI: SilverStripe\SpamProtection\EditableSpamProtectionField: - PLURALNAME: 'Roskapostisuotimen kentät' - SINGULARNAME: 'Roskapostisuotimen kenttä' + PLURALNAME: 'Roskapostisuojauksen kentät' + PLURALS: + one: 'Roskapostin suodatuskenttä' + other: '{count} Roskapostin suodatuskenttää' + SINGULARNAME: 'Roskapostisuojauksen kenttä' 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' diff --git a/lang/nl.yml b/lang/nl.yml new file mode 100644 index 0000000..79cff61 --- /dev/null +++ b/lang/nl.yml @@ -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' diff --git a/lang/sl.yml b/lang/sl.yml new file mode 100644 index 0000000..cfd3ba4 --- /dev/null +++ b/lang/sl.yml @@ -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'