Merge pull request #89 from catalyst/issue85

issue #85: update lang strings

Author: danmarsden

classes/local/tool_dynamic_cohorts/condition/cohort_field.php

@@ -194,7 +194,7 @@ public function config_form_add(\MoodleQuickForm $mform): void {
         $mform->addElement(
             'select',
             $this->get_cohort_operator_field(),
-            get_string('operator', 'tool_dynamic_cohorts'),
+            get_string('users'),
             $this->get_cohort_operators()
         );
 

classes/local/tool_dynamic_cohorts/condition/cohort_membership.php

@@ -97,7 +97,7 @@ public function config_form_add(\MoodleQuickForm $mform): void {
         $mform->addElement(
             'select',
             $this->get_operator_field(),
-            get_string('operator', 'tool_dynamic_cohorts'),
+            get_string('users'),
             $this->get_operators()
         );
 

lang/en/tool_dynamic_cohorts.php

@@ -51,15 +51,15 @@
 $string['conditionformtitle'] = 'Rule condition';
 $string['condition:auth_method'] = 'Authentication method';
 $string['condition:cohort_membership'] = 'Cohort membership';
-$string['condition:cohort_membership_description'] = 'A user {$a->operator} {$a->cohorts}';
+$string['condition:cohort_membership_description'] = 'Users who {$a->operator} {$a->cohorts}';
 $string['condition:cohort_membership_broken_description'] = 'Condition is broken. Using the same cohort that the given rule is configured to manage to.';
 $string['condition:cohort_field'] = 'Cohort field';
-$string['condition:cohort_field_description'] = 'A user {$a->operator} cohorts with field \'{$a->field}\' {$a->fieldoperator} {$a->fieldvalue}';
+$string['condition:cohort_field_description'] = 'Users who {$a->operator} cohorts with field \'{$a->field}\' {$a->fieldoperator} {$a->fieldvalue}';
 $string['condition:course_completed'] = 'Course completed';
-$string['condition:course_completed_description'] = 'A user has completed course "{$a->course}" {$a->operator} {$a->timecompleted}';
+$string['condition:course_completed_description'] = 'Users who have completed course "{$a->course}" {$a->operator} {$a->timecompleted}';
 $string['condition:course_not_completed'] = 'Course not completed';
-$string['condition:course_not_completed_description'] = 'A user has not completed course "{$a->course}"';
-$string['condition:profile_field_description'] = '{$a->field} {$a->fieldoperator} {$a->fieldvalue}';
+$string['condition:course_not_completed_description'] = 'Users who have not completed course "{$a->course}"';
+$string['condition:profile_field_description'] = 'Users with {$a->field} {$a->fieldoperator} {$a->fieldvalue}';
 $string['condition:user_last_login'] = 'User last login';
 $string['condition:user_created'] = 'User created time';
 $string['condition:user_profile']  = 'User standard profile field';
@@ -83,7 +83,7 @@
 $string['enabled'] = 'Enabled';
 $string['enable_confirm'] = 'Are you sure you want to enable rule {$a}?';
 $string['ever'] = 'Ever';
-$string['everloggedin'] = 'A user has logged in at least once';
+$string['everloggedin'] = 'Users who have logged in at least once';
 $string['event:conditioncreated'] = 'Condition created';
 $string['event:conditiondeleted'] = 'Condition deleted';
 $string['event:conditionupdated'] = 'Condition updated';
@@ -97,14 +97,14 @@
 $string['include_missing_data'] = 'Include users with missing data.';
 $string['include_missing_data_help'] = 'Some users may not have a custom field data set yet. This option includes those user in the final result.';
 $string['inlast'] = 'In the last';
-$string['inlastloggedin'] = 'A user has logged in in the last {$a}';
+$string['inlastloggedin'] = 'Users who have logged in in the last {$a}';
 $string['invalidfieldvalue'] = 'Invalid field value';
-$string['ismemberof'] = 'is member of';
-$string['isnotmemberof'] = 'is not member of';
+$string['ismemberof'] = 'are members of';
+$string['isnotmemberof'] = 'are not members of';
 $string['isnotempty'] = 'is not empty';
 $string['isafter'] = 'is after';
 $string['isbefore'] = 'is before';
-$string['loggedintime'] = 'A user logged in {$a->operator} {$a->time}';
+$string['loggedintime'] = 'Users who logged in {$a->operator} {$a->time}';
 $string['logical_operator'] = 'Logical operator';
 $string['logical_operator_help'] = 'A logical operator to be applied to conditions for this rule. Operator "AND" means a user has to match all conditions to be added to a cohort. "OR" means a user has to match any of conditions to be added to a cohort.';
 $string['managerules'] = 'Manage rules';
@@ -116,7 +116,7 @@
 $string['name'] = 'Rule name';
 $string['name_help'] = 'A human readable name of this rule.';
 $string['never'] = 'Never';
-$string['neverloggedin'] = 'A user has never logged in';
+$string['neverloggedin'] = 'Users who have never logged in';
 $string['operator'] = 'Operator';
 $string['or'] = 'OR';
 $string['pleaseselectcohort'] = 'Please select a cohort';
@@ -142,8 +142,8 @@
 $string['rule_entity.bulkprocessing'] = 'Bulk processing';
 $string['rule_entity.status'] = 'Status';
 $string['usercreated'] = 'User was created';
-$string['usercreatedin'] = 'A user was created in the last {$a}';
-$string['usercreatedtime'] = 'A user was created {$a->operator} {$a->time}';
+$string['usercreatedin'] = 'Users who were created in the last {$a}';
+$string['usercreatedtime'] = 'Users who were created {$a->operator} {$a->time}';
 $string['usersforrule'] = 'Users matching rule "{$a->rule}" for cohort "{$a->cohort}"';
 $string['userlastlogin'] = 'User\'s last login';
 $string['haverole'] = 'have role';

tests/external/rule_conditions_test.php

@@ -152,7 +152,10 @@ public function test_get_conditions_for_rule() {
             '{"profilefield":"username","username_operator":3,"username_value":"user1username"}',
             $conditions[$condition2->get_record()->get('id')]['configdata']
         );
-        $this->assertSame('Username is equal to user1username', $conditions[$condition2->get_record()->get('id')]['description']);
+        $this->assertSame(
+            'Users with Username is equal to user1username',
+            $conditions[$condition2->get_record()->get('id')]['description']
+        );
         $this->assertSame('User standard profile field', $conditions[$condition2->get_record()->get('id')]['name']);
 
         $this->assertSame($condition3->get('id'), $conditions[$condition3->get('id')]['id']);
@@ -172,7 +175,10 @@ public function test_get_conditions_for_rule() {
             '{"profilefield":"username","username_operator":3,"username_value":""}',
             $conditions[$condition4->get_record()->get('id')]['configdata']
         );
-        $this->assertSame('Username is equal to user1username', $conditions[$condition2->get_record()->get('id')]['description']);
+        $this->assertSame(
+            'Users with Username is equal to user1username',
+            $conditions[$condition2->get_record()->get('id')]['description']
+        );
         $this->assertSame('User standard profile field', $conditions[$condition2->get_record()->get('id')]['name']);
 
         $this->assertSame(true, $conditions[$condition1->get_record()->get('id')]['broken']);

tests/local/tool_dynamic_cohorts/condition/cohort_field_test.php

@@ -91,14 +91,17 @@ public function test_set_and_get_configdata() {
      */
     public static function config_description_data_provider(): array {
         return [
-            [condition_base::TEXT_CONTAINS, 'A user is not member of cohorts with field \'Theme\' contains 123'],
-            [condition_base::TEXT_DOES_NOT_CONTAIN, 'A user is not member of cohorts with field \'Theme\' doesn\'t contain 123'],
-            [condition_base::TEXT_IS_EQUAL_TO, 'A user is not member of cohorts with field \'Theme\' is equal to 123'],
-            [condition_base::TEXT_IS_NOT_EQUAL_TO, 'A user is not member of cohorts with field \'Theme\' isn\'t equal to 123'],
-            [condition_base::TEXT_STARTS_WITH, 'A user is not member of cohorts with field \'Theme\' starts with 123'],
-            [condition_base::TEXT_ENDS_WITH, 'A user is not member of cohorts with field \'Theme\' ends with 123'],
-            [condition_base::TEXT_IS_EMPTY, 'A user is not member of cohorts with field \'Theme\' is empty '],
-            [condition_base::TEXT_IS_NOT_EMPTY, 'A user is not member of cohorts with field \'Theme\' is not empty '],
+            [condition_base::TEXT_CONTAINS, 'Users who are not members of cohorts with field \'Theme\' contains 123'],
+            [
+                condition_base::TEXT_DOES_NOT_CONTAIN,
+                'Users who are not members of cohorts with field \'Theme\' doesn\'t contain 123',
+            ],
+            [condition_base::TEXT_IS_EQUAL_TO, 'Users who are not members of cohorts with field \'Theme\' is equal to 123'],
+            [condition_base::TEXT_IS_NOT_EQUAL_TO, 'Users who are not members of cohorts with field \'Theme\' isn\'t equal to 123'],
+            [condition_base::TEXT_STARTS_WITH, 'Users who are not members of cohorts with field \'Theme\' starts with 123'],
+            [condition_base::TEXT_ENDS_WITH, 'Users who are not members of cohorts with field \'Theme\' ends with 123'],
+            [condition_base::TEXT_IS_EMPTY, 'Users who are not members of cohorts with field \'Theme\' is empty '],
+            [condition_base::TEXT_IS_NOT_EMPTY, 'Users who are not members of cohorts with field \'Theme\' is not empty '],
         ];
     }
 
@@ -137,7 +140,7 @@ public function test_config_description_context_id() {
         ]);
 
         $this->assertSame(
-            'A user is member of cohorts with field \'Context\' is equal to ' . $coursecategory->name,
+            'Users who are members of cohorts with field \'Context\' is equal to ' . $coursecategory->name,
             $condition->get_config_description()
         );
     }
@@ -316,7 +319,7 @@ public function test_config_description_custom_field() {
         ]);
 
         $this->assertSame(
-            'A user is member of cohorts with field \'Custom field\' is equal to Test value',
+            'Users who are members of cohorts with field \'Custom field\' is equal to Test value',
             $condition->get_config_description()
         );
 
