https://github.com/humhub/humhub/issues/2758#issuecomment-2034804512

humhub · Apr 4, 2024 · f3862d7 · f3862d7
1 parent 940877e
commit f3862d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/protected/humhub/modules/admin/models/forms/AuthenticationSettingsForm.php b/protected/humhub/modules/admin/models/forms/AuthenticationSettingsForm.php
@@ -80,7 +80,7 @@ public function rules()
     public function attributeLabels()
     {
         return [
-            'internalRequireApprovalAfterRegistration' => Yii::t('AdminModule.user', 'Require group manager approval after registration'),
+            'internalRequireApprovalAfterRegistration' => Yii::t('AdminModule.user', 'Post-registration approval required'),
             'internalAllowAnonymousRegistration' => Yii::t('AdminModule.user', 'New users can register'),
             'internalUsersCanInviteByEmail' => Yii::t('AdminModule.user', 'Members can invite external users by email'),
             'internalUsersCanInviteByLink' => Yii::t('AdminModule.user', 'Members can invite external users by link'),
@@ -102,7 +102,7 @@ public function attributeLabels()
     public function attributeHints()
     {
         return [
-            'internalRequireApprovalAfterRegistration' => Yii::t('AdminModule.user', 'You can select the managers - who can approve pending users and who will be notified about new registrations - in the group settings.'),
+            'internalRequireApprovalAfterRegistration' => Yii::t('AdminModule.user', 'If enabled, the Group Manager will need to approve registration.'),
         ];
     }
 

diff --git a/protected/humhub/modules/user/models/Group.php b/protected/humhub/modules/user/models/Group.php
@@ -115,7 +115,7 @@ public function attributeLabels()
             'id' => 'ID',
             'name' => Yii::t('UserModule.base', 'Name'),
             'defaultSpaceGuid' => Yii::t('UserModule.base', 'Default Space'),
-            'managerGuids' => Yii::t('UserModule.base', 'Managers'),
+            'managerGuids' => Yii::t('UserModule.base', 'Group Manager(s)'),
             'description' => Yii::t('UserModule.base', 'Description'),
             'created_at' => Yii::t('UserModule.base', 'Created at'),
             'created_by' => Yii::t('UserModule.base', 'Created by'),
@@ -135,6 +135,7 @@ public function attributeLabels()
     public function attributeHints()
     {
         return [
+            'managerGuids' => Yii::t('UserModule.base', 'The Group Manager can approve pending registrations of this group.'),
             'notify_users' => Yii::t('AdminModule.user', 'Send notifications to users when added to or removed from the group.'),
             'show_at_registration' => Yii::t('AdminModule.user', 'Make the group selectable at registration.'),
             'show_at_directory' => Yii::t('AdminModule.user', 'Will be used as a filter in \'People\'.'),

diff --git a/protected/humhub/modules/user/widgets/UserPickerField.php b/protected/humhub/modules/user/widgets/UserPickerField.php
@@ -2,10 +2,9 @@
 
 namespace humhub\modules\user\widgets;
 
-use humhub\modules\user\models\User;
 use humhub\modules\ui\form\widgets\BasePicker;
+use humhub\modules\user\models\User;
 use Yii;
-use yii\helpers\Html;
 use yii\helpers\Url;
 
 /**
@@ -90,7 +89,7 @@ protected function getData()
             $result['placeholder-more'] = $this->placeholder;
         } else {
             $result['placeholder-more'] = ($this->placeholderMore) ? $this->placeholderMore
-                : Yii::t('UserModule.chooser', 'Select user...');
+                : Yii::t('UserModule.chooser', 'Add user');
         }
 
         $result['no-result'] = Yii::t('UserModule.chooser', 'No users found for the given query.');