Merge branch 'MDL-53566-master' of git://github.com/andrewnicols/moodle

lang/en/admin.php

@@ -379,14 +379,14 @@
 $string['configwarning'] = 'Be careful modifying these settings - strange values could cause problems.';
 $string['configyuicomboloading'] = 'This options enables combined file loading optimisation for YUI libraries. This setting should be enabled on production sites for performance reasons.';
 $string['confirmation'] = 'Confirmation';
-$string['confirmcontextlock'] = '{$a->contextname} is currently unlocked. Locking it will prevent any further changes. Are you sure you wish to continue?';
-$string['confirmcontextunlock'] = '{$a->contextname} is currently locked. Unlocking it will allow users to make changes. Are you sure you wish to continue?';
+$string['confirmcontextlock'] = '{$a->contextname} is currently unfrozen. Freezing it will prevent any further changes. Are you sure you wish to continue?';
+$string['confirmcontextunlock'] = '{$a->contextname} is currently frozen. Unfreezing it will allow users to make changes. Are you sure you wish to continue?';
 $string['confirmdeletecomments'] = 'You are about to delete comments, are you sure?';
 $string['confirmed'] = 'Confirmed';
-$string['contextlocking'] = 'Context locking';
-$string['contextlocking_desc'] = 'This setting allows you to lock categories, courses, activites, and blocks within the site by removing all write-access to those locations.';
-$string['contextlockappliestoadmin'] = 'Context locking applies to administrators';
-$string['contextlockappliestoadmin_desc'] = 'This setting allows administrators to make changes in any context which is locked.';
+$string['contextlocking'] = 'Context freezing';
+$string['contextlocking_desc'] = 'This setting allows you to freeze categories, courses, activites, and blocks within the site by removing all write-access to those locations.';
+$string['contextlockappliestoadmin'] = 'Context freezing applies to administrators';
+$string['contextlockappliestoadmin_desc'] = 'This setting allows administrators to make changes in any context which is frozen.';
 $string['cookiehttponly'] = 'Only http cookies';
 $string['cookiesecure'] = 'Secure cookies only';
 $string['country'] = 'Default country';
@@ -724,10 +724,10 @@
 $string['maintenancemodeisscheduledlong'] = 'This site will be switched to maintenance mode in {$a->hour} hours {$a->min} mins {$a->sec} secs';
 $string['maintfileopenerror'] = 'Error opening maintenance files!';
 $string['maintinprogress'] = 'Maintenance is in progress...';
-$string['managecontextlock'] = 'Lock this context';
-$string['managecontextlocklocked'] = '{$a->contextname}, and all of its children are now locked.';
-$string['managecontextlockunlocked'] = '{$a->contextname}, and all of its children are now unlocked.';
-$string['managecontextunlock'] = 'Unlock this context';
+$string['managecontextlock'] = 'Freeze this context';
+$string['managecontextlocklocked'] = '{$a->contextname}, and all of its children are now frozen.';
+$string['managecontextlockunlocked'] = '{$a->contextname}, and all of its children are now unfrozen.';
+$string['managecontextunlock'] = 'Unfreeze this context';
 $string['manageformats'] = 'Manage course formats';
 $string['manageformatsgotosettings'] = 'Default format can be changed in {$a}';
 $string['managelang'] = 'Manage';

lang/en/role.php

@@ -411,7 +411,7 @@
 $string['site:manageallmessaging'] = 'Add, remove, block and unblock contacts for any user';
 $string['site:manageblocks'] = 'Manage blocks on a page';
 $string['site:messageanyuser'] = 'Bypass user privacy preferences for messaging any user';
-$string['site:managecontextlocks'] = 'Manage locking of contexts';
+$string['site:managecontextlocks'] = 'Manage freezing of contexts';
 $string['site:mnetloginfromremote'] = 'Login from a remote application via MNet';
 $string['site:mnetlogintoremote'] = 'Roam to a remote application via MNet';
 $string['site:readallmessages'] = 'Read all messages on site';

lib/tests/behat/locking.feature

@@ -1,5 +1,5 @@
 @core
-Feature: Context locks apply to child contexts
+Feature: Context freezing apply to child contexts
   In order to preserve content
   As a manager
   I can disbale writes at different areas
@@ -36,12 +36,12 @@ Feature: Context locks apply to child contexts
       | teacher   | courseb   | editingteacher |
       | student1  | courseb   | student        |
 
-  Scenario: Lock course module module should lock just that module
+  Scenario: Freeze course module module should freeze just that module
     Given I log in as "admin"
     And I am on "courseaa1" course homepage
     And I follow "faa1"
     And I should see "Add a new discussion topic"
-    When I follow "Lock this context"
+    When I follow "Freeze this context"
     And I click on "Continue" "button"
     Then I should not see "Add a new discussion topic"
     When I am on "courseaa1" course homepage
@@ -90,20 +90,20 @@ Feature: Context locks apply to child contexts
     When I follow "fb"
     Then I should see "Add a new discussion topic"
 
-  Scenario: Lock course should lock all children
+  Scenario: Freeze course should freeze all children
     Given I log in as "admin"
     And I am on "courseaa1" course homepage
     And I should see "Turn editing on"
-    When I follow "Lock this context"
+    When I follow "Freeze this context"
     And I click on "Continue" "button"
     Then I should not see "Turn editing on"
     Then I should not see "Add a new discussion topic"
     When I am on "courseaa1" course homepage
     Then I should not see "Turn editing on"
-    And I should see "Unlock this context"
+    And I should see "Unfreeze this context"
     When I follow "faa1b"
     Then I should not see "Add a new discussion topic"
-    And I should not see "Unlock this context"
+    And I should not see "Unfreeze this context"
     When I am on "courseaa2" course homepage
     Then I should see "Turn editing on"
     When I follow "faa2"
@@ -146,7 +146,7 @@ Feature: Context locks apply to child contexts
     When I follow "fb"
     Then I should see "Add a new discussion topic"
 
-  Scenario: Lock course category should lock all children
+  Scenario: Freeze course category should freeze all children
     Given I log in as "admin"
     And I go to the courses management page
     And I click on "managecontextlock" action for "cata" in management category listing
@@ -156,15 +156,15 @@ Feature: Context locks apply to child contexts
     Then I should not see "Add a new discussion topic"
     When I am on "courseaa1" course homepage
     Then I should not see "Turn editing on"
-    And I should not see "Unlock this context"
+    And I should not see "Unfreeze this context"
     When I follow "faa1b"
     Then I should not see "Add a new discussion topic"
-    And I should not see "Unlock this context"
+    And I should not see "Unfreeze this context"
     When I am on "courseaa2" course homepage
     Then I should not see "Turn editing on"
     When I follow "faa2"
     Then I should not see "Add a new discussion topic"
-    And I should not see "Unlock this context"
+    And I should not see "Unfreeze this context"
     When I am on "courseb" course homepage
     Then I should see "Turn editing on"
     When I follow "fb"