From ad6811b5e9c737c7012bc0d94f08fbc303a65713 Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 9 Nov 2018 16:14:48 +0000 Subject: [PATCH] Changed "Actor" to "Person" in a few places --- modules/opencase_defaults/opencase_defaults.info.yml | 2 +- modules/opencase_entities/opencase_entities.links.action.yml | 4 ++-- modules/opencase_entities/src/Entity/OCActor.php | 4 ++-- modules/opencase_entities/src/Form/OCActorForm.php | 4 ++-- .../config/install/views.view.actor_search.yml | 2 +- src/EntityTypeRelationsWidget.php | 2 +- src/Plugin/Block/ActorTypeHelp.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/opencase_defaults/opencase_defaults.info.yml b/modules/opencase_defaults/opencase_defaults.info.yml index 50dc6a4..f664548 100644 --- a/modules/opencase_defaults/opencase_defaults.info.yml +++ b/modules/opencase_defaults/opencase_defaults.info.yml @@ -1,6 +1,6 @@ name: 'Opencase Example Configuration' type: module -description: 'Actor types, case types, activity types and user roles suited to an asylum advice group' +description: 'Person types, case types, activity types and user roles suited to an asylum advice group' core: 8.x package: 'OpenCase' dependencies: diff --git a/modules/opencase_entities/opencase_entities.links.action.yml b/modules/opencase_entities/opencase_entities.links.action.yml index 5ca4763..5efad65 100644 --- a/modules/opencase_entities/opencase_entities.links.action.yml +++ b/modules/opencase_entities/opencase_entities.links.action.yml @@ -1,11 +1,11 @@ entity.oc_actor.add_form: route_name: entity.oc_actor.add_page - title: 'Add Actor' + title: 'Add Person' appears_on: - entity.oc_actor.collection entity.oc_actor_type.add_form: route_name: entity.oc_actor_type.add_form - title: 'Add Actor type' + title: 'Add Person type' appears_on: - entity.oc_actor_type.collection diff --git a/modules/opencase_entities/src/Entity/OCActor.php b/modules/opencase_entities/src/Entity/OCActor.php index be24492..b7215e1 100644 --- a/modules/opencase_entities/src/Entity/OCActor.php +++ b/modules/opencase_entities/src/Entity/OCActor.php @@ -17,8 +17,8 @@ use Drupal\user\UserInterface; * * @ContentEntityType( * id = "oc_actor", - * label = @Translation("Actor"), - * bundle_label = @Translation("Actor type"), + * label = @Translation("Person"), + * bundle_label = @Translation("Person type"), * handlers = { * "storage" = "Drupal\opencase_entities\OCActorStorage", * "view_builder" = "Drupal\Core\Entity\EntityViewBuilder", diff --git a/modules/opencase_entities/src/Form/OCActorForm.php b/modules/opencase_entities/src/Form/OCActorForm.php index 2e99970..d828e9d 100644 --- a/modules/opencase_entities/src/Form/OCActorForm.php +++ b/modules/opencase_entities/src/Form/OCActorForm.php @@ -55,13 +55,13 @@ class OCActorForm extends ContentEntityForm { switch ($status) { case SAVED_NEW: - drupal_set_message($this->t('Created the %label Actor.', [ + drupal_set_message($this->t('Created %label.', [ '%label' => $entity->label(), ])); break; default: - drupal_set_message($this->t('Saved the %label Actor.', [ + drupal_set_message($this->t('Saved %label.', [ '%label' => $entity->label(), ])); } diff --git a/modules/opencase_search/config/install/views.view.actor_search.yml b/modules/opencase_search/config/install/views.view.actor_search.yml index d408d62..7ccee99 100644 --- a/modules/opencase_search/config/install/views.view.actor_search.yml +++ b/modules/opencase_search/config/install/views.view.actor_search.yml @@ -8,7 +8,7 @@ dependencies: - search_api - user id: actor_search -label: 'Actor Search' +label: 'Person Search' module: views description: '' tag: '' diff --git a/src/EntityTypeRelationsWidget.php b/src/EntityTypeRelationsWidget.php index 93f6c1a..4eb3967 100644 --- a/src/EntityTypeRelationsWidget.php +++ b/src/EntityTypeRelationsWidget.php @@ -20,7 +20,7 @@ class EntityTypeRelationsWidget { $options[$machine_name] = $info['label']; } $form['allowed_actor_types'] = array( - '#title' => t('Actor types'), + '#title' => t('Allowed involved parties'), '#description' => t('Types of people that can be involved in this kind of case.'), '#type' => 'checkboxes', '#options' => $options diff --git a/src/Plugin/Block/ActorTypeHelp.php b/src/Plugin/Block/ActorTypeHelp.php index fccc60b..caf0181 100644 --- a/src/Plugin/Block/ActorTypeHelp.php +++ b/src/Plugin/Block/ActorTypeHelp.php @@ -21,7 +21,7 @@ class ActorTypeHelp extends BlockBase { public function build() { return array( '#markup' => " -

All actor types have contact details fields by default. Other fields can be added and managed here.

+

All person types have contact details fields by default. Other fields can be added and managed here.

" );