L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-84321-405-enfix' of https://github.com/mudrd8mz/moodle into MOODLE_405_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2025-01-31 15:42:44 +01:00
parent 9a3e960c18 82cee60e32
commit 0d6f6a9088
17 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/mfa/factor/capability/lang/en/factor_capability.php
+1 -1
View File
@@ -23,7 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['capability:cannotpassfactor'] = 'STOPS a role from passing the MFA user capability factor.';
$string['capability:cannotpassfactor'] = 'Must use other factor in MFA to authenticate';
$string['pluginname'] = 'User capability';
$string['privacy:metadata'] = 'The User capability factor plugin does not store any personal data.';
$string['settings:adminpasses'] = 'Site admins can pass this factor';
admin/tool/task/lang/en/tool_task.php
+1 -1
View File
@@ -30,7 +30,7 @@ $string['adhoctasksdue'] = 'Ad hoc tasks due';
$string['adhoctasksfailed'] = 'Ad hoc tasks failed';
$string['adhoctasksfuture'] = 'Future ad hoc tasks';
$string['adhoctasksrunning'] = 'Ad hoc tasks running';
$string['asap'] = 'ASAP';
$string['asap'] = '<abbr title="As soon as possible">ASAP</abbr>';
$string['adhocempty'] = 'Ad hoc task queue is empty';
$string['adhocqueuesize'] = 'Ad hoc task queue has {$a} tasks';
$string['adhocqueueold'] = 'Oldest unprocessed task is {$a->age}, which is more than {$a->max}';
ai/classes/table/aiprovider_management_table.php
+1 -1
View File
@@ -19,7 +19,7 @@ namespace core_ai\table;
use moodle_url;
/**
* Table to manage AI Provider plugins.
* Table to manage AI provider plugins.
*
* @package core_ai
* @copyright 2024 Matt Porritt <[email protected]>
ai/provider/azureai/lang/en/aiprovider_azureai.php
+1 -1
View File
@@ -24,7 +24,7 @@
$string['action_apiversion'] = 'API version';
$string['action_deployment'] = 'Deployment ID';
$string['action_deployment_desc'] = 'The deployment ID that relates to the API endpoint the provider uses for this action.';
$string['action_deployment_desc'] = 'The deployment ID that relates to the API endpoint the provider uses for this action.';
$string['action_systeminstruction'] = 'System instruction';
$string['action_systeminstruction_desc'] = 'This instruction is sent to the AI model along with the user\'s prompt. Editing this instruction is not recommended unless absolutely required.';
$string['apikey'] = 'Azure AI API key';
communication/provider/matrix/lang/en/communication_matrix.php
+2 -2
View File
@@ -23,10 +23,10 @@
*/
$string['cachedef_serverversions'] = 'Matrix server version information for running servers';
$string['matrixhomeservername'] = 'Homeserver Name';
$string['matrixhomeservername'] = 'Homeserver name';
$string['matrixhomeservername_desc'] = 'The part after <code>@user:</code> in your Matrix ID (e.g. <code>example.com</code> in <code>@user:example.com</code>)';
$string['matrixhomeserverurl'] = 'Homeserver URL';
$string['matrixhomeserverurl_desc'] = 'Server URL for connecting and creating accounts (e.g., https://matrix.example.com)';
$string['matrixhomeserverurl_desc'] = 'Server URL for connecting and creating accounts e.g. https://matrix.example.com.';
$string['matrixaccesstoken'] = 'Access token';
$string['matrixaccesstoken_desc'] = 'Access token for the account which will perform actions on the homeserver.';
$string['matrixelementurl'] = 'Element web URL';
filter/displayh5p/tests/behat/inline_editing_content.feature
+5 -5
View File
@@ -42,7 +42,7 @@ Feature: Inline editing H5P content anywhere
# Add H5P content to the page.
And I am on the "PageName1" "page activity" page logged in as "teacher1"
And I navigate to "Settings" in current page administration
And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Insert H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Private files" repository in file picker
And I click on "greeting-card.h5p" "file" in repository content area
@@ -86,7 +86,7 @@ Feature: Inline editing H5P content anywhere
# Add H5P content to the page.
And I am on the "PageName1" "page activity" page
And I navigate to "Settings" in current page administration
And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Insert H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
@@ -130,7 +130,7 @@ Feature: Inline editing H5P content anywhere
# Add H5P content to the page.
And I am on the "PageName1" "page activity" page
And I navigate to "Settings" in current page administration
And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Insert H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
@@ -176,7 +176,7 @@ Feature: Inline editing H5P content anywhere
# Add H5P content to the page.
And I am on the "PageName1" "page activity" page
And I navigate to "Settings" in current page administration
And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Insert H5P content" "button" in the "#fitem_id_page" "css_element"
And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1290772960722742119"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I click on "Save and display" "button"
@@ -219,7 +219,7 @@ Feature: Inline editing H5P content anywhere
| Text block title | H5PTest |
| Content | - |
And I configure the "H5PTest" block
And I click on "Configure H5P content" "button" in the "//div[contains(@id,'fitem_id_config_text')]" "xpath_element"
And I click on "Insert H5P content" "button" in the "//div[contains(@id,'fitem_id_config_text')]" "xpath_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
h5p/tests/behat/h5p_deployment.feature
+1 -1
View File
@@ -26,7 +26,7 @@ Feature: Undeployed H5P content should be only available to users that can deplo
And the following "contentbank content" exist:
| contextlevel | reference | contenttype | user | contentname | filepath |
| Course | C1 | contenttype_h5p | teacher1 | filltheblanks.h5p | /h5p/tests/fixtures/filltheblanks.h5p |
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I click on "Content bank" "link" in the ".fp-repo-area" "css_element"
And I click on "filltheblanks.h5p" "link"
lang/en/admin.php
+2 -2
View File
@@ -341,7 +341,7 @@ $string['configperfdebug'] = 'If you turn this on, performance info will be prin
$string['configprofileroles'] = 'Roles that are listed in user profiles and on the participants page.';
$string['configprofilesforenrolledusersonly'] = 'To prevent misuse by spammers, profile descriptions of users who are not yet enrolled in any course are hidden. New users must enrol in at least one course before they can add a profile description.';
$string['configprotectusernames'] = 'If enabled, the forgotten password form will not display any hints allowing account usernames or email addresses to be guessed.';
$string['configproxybypass'] = 'List of (partial) hostnames or IP addresses that should bypass the proxy. Separate each item by commas, with no spaces. For example: 192.168.0.0/16,*.mydomain.com.';
$string['configproxybypass'] = 'List of (partial) hostnames or IP addresses that should bypass the proxy. Separate items by a comma and no spaces, for example 192.168.0.0/16,*.mydomain.com.';
$string['configproxyhost'] = 'If this <b>server</b> needs to use a proxy computer (eg a firewall) to access the Internet, then provide the proxy hostname here. Otherwise leave it blank.';
$string['configproxypassword'] = 'Password needed to access internet through proxy if required, empty if none (PHP cURL extension required).';
$string['configproxyport'] = 'If this server needs to use a proxy computer, then provide the proxy port here.';
@@ -1490,7 +1490,7 @@ $string['tools'] = 'Admin tools';
$string['toolsmanage'] = 'Manage admin tools';
$string['unattendedoperation'] = 'Unattended operation';
$string['unbookmarkthispage'] = 'Unbookmark this page';
$string['unicoderequired'] = 'It is required that you store all your data in Unicode format (UTF-8). New installations must be performed into databases that have their default character set as Unicode. If you are upgrading, you should perform the UTF-8 migration process (see the Admin page).';
$string['unicoderequired'] = 'All data must be stored in Unicode format (UTF-8). For new installations, the database must have UTF-8 as default character set. If you are upgrading, you need to follow the UTF-8 migration process.';
$string['uninstallplugin'] = 'Uninstall';
$string['unlockaccount'] = 'Unlock account';
$string['unoconvwarning'] = 'The version of unoconv you have installed is not supported.';
lang/en/auth.php
+2 -2
View File
@@ -38,7 +38,7 @@ $string['auth_changepasswordhelp'] = 'Change password help';
$string['auth_changepasswordhelp_expl'] = 'Display lost password help to users who have lost their {$a} password. This will be displayed either as well as or instead of the <strong>Change Password URL</strong> or Internal Moodle password change.';
$string['auth_changepasswordurl'] = 'Change password URL';
$string['auth_changepasswordurl_expl'] = 'Specify the url to send users who have lost their {$a} password. Set <strong>Use standard Change Password page</strong> to <strong>No</strong>.';
$string['auth_changingemailaddress'] = 'You have requested a change of email address, from {$a->oldemail} to {$a->newemail}. For security reasons, we are sending you an email message at the new address to confirm that it belongs to you. Your email address will be updated as soon as you open the URL sent to you in that message. The confirmation link will expire in <b>10 minutes</b>';
$string['auth_changingemailaddress'] = 'You requested a change of email address, from {$a->oldemail} to {$a->newemail}. For security reasons, we are sending you a message to your new address to confirm that it belongs to you. Your email address will be updated as soon as you open the URL sent to you in the message. The confirmation link will expire in 10 minutes.';
$string['authinstructions'] = 'Leave this blank for the default login instructions to be displayed on the login page. If you want to provide custom login instructions, enter them here.';
$string['auth_invalidnewemailkey'] = 'Error: if you are trying to confirm a change of email address, you may have made a mistake in copying the URL we sent you by email. Please copy the address and try again.';
$string['auth_loginpasswordtoggle'] = 'Password visibility toggle';
@@ -161,7 +161,7 @@ $string['showguestlogin'] = 'You can hide or show the guest login button on the
$string['showloginform'] = 'Display manual login form';
$string['showloginform_desc'] = 'If all users on the site use an authentication method such as OAuth 2 that doesn\'t require them to enter a username and password, you can hide the manual login form. Note that users with manual accounts will not be able to log in.
If you hide the manual login form then can\'t log in, you can display it again using the command line php admin/cli/cfg.php --name=showloginform --set=1.';
If you hide the manual login form then can\'t log in, you can display it again using the command line php admin/cli/cfg.php --name=showloginform --set=1';
$string['stdchangepassword'] = 'Use standard page for changing password';
$string['stdchangepassword_expl'] = 'If the external authentication system allows password changes through Moodle, switch this to Yes. This setting overrides \'Change Password URL\'.';
$string['stdchangepassword_explldap'] = 'NOTE: It is recommended that you use LDAP over an SSL encrypted tunnel (ldaps://) if the LDAP server is remote.';
lang/en/error.php
+1 -1
View File
@@ -230,7 +230,7 @@ $string['dndmaxbytes'] = 'The file is too large. The maximum size allowed is {$a
$string['dndread'] = 'Error reading the file';
$string['dndupload'] = 'An unknown error ocurred while uploading the file';
$string['dndunkownfile'] = 'This file type is not supported';
$string['downgradedcore'] = 'ERROR!!! The code you are using is OLDER than the version that made these databases!';
$string['downgradedcore'] = 'Error: The code you are using is older than the version recorded in the database.';
$string['downloadedfilecheckfailed'] = 'Downloaded file check failed';
$string['duplicatefieldname'] = 'Duplicate field name "{$a}" detected';
$string['duplicatenosupport'] = '\'{$a->modname}\' activity could not be duplicated because the {$a->modtype} module does not support backup and restore.';
lang/en/moodle.php
+5 -7
View File
@@ -1501,20 +1501,18 @@ $string['newuser'] = 'New user';
$string['newusernewpasswordsubj'] = 'New user account';
$string['newusernewpasswordtext'] = 'Hi {$a->firstname},
A new account has been created for you at \'{$a->sitename}\'
and you have been issued with a new temporary password.
An account has been created for you at \'{$a->sitename}\'.
Your login information is:
username: {$a->username}
password: {$a->newpassword}
(you will have to change your password
when you log in for the first time)
(You will be prompted to change your password when you log in for the first time.)
To start using \'{$a->sitename}\', log in at
{$a->link}
If you need help, you can contact the site administrator,
{$a->admin}';
If you need help, contact the site administrator,
{$a->signoff}';
$string['newusers'] = 'New users';
$string['newwindow'] = 'New window';
$string['next'] = 'Next';
lib/db/caches.php
+1 -1
View File
@@ -640,7 +640,7 @@ $definitions = array(
'canuselocalstore' => true,
],
// Cache to store AI rate limits.
// Used by AI Provider plugins to limit the number of requests to external services.
// Used by AI provider plugins to limit the number of requests to external services.
'ai_ratelimit' => [
'mode' => cache_store::MODE_APPLICATION,
'simplekeys' => true, // Cache must use simple keys (a-zA-Z0-9_).
lib/editor/tiny/plugins/h5p/lang/en/tiny_h5p.php
+1 -1
View File
@@ -23,7 +23,7 @@
*/
$string['modaltitle'] = 'Insert H5P content';
$string['buttontitle'] = 'Configure H5P content';
$string['buttontitle'] = 'Insert H5P content';
$string['insert'] = 'Insert H5P content';
$string['pluginname'] = 'Insert H5P';
$string['browserepositories'] = 'Browse repositories...';
lib/editor/tiny/plugins/h5p/tests/behat/h5p.feature
+12 -12
View File
@@ -25,7 +25,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
Scenario: TinyMCE can be used to embed an H5P activity
Given I change window size to "large"
And I am on the PageName1 "page activity editing" page logged in as admin
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1290772960722742119"
And I click on "Insert H5P content" "button" in the "Insert H5P content" "dialogue"
When I click on "Save and display" "button"
@@ -40,7 +40,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
| filepath | h5p/tests/fixtures/guess-the-answer.h5p |
And I change window size to "large"
And I am on the "PageName1" "page activity editing" page logged in as "admin"
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
And I click on "guess-the-answer.h5p" "link"
@@ -55,7 +55,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
| capability | permission | role | contextlevel | reference |
| tiny/h5p:addembed | Prohibit | editingteacher | Course | C1 |
When I am on the PageName1 "page activity editing" page logged in as teacher1
Then "Configure H5P content" "button" should not exist
Then "Insert H5P content" "button" should not exist
@javascript
Scenario: When a user does not have the Upload H5P capability, they can embed but not upload H5P content with TinyMCE
@@ -63,7 +63,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
| capability | permission | role | contextlevel | reference |
| moodle/h5p:deploy | Prohibit | editingteacher | Course | C1 |
When I am on the PageName1 "page activity editing" page logged in as teacher1
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
Then I should not see "H5P file upload" in the "Insert H5P content" "dialogue"
And I should see "H5P URL" in the "Insert H5P content" "dialogue"
And I should not see "H5P options" in the "Insert H5P content" "dialogue"
@@ -74,7 +74,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
| user | admin |
| filepath | h5p/tests/fixtures/drag.h5p |
And I am on the "PageName1" "page activity editing" page logged in as "admin"
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
And I click on "drag" "link"
@@ -88,7 +88,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
And I switch to the main frame
And I navigate to "Settings" in current page administration
And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1290772960722742119"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I wait "1" seconds
@@ -103,7 +103,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
| user | admin |
| filepath | h5p/tests/fixtures/guess-the-answer.h5p |
And I am on the "PageName1" "page activity editing" page logged in as "admin"
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
And I click on "guess-the-answer.h5p" "link"
@@ -116,7 +116,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
And I switch to the main frame
And I navigate to "Settings" in current page administration
And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I click on "H5P options" "link"
And I click on "Allow download" "checkbox"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
@@ -130,7 +130,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
And I switch to the main frame
And I navigate to "Settings" in current page administration
And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I click on "Allow download" "checkbox"
And I click on "Embed button" "checkbox"
And I click on "Copyright button" "checkbox"
@@ -147,7 +147,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
Scenario: H5P options are ignored for H5P URLs
Given I change window size to "large"
And I am on the PageName1 "page activity editing" page logged in as admin
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1291366510035871129"
And I click on "H5P options" "link"
And I click on "Embed button" "checkbox"
@@ -160,7 +160,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
And I switch to the main frame
And I navigate to "Settings" in current page administration
And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I click on "H5P options" "link"
And "input[aria-label=\"Embed button\"]:not([checked=checked])" "css_element" should exist
@@ -176,7 +176,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
| user | admin |
| filepath | h5p/tests/fixtures/guess-the-answer.h5p |
And I am on the "PageName1" "page activity editing" page logged in as "admin"
And I click on the "Configure H5P content" button for the "Page content" TinyMCE editor
And I click on the "Insert H5P content" button for the "Page content" TinyMCE editor
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I click on "Private files" "link" in the ".fp-repo-area" "css_element"
And I click on "guess-the-answer.h5p" "link"
mod/data/tests/behat/add_entries.feature
+1 -1
View File
@@ -81,7 +81,7 @@ Feature: Users can add entries to database activities
And I am on the "Course 1" course page logged in as teacher1
When I click on "Test database name" "link"
And I click on "Add entry" "button"
And I click on "Configure H5P content" "button"
And I click on "Insert H5P content" "button"
Then I should see "Browse repositories..." in the "Insert H5P content" "dialogue"
@javascript
mod/forum/tests/behat/h5p_inline_editing_content.feature
+2 -2
View File
@@ -35,7 +35,7 @@ Feature: Inline editing H5P content in mod_forum
Scenario: Edit H5P content from a forum intro using copy to content bank file
Given I am on the "ForumName1" "forum activity editing" page logged in as admin
# Add H5P content to the forum description.
And I click on "Configure H5P content" "button" in the "#fitem_id_introeditor" "css_element"
And I click on "Insert H5P content" "button" in the "#fitem_id_introeditor" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
@@ -82,7 +82,7 @@ Feature: Inline editing H5P content in mod_forum
# Add H5P content to a forum post as admin.
And I set the following fields to these values:
| Subject | Forum post by admin |
And I click on "Configure H5P content" "button" in the "#fitem_id_message" "css_element"
And I click on "Insert H5P content" "button" in the "#fitem_id_message" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
mod/glossary/lang/en/glossary.php
+1 -1
View File
@@ -74,7 +74,7 @@ $string['cnfapprovalstatus'] = 'Define the approval status by default of an entr
$string['cnfcasesensitive'] = 'Define if an entry, when linked, is case sensitive by default';
$string['cnfdefaulthook'] = 'Select the default selection to show when the glossary is first viewed';
$string['cnfdefaultmode'] = 'Select the default frame to show when the glossary is first viewed.';
$string['cnffullmatch'] = 'Define if an entry, when linked, should match the case in the target text by default';
$string['cnffullmatch'] = 'Define if an entry, when linked, should match whole words (and not words inside other words) by default.';
$string['cnflinkentry'] = 'Define if an entry should be automatically linked by default';
$string['cnflinkglossaries'] = 'Define if a glossary should be automatically linked by default';
$string['cnfrelatedview'] = 'Select the display format to be used for automatic linking and entry view.';