@@ -330,7 +333,7 @@ public function test_config_description_custom_field() {
         ]);
 
         $this->assertSame(
-            'A user is member of cohorts with field \'Custom field\' is equal to Yes',
+            'Users who are members of cohorts with field \'Custom field\' is equal to Yes',
             $condition->get_config_description()
         );
 
@@ -342,7 +345,7 @@ public function test_config_description_custom_field() {
         ]);
 
         $this->assertSame(
-            'A user is member of cohorts with field \'Custom field\' is equal to No',
+            'Users who are members of cohorts with field \'Custom field\' is equal to No',
             $condition->get_config_description()
         );
 
@@ -357,7 +360,7 @@ public function test_config_description_custom_field() {
         ]);
 
         $this->assertSame(
-            'A user is member of cohorts with field \'Custom field\' is after ' . userdate($now),
+            'Users who are members of cohorts with field \'Custom field\' is after ' . userdate($now),
             $condition->get_config_description()
         );
 
@@ -369,7 +372,7 @@ public function test_config_description_custom_field() {
         ]);
 
         $this->assertSame(
-            'A user is member of cohorts with field \'Custom field\' is before ' . userdate($now),
+            'Users who are members of cohorts with field \'Custom field\' is before ' . userdate($now),
             $condition->get_config_description()
         );
     }

