[#540] renamed blacklist to blocklist

CRM/Sepa/Logic/Verification.php

@@ -74,9 +74,9 @@ public static function formatBIC($bic, $type = 'SEPA') {
    * @return NULL if given IBAN is valid, localized error message otherwise
    */
   public static function verifyIBAN($iban, $type = 'SEPA') {
-    // first: check if blacklisted (#540)
-    if (self::isIbanBlacklisted($iban)) {
-      return E::ts("IBAN is blacklisted");
+    // first: check if blocklisted (#540)
+    if (self::isIbanBlocklisted($iban)) {
+      return E::ts("IBAN is blocklisted");
     }
 
     switch ($type) {
@@ -106,26 +106,26 @@ public static function verifyIBAN($iban, $type = 'SEPA') {
   }
 
   /**
-   * Check if this IBAN is blacklisted
+   * Check if this IBAN is blocklisted
    *
    * @param $iban string IBAN to check
    * @return boolean
    */
-  public static function isIbanBlacklisted($iban) {
-    static $blacklist = NULL;
-    if ($blacklist === NULL) {
+  public static function isIbanBlocklisted($iban) {
+    static $blocklist = NULL;
+    if ($blocklist === NULL) {
       // we have to check whether the group exists first, getOptionValuesAssocArrayFromName doesn't do that
-      $blacklist = [];
+      $blocklist = [];
       $query = civicrm_api3('OptionValue', 'get', [
           'option_group_id' => 'iban_blacklist',
           'option.limit'    => 0,
           'return'          => 'value'
       ]);
       foreach ($query['values'] as $value) {
-        $blacklist[$value['value']] = 1;
+        $blocklist[$value['value']] = 1;
       }
     }
-    return isset($blacklist[$iban]);
+    return isset($blocklist[$iban]);
   }
 
   /**

CRM/Sepa/Upgrader.php

@@ -217,7 +217,7 @@ public function upgrade_1501() {
    * @throws Exception
    */
   public function upgrade_1502() {
-    $this->ctx->log->info('Adding IBAN Blacklist');
+    $this->ctx->log->info('Adding IBAN Blocklist');
     $customData = new CRM_Sepa_CustomData('org.project60.sepa');
     $customData->syncOptionGroup(E::path('resources/iban_blacklist_option_group.json'));
     return TRUE;

l10n/de_DE/LC_MESSAGES/sepa.po

@@ -1091,8 +1091,8 @@ msgid "Incomplete Donation"
 msgstr "Unvollständige Zuwendung"
 
 #: CRM/Sepa/Logic/Verification.php
-msgid "IBAN is blacklisted"
-msgstr "IBAN ist auf der schwarzen Liste"
+msgid "IBAN is blocklisted"
+msgstr "IBAN ist auf der Blockliste"
 
 #: CRM/Sepa/Logic/Verification.php
 #: templates/CRM/Admin/Form/Setting/SepaSettings.tpl
@@ -3244,10 +3244,8 @@ msgid "The mandate is not in the transaction group anymore but should be."
 msgstr ""
 
 #: tests/phpunit/CRM/Sepa/MandateTerminationTest.php
-#, fuzzy
-#| msgid "This is not a correct BIC."
 msgid "The end date is not correct."
-msgstr "Das ist keine gültige BIC."
+msgstr "Das Enddatum ist nicht korrekt"
 
 #: tests/phpunit/CRM/Sepa/MandateTerminationTest.php
 msgid "The mandate has been incorrectly regrouped."
@@ -3360,16 +3358,12 @@ msgid "Nonexistent BIC detection fails!"
 msgstr ""
 
 #: tests/phpunit/CRM/Sepa/VerifyBicTest.php
-#, fuzzy
-#| msgid "Incorrect date format"
 msgid "Incorrect BIC detection fails!"
-msgstr "Falsches Datumsformat."
+msgstr ""
 
 #: tests/phpunit/CRM/Sepa/VerifyIbanTest.php
-#, fuzzy
-#| msgid "Incorrect date format"
 msgid "Incorrect IBAN detection fails!"
-msgstr "Falsches Datumsformat."
+msgstr ""
 
 #: tests/phpunit/CRM/Sepa/VerifyIbanTest.php
 msgid "Incorrect bank code detection fails!"
@@ -3388,7 +3382,7 @@ msgid "Incorrect char in IBAN detection fails!"
 msgstr ""
 
 #: tests/phpunit/CRM/Sepa/VerifyIbanTest.php
-msgid "Blacklistet IBAN should fail but did not!"
+msgid "Blocklistet IBAN should fail but did not!"
 msgstr ""
 
 #~ msgid "Hide BIC in PP"

l10n/org.project60.sepa.pot

@@ -1065,7 +1065,7 @@ msgid "Incomplete Donation"
 msgstr ""
 
 #: CRM/Sepa/Logic/Verification.php
-msgid "IBAN is blacklisted"
+msgid "IBAN is blocklisted"
 msgstr ""
 
 #: CRM/Sepa/Logic/Verification.php
@@ -3136,5 +3136,5 @@ msgid "Incorrect char in IBAN detection fails!"
 msgstr ""
 
 #: tests/phpunit/CRM/Sepa/VerifyIbanTest.php
-msgid "Blacklistet IBAN should fail but did not!"
+msgid "Blocklistet IBAN should fail but did not!"
 msgstr ""

resources/iban_blacklist_option_group.json

@@ -2,15 +2,15 @@
   "_lookup": ["name"],
   "_translate": ["title"],
   "name": "iban_blacklist",
-  "title": "IBAN Blacklist",
+  "title": "IBAN Blocklist",
   "is_reserved": 0,
   "is_enabled": 1,
   "is_locked": 0,
   "_values": [
     {
       "_lookup": ["value"],
       "_translate": ["label"],
-      "label": "Blacklist Example",
+      "label": "Blocklist Example",
       "value": "DE27100777770209299700"
     }
   ]

tests/TestCases.md

@@ -41,7 +41,7 @@ TODO: more complex batching scenarios
 | V02     |  PASS  | creditor_type=PSP | Validate BICs | Creating mandates with various valid/invalid BICs, assert that all creations pass |
 | V03     |  PASS  | default       | Validate IBANs | Creating mandates with various valid/invalid IBANs, assert that with invalid ones the creation causes an error |
 | V04     |  PASS  | creditor_type=PSP | Validate IBANs | Creating mandates with various valid/invalid IBANs, assert that all creations pass |
-| V05     |  PASS  | default | Validate Blacklist | Add some example IBANs to the black list, assert that creation with those IBANs fail, while other (valid) IBANs pass |
+| V05     |  PASS  | default | Validate Blocklist | Add some example IBANs to the block list, assert that creation with those IBANs fail, while other (valid) IBANs pass |
 
 
 ## Generated Files

tests/phpunit/CRM/Sepa/TestBase.php

@@ -281,10 +281,10 @@ protected function setSepaConfiguration(string $key, $value): void
 
 
   /**
-   * Add an IBAN to the blacklist.
+   * Add an IBAN to the blocklist.
    * @param string $iban The IBAN.
    */
-  protected function addIbanToBlacklist(string $iban): void
+  protected function addIbanToBlocklist(string $iban): void
   {
     $existsAlready = $this->callAPISuccessGetCount(
       'OptionValue',

tests/phpunit/CRM/Sepa/VerifyIbanTest.php

@@ -170,12 +170,12 @@ public function testPspCreatorAcceptsIncorrectIban()
   }
 
   /**
-   * Test that an IBAN put on the blacklist will fail.
+   * Test that an IBAN put on the blocklist will fail.
    * @see Case_ID V05
    */
-  public function testBlacklistedIbanFails()
+  public function testBlocklistedIbanFails()
   {
-    $this->addIbanToBlacklist(self::TEST_IBAN);
+    $this->addIbanToBlocklist(self::TEST_IBAN);
 
     // should be using $this->assertException but there's something off here
     try {
@@ -185,22 +185,22 @@ public function testBlacklistedIbanFails()
           'iban' => self::TEST_IBAN,
         ]
       );
-      $this->fail(E::ts('Blacklistet IBAN should fail but did not!'));
+      $this->fail(E::ts('Blocklistet IBAN should fail but did not!'));
     } catch (Exception $ex) {
       // this is expected
     }
   }
 
   /**
-   * This will test if a valid IBAN works when there is another IBAN on the blacklist. \
-   * NOTE: In the default settings of the Sepa extension there is a test entry on the blacklist, \
+   * This will test if a valid IBAN works when there is another IBAN on the blocklist. \
+   * NOTE: In the default settings of the Sepa extension there is a test entry on the blocklist, \
    *       so technically this is not necessary as testValidIban does the same; but this \
    *       test will go sure in the case someone removes the default test entry.
    * @see Case_ID V05
    */
-  public function testValidIbanWhenOtherIbanIsBlacklisted()
+  public function testValidIbanWhenOtherIbanIsBlocklisted()
   {
-    $this->addIbanToBlacklist(self::TEST_IBAN_2);
+    $this->addIbanToBlocklist(self::TEST_IBAN_2);
 
     $this->createMandate(
       [