diff --git a/core/modules/user/user.install b/core/modules/user/user.install index 0af797a..ce04f59 100644 --- a/core/modules/user/user.install +++ b/core/modules/user/user.install @@ -98,3 +98,24 @@ function user_update_8100() { $config->set('status_blocked', $mail)->save(TRUE); } } + +/** + * Change "users" to "user(s)" in user actions for consistency. + */ +function user_update_8101() { + $config_factory = \Drupal::configFactory(); + $system_roles = user_role_names(TRUE); + + // For each role created. + foreach ($system_roles as $role_machine_name => $role_name) { + $config_add = $config_factory->getEditable('system.action.user_add_role_action.' . $role_machine_name); + if (!empty($config_add->get('label'))) { + $config_add->set('label', t('Add the @label role to the selected user(s)', ['@label' => $role_name]))->save(TRUE); + } + + $config_remove = $config_factory->getEditable('system.action.user_remove_role_action.' . $role_machine_name); + if (!empty($config_remove->get('label'))) { + $config_remove->set('label', t('Remove the @label role from the selected user(s)', ['@label' => $role_name]))->save(TRUE); + } + } +} diff --git a/core/modules/user/user.module b/core/modules/user/user.module index b865e95..61faa3b 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1003,7 +1003,7 @@ function user_user_role_insert(RoleInterface $role) { $action = Action::create([ 'id' => $add_id, 'type' => 'user', - 'label' => t('Add the @label role to the selected users', ['@label' => $role->label()]), + 'label' => t('Add the @label role to the selected user(s)', ['@label' => $role->label()]), 'configuration' => [ 'rid' => $role->id(), ], @@ -1016,7 +1016,7 @@ function user_user_role_insert(RoleInterface $role) { $action = Action::create([ 'id' => $remove_id, 'type' => 'user', - 'label' => t('Remove the @label role from the selected users', ['@label' => $role->label()]), + 'label' => t('Remove the @label role from the selected user(s)', ['@label' => $role->label()]), 'configuration' => [ 'rid' => $role->id(), ], diff --git a/interdiff-281072-22.txt b/interdiff-281072-22.txt new file mode 100644 index 0000000..1cfa216 --- /dev/null +++ b/interdiff-281072-22.txt @@ -0,0 +1,38 @@ +diff --git a/core/modules/user/user.install b/core/modules/user/user.install +index fb66794..ce04f59 100644 +--- a/core/modules/user/user.install ++++ b/core/modules/user/user.install +@@ -100,28 +100,22 @@ function user_update_8100() { + } + + /** +- * Add user(s) to dropdown options for User list role add and remove. ++ * Change "users" to "user(s)" in user actions for consistency. + */ + function user_update_8101() { + $config_factory = \Drupal::configFactory(); + $system_roles = user_role_names(TRUE); + +- // Config name prefix for plugin user_add_role_action. +- $config_prefix_add = 'system.action.user_add_role_action.'; +- +- // Config name prefix for plugin user_remove_role_action. +- $config_prefix_remove = 'system.action.user_remove_role_action.'; +- + // For each role created. + foreach ($system_roles as $role_machine_name => $role_name) { +- $config_add = $config_factory->getEditable($config_prefix_add . $role_machine_name); ++ $config_add = $config_factory->getEditable('system.action.user_add_role_action.' . $role_machine_name); + if (!empty($config_add->get('label'))) { +- $config_add->set('label', t('Add the @label role to the selected user(s)', array('@label' => $role_name)))->save(TRUE); ++ $config_add->set('label', t('Add the @label role to the selected user(s)', ['@label' => $role_name]))->save(TRUE); + } + +- $config_remove = $config_factory->getEditable($config_prefix_remove . $role_machine_name); ++ $config_remove = $config_factory->getEditable('system.action.user_remove_role_action.' . $role_machine_name); + if (!empty($config_remove->get('label'))) { +- $config_remove->set('label', t('Remove the @label role to the selected user(s)', array('@label' => $role_name)))->save(TRUE); ++ $config_remove->set('label', t('Remove the @label role from the selected user(s)', ['@label' => $role_name]))->save(TRUE); + } + } + }