tests/local/tool_dynamic_cohorts/condition/cohort_membership_test.php

@@ -102,14 +102,14 @@ public function test_config_description() {
             'cohort_membership_operator' => cohort_membership::OPERATOR_IS_MEMBER_OF,
             'cohort_membership_value' => [$cohort1->id],
         ]);
-        $this->assertSame('A user is member of ' . $cohort1->name, $condition->get_config_description());
+        $this->assertSame('Users who are members of ' . $cohort1->name, $condition->get_config_description());
 
         $condition = $this->get_condition([
             'cohort_membership_operator' => cohort_membership::OPERATOR_IS_NOT_MEMBER_OF,
             'cohort_membership_value' => [$cohort1->id, $cohort2->id],
         ]);
         $this->assertSame(
-            'A user is not member of ' . $cohort1->name . ' OR ' . $cohort2->name,
+            'Users who are not members of ' . $cohort1->name . ' OR ' . $cohort2->name,
             $condition->get_config_description()
         );
 
@@ -118,7 +118,7 @@ public function test_config_description() {
             'cohort_membership_value' => [$cohort1->id, $cohort2->id, 777],
         ]);
         $this->assertSame(
-            'A user is member of ' . $cohort1->name . ' OR ' . $cohort2->name . ' OR ' . 777,
+            'Users who are members of ' . $cohort1->name . ' OR ' . $cohort2->name . ' OR ' . 777,
             $condition->get_config_description()
         );
     }
