From 98aafeb5352fbbed09961f1c67faae8a7eb45856 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Sat, 6 Jun 2020 22:06:10 +0200
Subject: [PATCH] PropertyModifierRejectOrSelect: change wording

fixes #2134
---
 doc/82-Changelog.md                                       | 1 +
 .../PropertyModifier/PropertyModifierRejectOrSelect.php   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index 0b45ce30..639e6eb5 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -14,6 +14,7 @@ next (will be 1.8.0)
 ### User Interface
 * FIX: It's now possible to set Endpoint ports > 32767 on PostgreSQL (#928)
 * FIX: Group list is no longer prefixed with a comma (#2133)
+* FIX: Change wording, avoid black/whitelist (#2134)
 * FEATURE: Data Fields can now be grouped into categories (#1969)
 * FEATURE: Inspect is now available for Packages, Stages and Files (#1995)
 * FEATURE: Allow to disable the Director frontend / UI (#2007)
diff --git a/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php b/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php
index d35d64d9..eda742ab 100644
--- a/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php
+++ b/library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php
@@ -14,7 +14,7 @@ class PropertyModifierRejectOrSelect extends PropertyModifierHook
 
     public function getName()
     {
-        return 'Black or White-list rows based on property value';
+        return mt('director', 'Reject or keep rows based on property value');
     }
 
     /**
@@ -38,7 +38,7 @@ class PropertyModifierRejectOrSelect extends PropertyModifierHook
         ]);
 
         $form->addElement('text', 'filter_string', [
-            'label'       => 'Filter',
+            'label'       => $form->translate('Filter'),
             'description' => $form->translate(
                 'The string/pattern you want to search for. Depends on the'
                 . ' chosen method, use www.* or *linux* for wildcard matches'
@@ -56,8 +56,8 @@ class PropertyModifierRejectOrSelect extends PropertyModifierHook
             ),
             'value'        => 'reject',
             'multiOptions' => [
-                'reject' => $form->translate('Reject the whole row (Blacklist)'),
-                'keep'   => $form->translate('Keep only matching rows (Whitelist)'),
+                'reject' => $form->translate('Reject the whole row'),
+                'keep'   => $form->translate('Keep only matching rows'),
             ],
         ]);
     }