Merge branch 'MDL-62342-34' of git://github.com/mihailges/moodle into…

… MOODLE_34_STABLE
moodle · Sep 4, 2018 · bb5a6b6 · bb5a6b6
2 parents 2720c95 + 4dc8fa2
commit bb5a6b6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/admin/tool/policy/classes/form/accept_policy.php b/admin/tool/policy/classes/form/accept_policy.php
@@ -71,10 +71,12 @@ public function definition() {
 
         $mform->addElement('hidden', 'returnurl');
         $mform->setType('returnurl', PARAM_LOCALURL);
-
-        $mform->addElement('static', 'user', get_string('acceptanceusers', 'tool_policy'), join(', ', $usernames));
-        $mform->addElement('static', 'policy', get_string('acceptancepolicies', 'tool_policy'),
-            join(', ', $versionnames));
+        $useracceptancelabel = (count($usernames) > 1) ? get_string('acceptanceusers', 'tool_policy') :
+                get_string('user');
+        $mform->addElement('static', 'user', $useracceptancelabel, join(', ', $usernames));
+        $policyacceptancelabel = (count($versionnames) > 1) ? get_string('acceptancepolicies', 'tool_policy') :
+                get_string('policydochdrpolicy', 'tool_policy');
+        $mform->addElement('static', 'policy', $policyacceptancelabel, join(', ', $versionnames));
 
         if ($revoke) {
             $mform->addElement('static', 'ack', '', get_string('revokeacknowledgement', 'tool_policy'));

diff --git a/admin/tool/policy/lang/en/tool_policy.php b/admin/tool/policy/lang/en/tool_policy.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['acceptanceacknowledgement'] = 'I acknowledge that I have received a request to give consent on behalf of user(s).';
+$string['acceptanceacknowledgement'] = 'I acknowledge that I have received a request to give consent on behalf of the above user(s).';
 $string['acceptancecount'] = '{$a->agreedcount} of {$a->policiescount}';
 $string['acceptancenote'] = 'Remarks';
 $string['acceptancepolicies'] = 'Policies';
@@ -53,7 +53,7 @@
 $string['backtoprevious'] = 'Go back to previous page';
 $string['backtotop'] = 'Back to top';
 $string['consentbulk'] = 'Consent';
-$string['consentdetails'] = 'Give consent on behalf of user';
+$string['consentdetails'] = 'Give consent on behalf of user(s)';
 $string['consentpagetitle'] = 'Consent';
 $string['contactdpo'] = 'For any questions about the policies please contact the privacy officer.';
 $string['dataproc'] = 'Personal data processing';
@@ -78,7 +78,7 @@
 $string['guestconsent:continue'] = 'Continue';
 $string['guestconsentmessage'] = 'If you continue browsing this website, you agree to our policies:';
 $string['iagree'] = 'I agree to the {$a}';
-$string['iagreetothepolicy'] = 'Give consent on behalf of user';
+$string['iagreetothepolicy'] = 'Give consent';
 $string['inactivate'] = 'Set status to "Inactive"';
 $string['inactivating'] = 'Inactivating a policy';
 $string['inactivatingconfirm'] = '<p>You are about to inactivate policy <em>\'{$a->name}\'</em> version <em>\'{$a->revision}\'</em>.</p>';
@@ -159,7 +159,7 @@
 $string['privacysettings'] = 'Privacy settings';
 $string['readpolicy'] = 'Please read our {$a}';
 $string['refertofullpolicytext'] = 'Please refer to the full {$a} if you would like to review the text.';
-$string['revokeacknowledgement'] = 'I acknowledge that I have received a request to withdraw consent on behalf of user(s).';
+$string['revokeacknowledgement'] = 'I acknowledge that I have received a request to withdraw consent on behalf of the above user(s).';
 $string['revokedetails'] = 'Withdraw user consent';
 $string['save'] = 'Save';
 $string['saveasdraft'] = 'Save as draft';

diff --git a/admin/tool/policy/tests/behat/acceptances.feature b/admin/tool/policy/tests/behat/acceptances.feature
@@ -58,12 +58,12 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I navigate to "Users > Privacy and policies > Manage policies" in site administration
     And I click on "1 of 4 (25%)" "link" in the "This site policy" "table_row"
     And I click on "Consent not given" "link" in the "User One" "table_row"
-    Then I should see "Give consent on behalf of user"
+    Then I should see "Give consent"
     And I should see "User One"
     And I should see "This site policy"
-    And I should see "I acknowledge that I have received a request to give consent on behalf of user(s)."
+    And I should see "I acknowledge that I have received a request to give consent on behalf of the above user(s)."
     And I set the field "Remarks" to "Consent received from a parent"
-    And I press "Give consent on behalf of user"
+    And I press "Give consent"
     And "Consent given on behalf of user" "icon" should exist in the "User One" "table_row"
     And "Max Manager" "link" should exist in the "User One" "table_row"
     And "Consent received from a parent" "text" should exist in the "User One" "table_row"
@@ -84,12 +84,12 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I navigate to "Users > Privacy and policies > Manage policies" in site administration
     And I click on "1 of 4 (25%)" "link" in the "This site policy" "table_row"
     And I click on "Consent not given" "link" in the "User One" "table_row"
-    Then I should see "Give consent on behalf of user"
+    Then I should see "Give consent"
     And I should see "User One"
     And I should see "This site policy"
-    And I should see "I acknowledge that I have received a request to give consent on behalf of user(s)."
+    And I should see "I acknowledge that I have received a request to give consent on behalf of the above user(s)."
     And I set the field "Remarks" to "Consent received from a parent"
-    And I press "Give consent on behalf of user"
+    And I press "Give consent"
     And "Consent given on behalf of user" "icon" should exist in the "User One" "table_row"
     And "Max Manager" "link" should exist in the "User One" "table_row"
     And "Consent received from a parent" "text" should exist in the "User One" "table_row"
@@ -151,12 +151,12 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I press "Next"
     And I navigate to "Users > Privacy and policies > User agreements" in site administration
     And I click on "Consent not given; click to give consent on behalf of user for This site policy" "link" in the "User One" "table_row"
-    Then I should see "Give consent on behalf of user"
+    Then I should see "Give consent"
     And I should see "User One"
     And I should see "This site policy"
-    And I should see "I acknowledge that I have received a request to give consent on behalf of user(s)."
+    And I should see "I acknowledge that I have received a request to give consent on behalf of the above user(s)."
     And I set the field "Remarks" to "Consent received from a parent"
-    And I press "Give consent on behalf of user"
+    And I press "Give consent"
     And "Consent given on behalf of user" "icon" should exist in the "User One" "table_row"
     And "Consent not given; click to give consent on behalf of user for This privacy policy" "icon" should exist in the "User One" "table_row"
     And I click on "1 of 2" "link" in the "User One" "table_row"
@@ -184,12 +184,12 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I press "Next"
     And I navigate to "Users > Privacy and policies > User agreements" in site administration
     And I click on "Consent not given; click to give consent on behalf of user for This site policy" "link" in the "User One" "table_row"
-    Then I should see "Give consent on behalf of user"
+    Then I should see "Give consent"
     And I should see "User One"
     And I should see "This site policy"
-    And I should see "I acknowledge that I have received a request to give consent on behalf of user(s)."
+    And I should see "I acknowledge that I have received a request to give consent on behalf of the above user(s)."
     And I set the field "Remarks" to "Consent received from a parent"
-    And I press "Give consent on behalf of user"
+    And I press "Give consent"
     And "Consent given on behalf of user" "icon" should exist in the "User One" "table_row"
     And "Consent not given; click to give consent on behalf of user for This privacy policy" "icon" should exist in the "User One" "table_row"
     And I click on "1 of 2" "link" in the "User One" "table_row"
@@ -249,12 +249,12 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I navigate to "Users > Privacy and policies > Manage policies" in site administration
     And I click on "1 of 4 (25%)" "link" in the "This site policy" "table_row"
     And I click on "Consent not given" "link" in the "User One" "table_row"
-    Then I should see "Give consent on behalf of user"
+    Then I should see "Give consent"
     And I should see "User One"
     And I should see "This site policy"
-    And I should see "I acknowledge that I have received a request to give consent on behalf of user(s)."
+    And I should see "I acknowledge that I have received a request to give consent on behalf of the above user(s)."
     And I set the field "Remarks" to "Consent received from a parent"
-    And I press "Give consent on behalf of user"
+    And I press "Give consent"
     And "Consent given on behalf of user" "icon" should exist in the "User One" "table_row"
     And "Max Manager" "link" should not exist in the "User One" "table_row"
     And "Admin User" "link" should exist in the "User One" "table_row"