@@ -218,7 +218,7 @@ public function test_get_broken_description() {
         $this->assertSame(
             get_string('condition:cohort_membership_broken_description', 'tool_dynamic_cohorts')
             . '<br />'
-            . "A user is member of {$cohort1->name} OR {$cohort2->name}",
+            . "Users who are members of {$cohort1->name} OR {$cohort2->name}",
             $condition->get_broken_description()
         );
     }

tests/local/tool_dynamic_cohorts/condition/course_completed_test.php

@@ -102,7 +102,7 @@ public function test_config_description() {
         ]);
 
         $this->assertSame(
-            'A user has completed course "' . $course->fullname . '" after ' . userdate($now),
+            'Users who have completed course "' . $course->fullname . '" after ' . userdate($now),
             $condition->get_config_description(),
         );
 
@@ -113,7 +113,7 @@ public function test_config_description() {
         ]);
 
         $this->assertSame(
-            'A user has completed course "' . $course->fullname . '" before ' . userdate($now),
+            'Users who have completed course "' . $course->fullname . '" before ' . userdate($now),
             $condition->get_config_description(),
         );
 
@@ -124,7 +124,7 @@ public function test_config_description() {
         ]);
 
         $this->assertSame(
-            'A user has completed course "' . $course->fullname . '"  ',
+            'Users who have completed course "' . $course->fullname . '"  ',
             $condition->get_config_description(),
         );
     }

tests/local/tool_dynamic_cohorts/condition/course_not_completed_test.php

@@ -91,7 +91,7 @@ public function test_config_description() {
         ]);
 
         $this->assertSame(
-            'A user has not completed course "' . $course->fullname . '"',
+            'Users who have not completed course "' . $course->fullname . '"',
             $condition->get_config_description(),
         );
     }

tests/local/tool_dynamic_cohorts/condition/user_created_test.php

@@ -99,23 +99,23 @@ public function test_config_description() {
             'period_value' => 1,
             'period_type' => 'weeks',
         ]);
-        $this->assertSame('A user was created in the last 1 weeks', $condition->get_config_description());
+        $this->assertSame('Users who were created in the last 1 weeks', $condition->get_config_description());
 
         $condition = $this->get_condition([
             'operator' => user_last_login::OPERATOR_BEFORE,
             'time' => $now,
             'period_value' => 1,
             'period_type' => 'weeks',
         ]);
-        $this->assertSame('A user was created before ' . userdate($now), $condition->get_config_description());
+        $this->assertSame('Users who were created before ' . userdate($now), $condition->get_config_description());
 
         $condition = $this->get_condition([
             'operator' => user_last_login::OPERATOR_AFTER,
             'time' => $now,
             'period_value' => 1,
             'period_type' => 'weeks',
         ]);
