diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bb4afda..3ea10d1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Update farmOS-map to [v2.1.0](https://github.com/farmOS/farmOS-map/releases/tag/v2.1.0) - [Issue #3311264: Coordinate upgrade of Consumers module to get client_id base field](https://www.drupal.org/project/farm/issues/3311264) - [Issue #3282186: Update simple_oauth to ^5.2.2](https://www.drupal.org/project/farm/issues/3282186) +- [Make translatable strings consistent between fields and actions #594](https://github.com/farmOS/farmOS/pull/594) ### Fixed diff --git a/modules/core/flag/src/Form/EntityFlagActionForm.php b/modules/core/flag/src/Form/EntityFlagActionForm.php index 953da5f8..8843f585 100644 --- a/modules/core/flag/src/Form/EntityFlagActionForm.php +++ b/modules/core/flag/src/Form/EntityFlagActionForm.php @@ -168,8 +168,8 @@ class EntityFlagActionForm extends ConfirmFormBase { $form['flags'] = [ '#type' => 'select', - '#title' => $this->t('Flag'), - '#description' => $this->t('Select the flags that should be attached to the record(s).'), + '#title' => $this->t('Flags'), + '#description' => $this->t('Add flags to enable better sorting and filtering of records.'), '#options' => $allowed_values, '#multiple' => TRUE, ]; diff --git a/modules/core/owner/farm_owner.module b/modules/core/owner/farm_owner.module index fdf0f1f7..ceb84a97 100644 --- a/modules/core/owner/farm_owner.module +++ b/modules/core/owner/farm_owner.module @@ -17,8 +17,8 @@ function farm_owner_entity_base_field_info(EntityTypeInterface $entity_type) { if (in_array($entity_type->id(), ['asset', 'log'])) { $field_info = [ 'type' => 'entity_reference', - 'label' => t('Owner'), - 'description' => t('Optionally specify who is in charge of this record.'), + 'label' => t('Owners'), + 'description' => t('Assign ownership to one or more users.'), 'target_type' => 'user', 'multiple' => TRUE, 'weight' => [ diff --git a/modules/core/owner/src/Form/AssignActionForm.php b/modules/core/owner/src/Form/AssignActionForm.php index 30846bc8..be1ee1e6 100644 --- a/modules/core/owner/src/Form/AssignActionForm.php +++ b/modules/core/owner/src/Form/AssignActionForm.php @@ -170,8 +170,8 @@ class AssignActionForm extends ConfirmFormBase { $form['users'] = [ '#type' => 'select', - '#title' => $this->t('Assign owners'), - '#description' => $this->t('Select people to assign ownership of the record(s).'), + '#title' => $this->t('Owners'), + '#description' => $this->t('Assign ownership to one or more users.'), '#options' => $user_options, '#multiple' => TRUE, ]; diff --git a/modules/core/parent/farm_parent.module b/modules/core/parent/farm_parent.module index 66934280..68a82c70 100644 --- a/modules/core/parent/farm_parent.module +++ b/modules/core/parent/farm_parent.module @@ -18,7 +18,7 @@ function farm_parent_entity_base_field_info(EntityTypeInterface $entity_type) { $parent_info = [ 'type' => 'entity_reference', 'label' => t('Parents'), - 'description' => t('If this asset descends from other assets, they can referenced here to create a lineage relationship.'), + 'description' => t('Reference parent assets to create a lineal/hierarchical relationship.'), 'target_type' => 'asset', 'multiple' => TRUE, 'weight' => [ diff --git a/modules/core/parent/src/Form/AssetParentActionForm.php b/modules/core/parent/src/Form/AssetParentActionForm.php index 1893e15c..98145ef6 100644 --- a/modules/core/parent/src/Form/AssetParentActionForm.php +++ b/modules/core/parent/src/Form/AssetParentActionForm.php @@ -167,7 +167,7 @@ class AssetParentActionForm extends ConfirmFormBase { $form['parent'] = [ '#type' => 'entity_autocomplete', '#title' => $this->t('Parents'), - '#description' => $this->t('The parent to assign for the asset.'), + '#description' => $this->t('Reference parent assets to create a lineal/hierarchical relationship.'), '#target_type' => 'asset', '#selection_handler' => 'views', '#selection_settings' => [ diff --git a/modules/taxonomy/log_category/src/Form/LogCategorizeActionForm.php b/modules/taxonomy/log_category/src/Form/LogCategorizeActionForm.php index 3b477a64..73ea461d 100644 --- a/modules/taxonomy/log_category/src/Form/LogCategorizeActionForm.php +++ b/modules/taxonomy/log_category/src/Form/LogCategorizeActionForm.php @@ -155,6 +155,7 @@ class LogCategorizeActionForm extends ConfirmFormBase { $form['category'] = [ '#type' => 'select', '#title' => $this->t('Log category'), + '#description' => $this->t('Use this to organize your logs into categories for easier searching and filtering later.'), '#options' => $options, '#multiple' => TRUE, ];