Change some remove keyword occurrences to delete

application/controllers/ContactGroupController.php

@@ -34,7 +34,7 @@
 
         $query = Contactgroup::on(Database::get())
             ->columns(['id', 'name'])
             ->filter(Filter::equal('id', $groupId));
 
         $group = $query->first();
         if ($group === null) {
@@ -43,11 +43,11 @@
 
         $this->controls->addAttributes(['class' => 'contactgroup-detail']);
 
         $this->addControl(new HtmlElement('div', new Attributes(['class' => 'header']), Text::create($group->name)));
 
         $contacts = Contact::on(Database::get())
             ->filter(Filter::all(
                 Filter::equal('contactgroup_member.contactgroup_id', $groupId),
                 Filter::equal('contactgroup_member.deleted', 'n')
             ));
 
@@ -57,7 +57,7 @@
         $this->addContent(
             (new ButtonLink(
                 Text::create(t('Edit Contact Group')),
                 Links::contactGroupEdit($groupId)->with(['showCompact' => true, '_disableLayout' => 1]),
                 'edit',
                 ['class' => 'add-new-component']
             ))->openInModal()
@@ -85,7 +85,7 @@
                 if ($form->hasBeenRemoved()) {
                     $form->removeContactgroup();
                     Notification::success(sprintf(
-                        t('Successfully removed contact group %s'),
+                        t('Deleted contact group "%s" successfully'),
                         $form->getValue('group_name')
                     ));
                     $this->switchToSingleColumnLayout();

application/forms/ContactGroupForm.php

@@ -83,17 +83,17 @@ protected function assemble(): void
         );
 
         if ($this->contactgroupId) {
-            $removeBtn = new SubmitElement(
-                'remove',
+            $deleteBtn = new SubmitElement(
+                'delete',
                 [
-                    'label'             => $this->translate('Remove'),
+                    'label'             => $this->translate('Delete'),
                     'class'             => 'btn-remove',
                     'formnovalidate'    => true
                 ]
             );
 
-            $this->registerElement($removeBtn);
-            $this->getElement('submit')->prependWrapper((new HtmlDocument())->setHtmlContent($removeBtn));
+            $this->registerElement($deleteBtn);
+            $this->getElement('submit')->prependWrapper((new HtmlDocument())->setHtmlContent($deleteBtn));
         }
     }
 
@@ -107,7 +107,7 @@ public function hasBeenRemoved(): bool
         $btn = $this->getPressedSubmitElement();
         $csrf = $this->getElement('CSRFToken');
 
-        return $csrf !== null && $csrf->isValid() && $btn !== null && $btn->getName() === 'remove';
+        return $csrf !== null && $csrf->isValid() && $btn !== null && $btn->getName() === 'delete';
     }
 
     /**

application/forms/ScheduleForm.php

@@ -61,7 +61,7 @@ public function hasBeenRemoved(): bool
         $btn = $this->getPressedSubmitElement();
         $csrf = $this->getElement('CSRFToken');
 
-        return $csrf !== null && $csrf->isValid() && $btn !== null && $btn->getName() === 'remove';
+        return $csrf !== null && $csrf->isValid() && $btn !== null && $btn->getName() === 'delete';
     }
 
     public function loadSchedule(int $id): void
@@ -164,8 +164,8 @@ protected function assemble()
         ]);
 
         if ($this->showRemoveButton) {
-            $removeBtn = $this->createElement('submit', 'remove', [
-                'label' => $this->translate('Remove'),
+            $removeBtn = $this->createElement('submit', 'delete', [
+                'label' => $this->translate('Delete'),
                 'class' => 'btn-remove',
                 'formnovalidate' => true
             ]);