-        $this->assertSame('A user was created after ' . userdate($now), $condition->get_config_description());
+        $this->assertSame('Users who were created after ' . userdate($now), $condition->get_config_description());
     }
 
     /**

tests/local/tool_dynamic_cohorts/condition/user_custom_profile_test.php

@@ -150,14 +150,14 @@ public function test_set_and_get_configdata() {
      */
     public static function config_description_data_provider(): array {
         return [
-            [condition_base::TEXT_CONTAINS, 'Test field1 contains 123', true],
-            [condition_base::TEXT_DOES_NOT_CONTAIN, 'Test field1 doesn\'t contain 123', true],
-            [condition_base::TEXT_IS_EQUAL_TO, 'Test field1 is equal to 123', true],
-            [condition_base::TEXT_IS_NOT_EQUAL_TO, 'Test field1 isn\'t equal to 123', true],
-            [condition_base::TEXT_STARTS_WITH, 'Test field1 starts with 123', true],
-            [condition_base::TEXT_ENDS_WITH, 'Test field1 ends with 123', true],
-            [condition_base::TEXT_IS_EMPTY, 'Test field1 is empty ', true],
-            [condition_base::TEXT_IS_NOT_EMPTY, 'Test field1 is not empty ', true],
+            [condition_base::TEXT_CONTAINS, 'Users with Test field1 contains 123', true],
+            [condition_base::TEXT_DOES_NOT_CONTAIN, 'Users with Test field1 doesn\'t contain 123', true],
+            [condition_base::TEXT_IS_EQUAL_TO, 'Users with Test field1 is equal to 123', true],
+            [condition_base::TEXT_IS_NOT_EQUAL_TO, 'Users with Test field1 isn\'t equal to 123', true],
+            [condition_base::TEXT_STARTS_WITH, 'Users with Test field1 starts with 123', true],
+            [condition_base::TEXT_ENDS_WITH, 'Users with Test field1 ends with 123', true],
+            [condition_base::TEXT_IS_EMPTY, 'Users with Test field1 is empty ', true],
+            [condition_base::TEXT_IS_NOT_EMPTY, 'Users with Test field1 is not empty ', true],
         ];
     }
 

tests/local/tool_dynamic_cohorts/condition/user_last_login_test.php

@@ -97,37 +97,37 @@ public function test_config_description() {
             'operator' => user_last_login::OPERATOR_EVER,
             'time' => $now,
         ]);
-        $this->assertSame('A user has logged in at least once', $condition->get_config_description());
+        $this->assertSame('Users who have logged in at least once', $condition->get_config_description());
 
         $condition = $this->get_condition([
             'operator' => user_last_login::OPERATOR_NEVER,
             'time' => $now,
         ]);
-        $this->assertSame('A user has never logged in', $condition->get_config_description());
+        $this->assertSame('Users who have never logged in', $condition->get_config_description());
 
         $condition = $this->get_condition([
             'operator' => user_last_login::OPERATOR_IN_LAST,
             'time' => $now,
             'period_value' => 1,
             'period_type' => 'weeks',
         ]);
-        $this->assertSame('A user has logged in in the last 1 weeks', $condition->get_config_description());
+        $this->assertSame('Users who have logged in in the last 1 weeks', $condition->get_config_description());
 
         $condition = $this->get_condition([
             'operator' => user_last_login::OPERATOR_BEFORE,
             'time' => $now,
             'period_value' => 1,
             'period_type' => 'weeks',
         ]);
-        $this->assertSame('A user logged in before ' . userdate($now), $condition->get_config_description());
+        $this->assertSame('Users who logged in before ' . userdate($now), $condition->get_config_description());
 
         $condition = $this->get_condition([
             'operator' => user_last_login::OPERATOR_AFTER,
             'time' => $now,
             'period_value' => 1,
             'period_type' => 'weeks',
         ]);
-        $this->assertSame('A user logged in after ' . userdate($now), $condition->get_config_description());
+        $this->assertSame('Users who logged in after ' . userdate($now), $condition->get_config_description());
     }
 
     /**