You have been awarded the badge "%badgename%"!
-More information about this badge can be found at %badgelink%.
-You can manage and download the badge from {$a}.
'; +More information about this badge can be found on the %badgelink% badge information page.
+You can manage and download the badge from your {$a} page.
'; $string['messagesubject'] = 'Congratulations! You just earned a badge!'; $string['method'] = 'This criterion is complete when...'; $string['mingrade'] = 'Minimum grade required'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 6b603f3625499..558e5b736dfaf 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -12,3 +12,14 @@ lockmethod,core_cache lockmethod_help,core_cache personalrepositories,core_repository siteblog,core_blog +managemybadges,core_badges +mybackpack,core_badges +mybadges,core_badges +myfiles,core +myfilesmanage,core +mygrades,core +mypreferences,core +mypreferences,core_grades +myprofile,core +myprofilemyblogs,core_blog +viewallmyentries,core_blog diff --git a/lang/en/grades.php b/lang/en/grades.php index 52bca84deb933..5a7aea5a5f8dd 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -209,7 +209,7 @@ $string['exportonlyactive_help'] = 'Only include students in the export whose enrolment is active and has not been suspended'; $string['exportto'] = 'Export to'; $string['externalurl'] = 'External URL'; -$string['externalurl_desc'] = 'Specify an external url to use for the my grade page. My grades must be set to External URL.'; +$string['externalurl_desc'] = 'If an external gradebook is used, the URL should be specified here.'; $string['extracreditvalue'] = 'Extra credit value for {$a}'; $string['extracreditwarning'] = 'Note: Setting all items for a category to extra credit will effectively remove them from the grade calculation. Since there will be no point total'; $string['feedback'] = 'Feedback'; @@ -460,7 +460,7 @@ $string['multfactorvalue'] = 'Multiplicator value for {$a}'; $string['multfactor_help'] = 'The multiplicator is the factor by which all grades for this grade item will be multiplied, with a maximum value of the maximum grade. For example, if the multiplicator is 2 and the maximum grade is 100, then all grades less than 50 are multiplied by 2, and all grades 50 and above are changed to 100.'; $string['mygrades'] = 'My grades'; -$string['mygrades_desc'] = 'This sets the "My grades" page in the user menu.'; +$string['mygrades_desc'] = 'This setting determines the grades link in the user menu. If an external gradebook is used, \'External URL\' should be selected and the URL specified below.'; $string['mypreferences'] = 'My preferences'; $string['myreportpreferences'] = 'My report preferences'; $string['navmethod'] = 'Navigation method'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 6ac5fe9bbc789..ddca340107228 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -1217,6 +1217,7 @@ $string['mycourses'] = 'My courses'; $string['myfiles'] = 'My private files'; $string['myfilesmanage'] = 'Manage my private files'; +$string['privatefilesmanage'] = 'Manage private files'; $string['myhome'] = 'Dashboard'; $string['mymoodledashboard'] = 'My Moodle dashboard'; $string['myprofile'] = 'My profile'; @@ -1462,6 +1463,7 @@ $string['previouslyselectedusers'] = 'Previously selected users not matching \'{$a}\''; $string['previoussection'] = 'Previous section'; $string['primaryadminsetup'] = 'Setup administrator account'; +$string['privatefiles'] = 'Private files'; $string['private_files_handler'] = 'Store attachments to an e-mail in the user\'s private files storage space.'; $string['private_files_handler_name'] = 'Email to Private files'; $string['profile'] = 'Profile'; diff --git a/lang/en/webservice.php b/lang/en/webservice.php index 46fbb2feda8a5..36079b6f01362 100644 --- a/lang/en/webservice.php +++ b/lang/en/webservice.php @@ -182,7 +182,7 @@ $string['simpleauthlog'] = 'Simple authentication login'; $string['step'] = 'Step'; $string['supplyinfo'] = 'More details'; -$string['testauserwithtestclientdescription'] = 'Simulate external access to the service using the web service test client. Before doing so, login as a user with the moodle/webservice:createtoken capability and obtain the security key (token) via My preferences settings. You will use this token in the test client. In the test client, also choose an enabled protocol with the token authentication. WARNING: The functions that you test WILL BE EXECUTED for this user, so be careful what you choose to test!'; +$string['testauserwithtestclientdescription'] = 'Simulate external access to the service using the web service test client. Before doing so, log in as a user with the moodle/webservice:createtoken capability and obtain the security key (token) via the user\'s preferences page. You will use this token in the test client. In the test client, also choose an enabled protocol with the token authentication. WARNING: The functions that you test WILL BE EXECUTED for this user, so be careful what you choose to test!'; $string['testclient'] = 'Web service test client'; $string['testclientdescription'] = '* The web service test client executes the functions for REAL. Do not test functions that you don\'t know.* All existing web service functions are not yet implemented into the test client.
* In order to check that a user cannot access some functions, you can test some functions that you didn\'t allow.
* To see clearer error messages set the debugging to {$a->mode} into {$a->atag}
* Access the {$a->amfatag}.'; $string['testwithtestclient'] = 'Test the service'; @@ -197,7 +197,7 @@ $string['uploadfiles'] = 'Can upload files'; $string['uploadfiles_help'] = 'If enabled, any user can upload files with their security keys to their own private files area or a draft file area. Any user file quotas apply.'; $string['userasclients'] = 'Users as clients with token'; -$string['userasclientsdescription'] = 'The following steps help you to set up the Moodle web service for users as clients. These steps also help to set up the recommended token (security keys) authentication method. In this use case, the user will generate his token from the security keys page via My preferences settings.'; +$string['userasclientsdescription'] = 'The following steps help you to set up the Moodle web service for users as clients. These steps also help to set up the recommended token (security keys) authentication method. In this use case, the user will generate their token from the security keys page via their preferences page.'; $string['usermissingcaps'] = 'Missing capabilities: {$a}'; $string['usernameorid'] = 'Username / User id'; $string['usernameorid_help'] = 'Enter a username or a user id.'; diff --git a/lib/adminlib.php b/lib/adminlib.php index 78b4f06e304d9..7843dfc03deaf 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -5201,7 +5201,7 @@ public function load_choices() { } /** - * Provides a selection of grade reports to be used for "my grades". + * Provides a selection of grade reports to be used for "grades". * * @copyright 2015 Adrian Greeve
Some plain text
Some more text
" When I click on "Show more buttons" "button" @@ -31,7 +31,7 @@ Feature: Atto accessibility checker @javascript Scenario: Low contrast Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Hard to read
" When I click on "Show more buttons" "button" @@ -41,7 +41,7 @@ Feature: Atto accessibility checker @javascript Scenario: No headings Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Sweet roll oat cake jelly-o macaroon donut oat cake. Caramels macaroon cookie sweet roll croissant cheesecake candy jelly-o. Gummies sugar plum sugar plum gingerbread dessert. Tiramisu bonbon jujubes danish marshmallow cookie chocolate cake cupcake tiramisu. Bear claw oat cake chocolate bar croissant. Lollipop cookie topping liquorice croissant. Brownie cookie cupcake lollipop cupcake cupcake. Fruitcake dessert sweet biscuit dragée caramels marzipan brownie. Chupa chups gingerbread apple pie cookie liquorice caramels carrot cake cookie gingerbread. Croissant candy jelly beans. Tiramisu apple pie dessert apple pie macaroon soufflé. Brownie powder carrot cake chocolate. Tart applicake croissant dragée macaroon chocolate donut.
Jelly beans gingerbread tootsie roll. Sugar plum tiramisu cotton candy toffee pie cotton candy tiramisu. Carrot cake chocolate bar sesame snaps cupcake cake dessert sweet fruitcake wafer. Marshmallow cupcake gingerbread pie sweet candy canes powder gummi bears. Jujubes cake muffin marshmallow candy jelly beans tootsie roll pie. Gummi bears applicake chocolate cake sweet jelly sesame snaps lollipop lollipop carrot cake. Marshmallow cake jelly beans. Jelly beans sesame snaps muffin halvah cookie ice cream candy canes carrot cake. Halvah donut marshmallow tiramisu. Cookie dessert gummi bears. Sugar plum apple pie jelly beans gummi bears tart chupa chups. Liquorice macaroon gummi bears gummies macaroon marshmallow sweet roll cake topping. Lemon drops caramels pie icing danish. Chocolate cake oat cake dessert halvah danish carrot cake apple pie.
" When I click on "Show more buttons" "button" @@ -51,7 +51,7 @@ Feature: Atto accessibility checker @javascript Scenario: Merged cells Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman |
| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman | COOL |
| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman | COOL |
Some plain text
Some plain text
" When I click on "Show more buttons" "button" diff --git a/lib/editor/atto/plugins/align/tests/behat/align.feature b/lib/editor/atto/plugins/align/tests/behat/align.feature index 59b635e70c323..f3f724add7be2 100644 --- a/lib/editor/atto/plugins/align/tests/behat/align.feature +++ b/lib/editor/atto/plugins/align/tests/behat/align.feature @@ -5,14 +5,14 @@ Feature: Atto align text @javascript Scenario: Right align some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Fascism
" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor When I click on "Right align" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" @@ -22,7 +22,7 @@ Feature: Atto align text @javascript Scenario: Left align some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Communism
" And I click on "Show more buttons" "button" @@ -30,7 +30,7 @@ Feature: Atto align text When I click on "Right align" "button" And I click on "Left align" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" @@ -40,14 +40,14 @@ Feature: Atto align text @javascript Scenario: Center align some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "United Future
" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor When I click on "Center" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/bold/tests/behat/bold.feature b/lib/editor/atto/plugins/bold/tests/behat/bold.feature index ef5128c548d20..a1d6316a515c9 100644 --- a/lib/editor/atto/plugins/bold/tests/behat/bold.feature +++ b/lib/editor/atto/plugins/bold/tests/behat/bold.feature @@ -5,13 +5,13 @@ Feature: Atto bold button @javascript Scenario: Bold some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Badger" And I select the text in the "Description" Atto editor When I click on "Bold" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" @@ -21,14 +21,14 @@ Feature: Atto bold button @javascript Scenario: Unbold some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Mouse" And I select the text in the "Description" Atto editor When I click on "Bold" "button" And I click on "Bold" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature index 38720e45b9b55..f7d648169ab22 100644 --- a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature +++ b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature @@ -5,7 +5,7 @@ Feature: Atto charmap button @javascript Scenario: Insert symbols Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "1980 Mullet
" And I select the text in the "Description" Atto editor @@ -13,7 +13,7 @@ Feature: Atto charmap button And I click on "Insert character" "button" And I click on "a - macron" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/clear/tests/behat/clear.feature b/lib/editor/atto/plugins/clear/tests/behat/clear.feature index d28576607404a..1915c7bffbaed 100644 --- a/lib/editor/atto/plugins/clear/tests/behat/clear.feature +++ b/lib/editor/atto/plugins/clear/tests/behat/clear.feature @@ -5,7 +5,7 @@ Feature: Atto clear button @javascript Scenario: Clear formatting Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Pisa" And I select the text in the "Description" Atto editor @@ -14,7 +14,7 @@ Feature: Atto clear button And I select the text in the "Description" Atto editor When I click on "Clear formatting" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature index f72b296e6a1a7..5174ded51b944 100644 --- a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature +++ b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature @@ -5,7 +5,7 @@ Feature: Atto collapse button @javascript Scenario: Toggle toolbar Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" When I click on "Show more buttons" "button" Then "Equation editor" "button" should be visible diff --git a/lib/editor/atto/plugins/equation/tests/behat/equation.feature b/lib/editor/atto/plugins/equation/tests/behat/equation.feature index 4233ae718035a..a74efe0bfc621 100644 --- a/lib/editor/atto/plugins/equation/tests/behat/equation.feature +++ b/lib/editor/atto/plugins/equation/tests/behat/equation.feature @@ -5,7 +5,7 @@ Feature: Atto equation editor @javascript Scenario: Create an equation Given I log in as "admin" - When I follow "My profile" in the user menu + When I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Equation test
" # Set field on the bottom of page, so equation editor dialogue is visible. @@ -18,13 +18,13 @@ Feature: Atto equation editor And I click on "\infty" "button" And I click on "Save equation" "button" And I click on "Update profile" "button" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu Then "\infty" "text" should exist @javascript Scenario: Edit an equation Given I log in as "admin" - When I follow "My profile" in the user menu + When I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "\( \pi \)
" # Set field on the bottom of page, so equation editor dialogue is visible. diff --git a/lib/editor/atto/plugins/html/tests/behat/html.feature b/lib/editor/atto/plugins/html/tests/behat/html.feature index f1b7fbfcb7355..cf4613415a565 100644 --- a/lib/editor/atto/plugins/html/tests/behat/html.feature +++ b/lib/editor/atto/plugins/html/tests/behat/html.feature @@ -5,7 +5,7 @@ Feature: Atto edit HTML @javascript Scenario: Edit the html source Given I log in as "admin" - When I follow "My profile" in the user menu + When I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Smurf
" And I click on "Show more buttons" "button" diff --git a/lib/editor/atto/plugins/image/tests/behat/image.feature b/lib/editor/atto/plugins/image/tests/behat/image.feature index d0b1ddfad8b46..e3b1138363b5c 100644 --- a/lib/editor/atto/plugins/image/tests/behat/image.feature +++ b/lib/editor/atto/plugins/image/tests/behat/image.feature @@ -5,10 +5,10 @@ Feature: Add images to Atto @javascript Scenario: Insert an image Given I log in as "admin" - And I follow "Manage my private files..." + And I follow "Manage private files..." And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager And I click on "Save changes" "button" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" When I set the field "Description" to "Image test
" And I select the text in the "Description" Atto editor @@ -50,7 +50,7 @@ Feature: Add images to Atto @javascript Scenario: Manually inserting an image Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Image: .
I need some space.
" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" And I click on "Indent" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" @@ -22,7 +22,7 @@ Feature: Indent text in Atto @javascript Scenario: Indent and outdent Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu When I follow "Edit profile" And I set the field "Description" to "I need some space.
" And I select the text in the "Description" Atto editor @@ -30,7 +30,7 @@ Feature: Indent text in Atto And I click on "Indent" "button" And I click on "Outdent" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/italic/tests/behat/italic.feature b/lib/editor/atto/plugins/italic/tests/behat/italic.feature index f2c020e559834..cd063f069e7a6 100644 --- a/lib/editor/atto/plugins/italic/tests/behat/italic.feature +++ b/lib/editor/atto/plugins/italic/tests/behat/italic.feature @@ -5,13 +5,13 @@ Feature: Atto italic button @javascript Scenario: Italicise some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Tower of Pisa" And I select the text in the "Description" Atto editor When I click on "Italic" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" @@ -21,14 +21,14 @@ Feature: Atto italic button @javascript Scenario: Toggle italics in some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "GHD - for hair" And I select the text in the "Description" Atto editor When I click on "Italic" "button" And I click on "Italic" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/link/tests/behat/link.feature b/lib/editor/atto/plugins/link/tests/behat/link.feature index f42a6601ebdcc..0a0234adaea21 100644 --- a/lib/editor/atto/plugins/link/tests/behat/link.feature +++ b/lib/editor/atto/plugins/link/tests/behat/link.feature @@ -5,10 +5,10 @@ Feature: Add links to Atto @javascript Scenario: Insert a links Given I log in as "admin" - And I follow "Manage my private files..." + And I follow "Manage private files..." And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager And I click on "Save changes" "button" - When I follow "My profile" in the user menu + When I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Super cool" And I select the text in the "Description" Atto editor @@ -18,7 +18,7 @@ Feature: Add links to Atto And I click on "moodle-logo.png" "link" And I click on "Select this file" "button" And I click on "Update profile" "button" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/media/tests/behat/media.feature b/lib/editor/atto/plugins/media/tests/behat/media.feature index 29ce9ab0d8299..f558f9e4615ea 100644 --- a/lib/editor/atto/plugins/media/tests/behat/media.feature +++ b/lib/editor/atto/plugins/media/tests/behat/media.feature @@ -5,11 +5,11 @@ Feature: Add media to Atto @javascript Scenario: Insert some media Given I log in as "admin" - And I follow "Manage my private files..." + And I follow "Manage private files..." And I upload "lib/editor/atto/tests/fixtures/moodle-logo.webm" file to "Files" filemanager And I click on "Save changes" "button" - When I follow "My profile" in the user menu - And I follow "My blog entries" + When I follow "Profile" in the user menu + And I follow "Blog entries" And I follow "Add a new entry" And I set the field "Blog entry body" to "Media test
" And I select the text in the "Blog entry body" Atto editor diff --git a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature index de98d572ba752..65393cb829cc8 100644 --- a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature +++ b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature @@ -5,13 +5,13 @@ Feature: Atto ordered list button @javascript Scenario: Make a list from some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Have you heard the news everyone's talkingLife is good 'cause everything's awesome
" And I select the text in the "Description" Atto editor When I click on "Ordered list" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/strike/tests/behat/strike.feature b/lib/editor/atto/plugins/strike/tests/behat/strike.feature index e97d362f2d607..dba4d44bb07fc 100644 --- a/lib/editor/atto/plugins/strike/tests/behat/strike.feature +++ b/lib/editor/atto/plugins/strike/tests/behat/strike.feature @@ -5,14 +5,14 @@ Feature: Atto strike button @javascript Scenario: Strike some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "MUA" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" When I click on "Strike through" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature index 1c408dd828795..3ecd8e7ed7db1 100644 --- a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature +++ b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature @@ -5,14 +5,14 @@ Feature: Atto subscript button @javascript Scenario: Subscript some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Submarine" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" When I click on "Subscript" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature index 8d58f91f3fd83..350b11d6f476d 100644 --- a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature +++ b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature @@ -5,14 +5,14 @@ Feature: Atto superscript button @javascript Scenario: Subscript some text Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Edit profile" And I set the field "Description" to "Helicopter" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" When I click on "Superscript" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/atto/plugins/table/tests/behat/table.feature b/lib/editor/atto/plugins/table/tests/behat/table.feature index 05c2d2329b7f7..3c6507e61e64d 100644 --- a/lib/editor/atto/plugins/table/tests/behat/table.feature +++ b/lib/editor/atto/plugins/table/tests/behat/table.feature @@ -5,8 +5,8 @@ Feature: Atto tables @javascript Scenario: Create a table Given I log in as "admin" - And I follow "My profile" in the user menu - And I follow "My blog entries" + And I follow "Profile" in the user menu + And I follow "Blog entries" And I follow "Add a new entry" And I set the field "Entry title" to "How to make a table" And I set the field "Blog entry body" to "Table test" @@ -21,8 +21,8 @@ Feature: Atto tables @javascript Scenario: Edit a table Given I log in as "admin" - And I follow "My profile" in the user menu - And I follow "My blog entries" + And I follow "Profile" in the user menu + And I follow "Blog entries" And I follow "Add a new entry" And I set the field "Entry title" to "How to make a table" And I set the field "Blog entry body" to "
| Cell |
Rocks, clocks, and socks, they're awesome
Figs, and wigs, and twigs, that's awesome
Everything you see or think or say is awesome" And I select the text in the "Description" Atto editor When I click on "Unordered list" "button" And I press "Update profile" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "Plain text area" And I press "Save changes" diff --git a/lib/editor/tinymce/tests/behat/edit_available_icons.feature b/lib/editor/tinymce/tests/behat/edit_available_icons.feature index c9cbdc7d3e4db..ec112da19b931 100644 --- a/lib/editor/tinymce/tests/behat/edit_available_icons.feature +++ b/lib/editor/tinymce/tests/behat/edit_available_icons.feature @@ -9,7 +9,7 @@ Feature: Add or remove items from the TinyMCE editor toolbar | fullname | shortname | category | | Course 1 | C1 | 0 | And I log in as "admin" - And I follow "My preferences" in the user menu + And I follow "Preferences" in the user menu And I follow "Editor preferences" And I set the field "Text editor" to "TinyMCE HTML editor" And I press "Save changes" diff --git a/lib/myprofilelib.php b/lib/myprofilelib.php index 124a09386f400..bc80dc159acb0 100644 --- a/lib/myprofilelib.php +++ b/lib/myprofilelib.php @@ -102,7 +102,7 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user, // Preference page. Only visible by administrators. if (is_siteadmin()) { $url = new moodle_url('/user/preferences.php', array('userid' => $user->id)); - $title = $iscurrentuser ? get_string('mypreferences') : get_string('userspreferences', 'moodle', fullname($user)); + $title = $iscurrentuser ? get_string('preferences') : get_string('userspreferences', 'moodle', fullname($user)); $node = new core_user\output\myprofile\node('administration', 'preferences', $title, null, $url); $tree->add_node($node); } diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 54bc39578d9b3..7e56c18cb88c6 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -1104,7 +1104,7 @@ public function initialise() { } } $this->rootnodes['site'] = $this->add_course($SITE); - $this->rootnodes['myprofile'] = $this->add(get_string('myprofile'), null, self::TYPE_USER, null, 'myprofile'); + $this->rootnodes['myprofile'] = $this->add(get_string('profile'), null, self::TYPE_USER, null, 'myprofile'); $this->rootnodes['currentcourse'] = $this->add(get_string('currentcourse'), null, self::TYPE_ROOTNODE, null, 'currentcourse'); $this->rootnodes['mycourses'] = $this->add(get_string('mycourses'), null, self::TYPE_ROOTNODE, null, 'mycourses'); $this->rootnodes['courses'] = $this->add(get_string('courses'), new moodle_url('/course/index.php'), self::TYPE_ROOTNODE, null, 'courses'); @@ -2231,7 +2231,7 @@ protected function load_for_user($user=null, $forceforcontext=false) { } // Add the messages link. - // It is context based so can appear in "My profile" and in course participants information. + // It is context based so can appear in the user's profile and in course participants information. if (!empty($CFG->messaging)) { $messageargs = array('user1' => $USER->id); if ($USER->id != $user->id) { @@ -2245,10 +2245,10 @@ protected function load_for_user($user=null, $forceforcontext=false) { } // Add the "My private files" link. - // This link doesn't have a unique display for course context so only display it under "My profile". + // This link doesn't have a unique display for course context so only display it under the user's profile. if ($issitecourse && $iscurrentuser && has_capability('moodle/user:manageownfiles', $usercontext)) { $url = new moodle_url('/user/files.php'); - $usernode->add(get_string('myfiles'), $url, self::TYPE_SETTING); + $usernode->add(get_string('privatefiles'), $url, self::TYPE_SETTING); } // Add a node to view the users notes if permitted. @@ -2261,10 +2261,10 @@ protected function load_for_user($user=null, $forceforcontext=false) { $usernode->add(get_string('notes', 'notes'), $url); } - // Show the my grades node. + // Show the grades node. if (($issitecourse && $iscurrentuser) || has_capability('moodle/user:viewdetails', $usercontext)) { require_once($CFG->dirroot . '/user/lib.php'); - // Set the grades node to link to the "My grades" page. + // Set the grades node to link to the "Grades" page. if ($course->id == SITEID) { $url = user_mygrades_url($user->id, $course->id); } else { // Otherwise we are in a course and should redirect to the user grade report (Activity report version). @@ -2273,7 +2273,7 @@ protected function load_for_user($user=null, $forceforcontext=false) { if ($USER->id != $user->id) { $usernode->add(get_string('grades', 'grades'), $url, self::TYPE_SETTING, null, 'usergrades'); } else { - $usernode->add(get_string('mygrades', 'grades'), $url); + $usernode->add(get_string('grades', 'grades'), $url); } } @@ -4219,7 +4219,7 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr } // Add the user profile to the dashboard. - $profilenode = $dashboard->add(get_string('myprofile'), new moodle_url('/user/profile.php', + $profilenode = $dashboard->add(get_string('profile'), new moodle_url('/user/profile.php', array('id' => $user->id)), self::TYPE_SETTING, null, 'myprofile'); if (!empty($CFG->navadduserpostslinks)) { @@ -4257,7 +4257,7 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr } // Add the messages link. - // It is context based so can appear in "My profile" and in course participants information. + // It is context based so can appear in the user's profile and in course participants information. if (!empty($CFG->messaging)) { $messageargs = array('user1' => $USER->id); if ($USER->id != $user->id) { @@ -4271,10 +4271,10 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr } // Add the "My private files" link. - // This link doesn't have a unique display for course context so only display it under "My profile". + // This link doesn't have a unique display for course context so only display it under the user's profile. if ($issitecourse && $iscurrentuser && has_capability('moodle/user:manageownfiles', $usercontext)) { $url = new moodle_url('/user/files.php'); - $dashboard->add(get_string('myfiles'), $url, self::TYPE_SETTING); + $dashboard->add(get_string('privatefiles'), $url, self::TYPE_SETTING); } // Add a node to view the users notes if permitted. @@ -4287,20 +4287,16 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr $dashboard->add(get_string('notes', 'notes'), $url); } - // Show the my grades node. + // Show the grades node. if (($issitecourse && $iscurrentuser) || has_capability('moodle/user:viewdetails', $usercontext)) { require_once($CFG->dirroot . '/user/lib.php'); - // Set the grades node to link to the "My grades" page. + // Set the grades node to link to the "Grades" page. if ($course->id == SITEID) { $url = user_mygrades_url($user->id, $course->id); } else { // Otherwise we are in a course and should redirect to the user grade report (Activity report version). $url = new moodle_url('/course/user.php', array('mode' => 'grade', 'id' => $course->id, 'user' => $user->id)); } - if ($USER->id != $user->id) { - $dashboard->add(get_string('grades', 'grades'), $url, self::TYPE_SETTING, null, 'mygrades'); - } else { - $dashboard->add(get_string('mygrades', 'grades'), $url, self::TYPE_SETTING, null, 'mygrades'); - } + $dashboard->add(get_string('grades', 'grades'), $url, self::TYPE_SETTING, null, 'mygrades'); } $usersetting = navigation_node::create(get_string('preferences', 'moodle'), $prefurl, self::TYPE_CONTAINER, null, $key); $dashboard->add_node($usersetting); @@ -4490,7 +4486,7 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr $badges = $usersetting->add(get_string('badges'), null, navigation_node::TYPE_CONTAINER, null, 'badges'); if (has_capability('moodle/badges:manageownbadges', $usercontext)) { $url = new moodle_url('/badges/mybadges.php'); - $badges->add(get_string('managemybadges', 'badges'), $url, self::TYPE_SETTING); + $badges->add(get_string('managebadges', 'badges'), $url, self::TYPE_SETTING); } $badges->add(get_string('preferences', 'badges'), new moodle_url('/badges/preferences.php'), navigation_node::TYPE_SETTING); diff --git a/lib/tests/user_menu_test.php b/lib/tests/user_menu_test.php index 7997d4135587a..784121a8b2eca 100644 --- a/lib/tests/user_menu_test.php +++ b/lib/tests/user_menu_test.php @@ -58,9 +58,9 @@ public function custom_user_menu_data() { // And these are combinations containing both valid and invalid. array('messages,message|/message/index.php|message -myfiles,moodle|/user/files.php|download +privatefiles,moodle|/user/files.php|download ### -mybadges,badges|/badges/mybadges.php|award +badges,badges|/badges/mybadges.php|award -|-|- test - @@ -92,7 +92,7 @@ public function test_custom_user_menu($data, $entrycount, $dividercount) { // We always add two dividers as standard. $dividercount += 2; - // The basic entry count will additionally include the wrapper menu, Dashboard, My profile, and the Logout link. + // The basic entry count will additionally include the wrapper menu, Dashboard, Profile, and the Logout link. $entrycount += 4; $output = $OUTPUT->user_menu($USER); diff --git a/mod/assign/tests/behat/quickgrading.feature b/mod/assign/tests/behat/quickgrading.feature index 4ca8bd4fab02f..ad5be3f148895 100644 --- a/mod/assign/tests/behat/quickgrading.feature +++ b/mod/assign/tests/behat/quickgrading.feature @@ -128,7 +128,7 @@ Feature: In an assignment, teachers grade multiple students on one page And I follow "Test assignment name" And I should see "I'm the teacher first feedback" And I should see "60.0" - And I follow "My grades" in the user menu + And I follow "Grades" in the user menu And I follow "Course 1" And I should see "1337" And I log out @@ -137,7 +137,7 @@ Feature: In an assignment, teachers grade multiple students on one page And I follow "Test assignment name" And I should not see "I'm the teacher first feedback" And I should not see "60.0" - And I follow "My grades" in the user menu + And I follow "Grades" in the user menu And I follow "Course 1" And I should not see "1337" And I log out @@ -167,7 +167,7 @@ Feature: In an assignment, teachers grade multiple students on one page And I follow "Test assignment name" And I should see "I'm the teacher first feedback" And I should see "60.0" - And I follow "My grades" in the user menu + And I follow "Grades" in the user menu And I follow "Course 1" And I should see "1337" And I log out @@ -176,6 +176,6 @@ Feature: In an assignment, teachers grade multiple students on one page And I follow "Test assignment name" And I should not see "I'm the teacher first feedback" And I should not see "60.0" - And I follow "My grades" in the user menu + And I follow "Grades" in the user menu And I follow "Course 1" And I should not see "1337" diff --git a/mod/forum/lib.php b/mod/forum/lib.php index bf0013a482269..3add7827522be 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -7833,8 +7833,7 @@ function mod_forum_myprofile_navigation(core_user\output\myprofile\tree $tree, $ if (!empty($course)) { $postsurl->param('course', $course->id); } - $string = $iscurrentuser ? get_string('myprofileownpost', 'mod_forum') : - get_string('forumposts', 'mod_forum'); + $string = get_string('forumposts', 'mod_forum'); $node = new core_user\output\myprofile\node('miscellaneous', 'forumposts', $string, null, $postsurl); $tree->add_node($node); @@ -7842,8 +7841,7 @@ function mod_forum_myprofile_navigation(core_user\output\myprofile\tree $tree, $ if (!empty($course)) { $discussionssurl->param('course', $course->id); } - $string = $iscurrentuser ? get_string('myprofileowndis', 'mod_forum') : - get_string('myprofileotherdis', 'mod_forum'); + $string = get_string('myprofileotherdis', 'mod_forum'); $node = new core_user\output\myprofile\node('miscellaneous', 'forumdiscussions', $string, null, $discussionssurl); $tree->add_node($node); diff --git a/mod/forum/tests/behat/my_forum_posts.feature b/mod/forum/tests/behat/my_forum_posts.feature index 47201593dd3cb..45a474ae9cb6f 100644 --- a/mod/forum/tests/behat/my_forum_posts.feature +++ b/mod/forum/tests/behat/my_forum_posts.feature @@ -31,11 +31,11 @@ Feature: A user can view their posts and discussions | Message | How awesome is this forum discussion? | And I reply "Forum discussion 1" post from "Test forum name" forum with: | Message | Actually, I've seen better. | - When I follow "My profile" in the user menu - And I follow "My forum posts" + When I follow "Profile" in the user menu + And I follow "Forum posts" Then I should see "How awesome is this forum discussion?" And I should see "Actually, I've seen better." - And I follow "My profile" in the user menu - And I follow "My forum discussions" + And I follow "Profile" in the user menu + And I follow "Forum discussions" And I should see "How awesome is this forum discussion?" And I should not see "Actually, I've seen better." diff --git a/mod/lesson/tests/behat/lesson_practice.feature b/mod/lesson/tests/behat/lesson_practice.feature index 19086c7a7cd2b..d5dcb9bf85dd3 100644 --- a/mod/lesson/tests/behat/lesson_practice.feature +++ b/mod/lesson/tests/behat/lesson_practice.feature @@ -51,7 +51,7 @@ Feature: Practice mode in a lesson activity | True | 1 | And I press "Submit" Then I should see "View grades" - And I follow "My grades" in the user menu + And I follow "Grades" in the user menu And I follow "Course 1" And I should see "Non-practice lesson" @@ -72,7 +72,7 @@ Feature: Practice mode in a lesson activity | True | 1 | And I press "Submit" Then I should not see "View grades" - And I follow "My grades" in the user menu + And I follow "Grades" in the user menu And I follow "Course 1" And I should not see "Practice lesson" @@ -94,6 +94,6 @@ Feature: Practice mode in a lesson activity | True | 1 | And I press "Submit" Then I should not see "View grades" - And I follow "My grades" in the user menu + And I follow "Grades" in the user menu And I follow "Course 1" And I should not see "Practice lesson with scale" diff --git a/mod/lesson/tests/behat/questions_images.feature b/mod/lesson/tests/behat/questions_images.feature index d0b7af90f86e6..9ebc9c25351f6 100644 --- a/mod/lesson/tests/behat/questions_images.feature +++ b/mod/lesson/tests/behat/questions_images.feature @@ -17,7 +17,7 @@ Feature: In a lesson activity, teacher can add embedded images in questions answ | teacher1 | C1 | editingteacher | | student1 | C1 | student | And I log in as "teacher1" - And I follow "Manage my private files" + And I follow "Manage private files" And I upload "mod/lesson/tests/fixtures/moodle_logo.jpg" file to "Files" filemanager And I click on "Save changes" "button" When I am on homepage diff --git a/mod/quiz/tests/behat/completion_condition_attempts_used.feature b/mod/quiz/tests/behat/completion_condition_attempts_used.feature index 83a27b50eb7f1..b69e3747ca619 100644 --- a/mod/quiz/tests/behat/completion_condition_attempts_used.feature +++ b/mod/quiz/tests/behat/completion_condition_attempts_used.feature @@ -47,7 +47,7 @@ Feature: Set a quiz to be marked complete when the student uses all attempts all | Feedback for the response 'True'. | So you think it is true | | Feedback for the response 'False'. | So you think it is false | And I follow "Course 1" - And I follow "Grades" + And I navigate to "Grades" node in "Course administration" And I navigate to "Categories and items" node in "Grade administration > Setup" And I follow "Edit quiz Test quiz name" Then I should see "Edit grade item" diff --git a/mod/quiz/tests/behat/completion_condition_passing_grade.feature b/mod/quiz/tests/behat/completion_condition_passing_grade.feature index b37dbf5b65d95..3ae54f212200c 100644 --- a/mod/quiz/tests/behat/completion_condition_passing_grade.feature +++ b/mod/quiz/tests/behat/completion_condition_passing_grade.feature @@ -46,7 +46,7 @@ Feature: Set a quiz to be marked complete when the student passes | Feedback for the response 'True'. | So you think it is true | | Feedback for the response 'False'. | So you think it is false | And I follow "Course 1" - And I follow "Grades" + And I navigate to "Grades" node in "Course administration" And I set the field "jump" to "Categories and items" And I press "Go" And I follow "Edit quiz Test quiz name" diff --git a/my/tests/behat/add_blocks.feature b/my/tests/behat/add_blocks.feature index 9bf2dc3658b39..8afde3e4ec220 100644 --- a/my/tests/behat/add_blocks.feature +++ b/my/tests/behat/add_blocks.feature @@ -23,6 +23,6 @@ Feature: Add blocks to dashboard page When I press "Customise this page" And I add the "Latest news" block Then I should see "Latest news" in the "Latest news" "block" - And I should see "My latest badges" in the "My latest badges" "block" + And I should see "Latest badges" in the "Latest badges" "block" And I should see "Calendar" in the "Calendar" "block" And I should see "Upcoming events" in the "Upcoming events" "block" diff --git a/my/tests/behat/reset_page.feature b/my/tests/behat/reset_page.feature index fddb0e4a0f87f..4677d440d050b 100644 --- a/my/tests/behat/reset_page.feature +++ b/my/tests/behat/reset_page.feature @@ -25,7 +25,7 @@ Feature: Reset dashboard page to default And I add the "Comments" block And I press "Reset page to default" Then I should not see "Latest news" - And I should see "My latest badges" + And I should see "Latest badges" And I should see "Calendar" And I should see "Upcoming events" And I should not see "Comments" diff --git a/notes/lib.php b/notes/lib.php index 3d2fae04c15c7..3c455513ca44c 100644 --- a/notes/lib.php +++ b/notes/lib.php @@ -380,8 +380,7 @@ function note_view($context, $userid) { */ function core_notes_myprofile_navigation(core_user\output\myprofile\tree $tree, $user, $iscurrentuser, $course) { $url = new moodle_url("/notes/index.php", array('user' => $user->id)); - $title = $iscurrentuser ? get_string('myprofileownnotes', 'core_notes') : - get_string('notes', 'core_notes'); + $title = get_string('notes', 'core_notes'); if (empty($course)) { // Site level profile. if (!has_capability('moodle/notes:view', context_system::instance())) { diff --git a/report/outline/tests/behat/user.feature b/report/outline/tests/behat/user.feature index c7fa251822979..912945ef74c31 100644 --- a/report/outline/tests/behat/user.feature +++ b/report/outline/tests/behat/user.feature @@ -49,13 +49,13 @@ Feature: View the user page for the outline report And I follow "URL name" And I follow "URL name" And I click on "Student 1" "link" - And I follow "My profile" in the open menu + And I follow "Profile" in the open menu And I follow "Course 1" When I follow "Outline report" Then I should see "4 views" in the "Folder name" "table_row" And I should see "3 views" in the "URL name" "table_row" And I click on "Student 1" "link" - And I follow "My profile" in the open menu + And I follow "Profile" in the open menu And I follow "Course 1" When I follow "Complete report" And I should see "4 views" @@ -79,12 +79,12 @@ Feature: View the user page for the outline report And I follow "URL name" And I follow "URL name" And I follow "URL name" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Course 1" When I follow "Outline report" Then I should see "4 views" in the "Folder name" "table_row" And I should see "3 views" in the "URL name" "table_row" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Course 1" When I follow "Complete report" And I should see "4 views" @@ -110,12 +110,12 @@ Feature: View the user page for the outline report And I follow "URL name" And I follow "URL name" And I follow "URL name" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Course 1" When I follow "Outline report" Then I should see "4 views" in the "Folder name" "table_row" And I should see "3 views" in the "URL name" "table_row" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu And I follow "Course 1" When I follow "Complete report" And I should see "4 views" diff --git a/report/usersessions/tests/behat/usersessions_report.feature b/report/usersessions/tests/behat/usersessions_report.feature index 0b0a740329408..bdb0d2c80e714 100644 --- a/report/usersessions/tests/behat/usersessions_report.feature +++ b/report/usersessions/tests/behat/usersessions_report.feature @@ -7,6 +7,6 @@ Feature: In a report, admin can see current sessions @javascript Scenario: Check usersessions report shows current session Given I log in as "admin" - And I follow "My profile" in the user menu + And I follow "Profile" in the user menu When I follow "Browser sessions" Then I should see "Current session" diff --git a/repository/recent/tests/behat/add_recent.feature b/repository/recent/tests/behat/add_recent.feature index 968a60c85dd64..f5666a919b5a4 100644 --- a/repository/recent/tests/behat/add_recent.feature +++ b/repository/recent/tests/behat/add_recent.feature @@ -10,7 +10,7 @@ Feature: Recent files repository lists the recently used files | fullname | shortname | category | | Course 1 | C1 | 0 | And I log in as "admin" - And I follow "Manage my private files" + And I follow "Manage private files" And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager And I upload "lib/tests/fixtures/upload_users.csv" file to "Files" filemanager And I press "Save changes" diff --git a/repository/tests/behat/cancel_add_file.feature b/repository/tests/behat/cancel_add_file.feature index 837b5e8e48c27..294d5cdde946e 100644 --- a/repository/tests/behat/cancel_add_file.feature +++ b/repository/tests/behat/cancel_add_file.feature @@ -10,7 +10,7 @@ Feature: A selected file can be cancelled | fullname | shortname | category | | Course 1 | C1 | 0 | And I log in as "admin" - And I follow "Manage my private files" + And I follow "Manage private files" And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager And I press "Save changes" And I am on site homepage diff --git a/repository/tests/behat/create_shortcut.feature b/repository/tests/behat/create_shortcut.feature index 794a686d10351..944bd5249cf51 100644 --- a/repository/tests/behat/create_shortcut.feature +++ b/repository/tests/behat/create_shortcut.feature @@ -16,7 +16,7 @@ Feature: Create shortcuts | user | course | role | | teacher1 | C1 | editingteacher | When I log in as "teacher1" - And I follow "Manage my private files" + And I follow "Manage private files" And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager Then I should see "empty.txt" in the "div.fp-content" "css_element" And I press "Save changes" diff --git a/repository/tests/behat/delete_files.feature b/repository/tests/behat/delete_files.feature index b3685b55f571c..7bd3db23f13c3 100644 --- a/repository/tests/behat/delete_files.feature +++ b/repository/tests/behat/delete_files.feature @@ -7,15 +7,15 @@ Feature: Delete files and folders from the file manager @javascript @_bug_phantomjs Scenario: Delete a file and a folder Given I log in as "admin" - And I follow "Manage my private files" + And I follow "Manage private files" And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager And I create "Delete me" folder in "Files" filemanager And I press "Save changes" - And I follow "Manage my private files" + And I follow "Manage private files" When I delete "empty.txt" from "Files" filemanager And I press "Save changes" Then I should not see "empty.txt" - And I follow "Manage my private files" + And I follow "Manage private files" And I delete "Delete me" from "Files" filemanager And I press "Save changes" And I should not see "Delete me" diff --git a/repository/tests/behat/overwrite_file.feature b/repository/tests/behat/overwrite_file.feature index 3df24c68b901d..91c19c8209931 100644 --- a/repository/tests/behat/overwrite_file.feature +++ b/repository/tests/behat/overwrite_file.feature @@ -16,7 +16,7 @@ Feature: Overwrite file feature | user | course | role | | teacher1 | C1 | editingteacher | When I log in as "teacher1" - And I follow "Manage my private files" + And I follow "Manage private files" And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager Then I should see "1" elements in "Files" filemanager And I upload and overwrite "lib/tests/fixtures/empty.txt" file to "Files" filemanager diff --git a/repository/upload/tests/behat/upload_file.feature b/repository/upload/tests/behat/upload_file.feature index ab3c50ee2e3de..4cf8fdef4f55e 100644 --- a/repository/upload/tests/behat/upload_file.feature +++ b/repository/upload/tests/behat/upload_file.feature @@ -10,7 +10,7 @@ Feature: Upload files | fullname | shortname | category | | Course 1 | C1 | 0 | And I log in as "admin" - When I follow "Manage my private files..." + When I follow "Manage private files..." And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager Then I should see "1" elements in "Files" filemanager And I should see "empty.txt" in the "div.fp-content" "css_element" diff --git a/user/files.php b/user/files.php index 0417b0360cf9e..5ff6f84754adf 100644 --- a/user/files.php +++ b/user/files.php @@ -41,7 +41,7 @@ $context = context_user::instance($USER->id); require_capability('moodle/user:manageownfiles', $context); -$title = get_string('myfiles'); +$title = get_string('privatefiles'); $struser = get_string('user'); $PAGE->set_url('/user/files.php'); diff --git a/user/lib.php b/user/lib.php index 296da8e64e683..797ce91943672 100644 --- a/user/lib.php +++ b/user/lib.php @@ -674,7 +674,7 @@ function user_convert_text_to_menu_items($text, $page) { $bits[1] = null; $child->itemtype = "invalid"; } else { - // Nasty hack to replace the my grades with the direct url. + // Nasty hack to replace the grades with the direct url. if (strpos($bits[1], '/grade/report/mygrades.php') !== false) { $bits[1] = user_mygrades_url(); } @@ -818,7 +818,7 @@ function user_get_user_navigation_info($user, $page) { $myprofile = new stdClass(); $myprofile->itemtype = 'link'; $myprofile->url = new moodle_url('/user/profile.php', array('id' => $user->id)); - $myprofile->title = get_string('myprofile'); + $myprofile->title = get_string('profile'); $myprofile->pix = "i/user"; $returnobject->navitems[] = $myprofile; @@ -1030,11 +1030,11 @@ function user_list_view($course, $context) { } /** - * Returns the url to use for the "My grades" link in the user navigation. + * Returns the url to use for the "Grades" link in the user navigation. * * @param int $userid The user's ID. * @param int $courseid The course ID if available. - * @return mixed A URL to be directed to for "My grades". + * @return mixed A URL to be directed to for "Grades". */ function user_mygrades_url($userid = null, $courseid = SITEID) { global $CFG, $USER; diff --git a/user/preferences.php b/user/preferences.php index 42a678d21646e..f2f13f465ae95 100644 --- a/user/preferences.php +++ b/user/preferences.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see