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

Merge branch 'MDL-85507-main-enfix' of https://github.com/mudrd8mz/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2025-06-04 11:57:13 +08:00
parent da8c48ded1 c6dd080532
commit 8a429d703d
14 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ai/provider/openai/lang/en/aiprovider_openai.php
+1 -1
View File
@@ -66,7 +66,7 @@ $string['settings_frequency_penalty'] = 'frequency_penalty';
$string['settings_frequency_penalty_help'] = 'The frequency penalty adjusts how often words are repeated. The higher the penalty, the less repetitions in the generated text.';
$string['settings_help'] = 'Adjust the settings below to customise how requests are sent to OpenAI.';
$string['settings_max_tokens'] = 'max_tokens';
$string['settings_max_tokens_help'] = 'The maximum number of tokens to generate in the response';
$string['settings_max_tokens_help'] = 'The maximum number of tokens used in the generated text.';
$string['settings_presence_penalty'] = 'presence_penalty';
$string['settings_presence_penalty_help'] = 'The presence penalty encourages the model to use new words by increasing the likelihood of choosing words it hasn\'t used before. A higher value makes the generated text more diverse, while a lower value allows more repetition.';
$string['settings_top_p'] = 'top_p';
course/tests/behat/course_overview.feature
+5 -5
View File
@@ -80,13 +80,13 @@ Feature: Users can access the course activities overview page
And I should see "Assignments" in the "assign_overview_collapsible" "region"
And I should see "Forums" in the "forum_overview_collapsible" "region"
And I should not see "Test assignment name" in the "assign_overview_collapsible" "region"
And I should not see "Forum overview page" in the "forum_overview_collapsible" "region"
And I should not see "Forum overview" in the "forum_overview_collapsible" "region"
When I click on "Expand" "link" in the "assign_overview_collapsible" "region"
Then I should see "Test assignment name" in the "assign_overview_collapsible" "region"
And I should not see "Forum overview page" in the "forum_overview_collapsible" "region"
And I should not see "Forum overview" in the "forum_overview_collapsible" "region"
And I click on "Collapse" "link" in the "assign_overview_collapsible" "region"
And I should not see "Test assignment name" in the "assign_overview_collapsible" "region"
And I should not see "Forum overview page" in the "forum_overview_collapsible" "region"
And I should not see "Forum overview" in the "forum_overview_collapsible" "region"
Scenario: Course overview shows the course present activity types
Given the following "activities" exist:
@@ -258,13 +258,13 @@ Feature: Users can access the course activities overview page
| wiki | C1 | Activity 2 |
| assign | C1 | Activity 3 |
When I am on the "Course 1" "course > activities > wiki" page logged in as "student1"
And I should see "Wiki overview page"
And I should see "Wiki overview"
And I follow "Wiki overview"
And I should see "Activity 1"
And I should see "Activity 2"
# Check activities with integration do not show the link.
And I am on the "Course 1" "course > activities > assign" page
And I should not see "Assignment overview page"
And I should not see "Assignment overview"
Scenario: Activities overview provide completion information to the student
Given the following "activities" exist:
lang/en/admin.php
+8 -10
View File
@@ -257,7 +257,7 @@ $string['configemaildkimselector'] = 'The DKIM selector is arbitrary and your DN
$string['configenablecalendarexport'] = 'Enable exporting or subscribing to calendars.';
$string['configenablecomments'] = 'Enable comments';
$string['configenablecourserequests'] = 'If enabled, users with the capability to request new courses (moodle/course:request) will have the option to request a course. This capability is not allowed for any of the default roles. It may be applied in the system or category context.';
$string['configenablemobilewebservice'] = 'Enable mobile service for the official Moodle app or other app requesting it. For more information, read the {$a}';
$string['configenablemobilewebservice'] = 'Mobile web services are required for the Moodle app. If your site uses HTTPS, mobile web services are enabled by default. For more information, see the {$a}.';
$string['configenablerssfeeds'] = 'If enabled, RSS feeds are generated by various features across the site, such as blogs, forums, database activities and glossaries. Note that RSS feeds also need to be enabled for the particular activity modules.';
$string['configenablerssfeedsdisabled'] = 'It is not available because RSS feeds are disabled in all the Site. To enable them, go to the Variables settings under Admin Configuration.';
$string['configenablerssfeedsdisabled2'] = 'RSS feeds are currently disabled at site level. They may be enabled in Advanced features in the Site administration.';
@@ -445,17 +445,16 @@ $string['courselistshortnames_desc'] = 'If enabled, course short names will be d
$string['coursemgmt'] = 'Manage courses and categories';
$string['courseoverview'] = 'Course overview';
$string['courserequestnotify'] = 'Course request notification';
$string['courserequestnotifyemail'] = '<p>User {$a->user} has requested a new course on your site.</p>
<p>You can review the request at <a href="{$a->link}">{$a->link}</a>.</p>
$string['courserequestnotifyemail'] = '<p>User {$a->user} has requested a new course.</p>
<p>You can review the request in <a href="{$a->link}">Courses pending approval</a>.</p>
<p>Request details:</p>
<ul>
<li>Course full name: {$a->fullname}</li>
<li>Course short name : {$a->shortname}</li>
<li>Category: {$a->category}</li>
<li>Reason for this course request: {$a->reason}</li>
</ul>
';
<li>Reason for course request: {$a->reason}</li>
</ul>';
$string['courserequests'] = 'Course requests';
$string['courserequestspending'] = 'Pending course requests';
$string['courses'] = 'Courses';
@@ -719,7 +718,7 @@ $string['gotofirst'] = 'Go to first missing string';
$string['gradebook'] = 'Gradebook';
$string['gradebookroles'] = 'Graded roles';
$string['gravatardefaulturl'] = 'Gravatar default image URL';
$string['gravatardefaulturl_help'] = 'Gravatar needs a default image to display if it is unable to find a picture for a given user. Provide a full URL for an image. If you leave this setting empty, Moodle will attempt to use the most appropriate default image for the page you are viewing. Note also that Gravatar has a number of codes which can be used to <a href="https://en.gravatar.com/site/implement/images/#default-image">generate default images</a>.';
$string['gravatardefaulturl_help'] = 'Gravatar needs a default image to display if it is unable to find a picture for a given user. Provide a full URL for an image. Codes for generating default images are available from <a href="https://docs.gravatar.com/api/avatars/images/">Gravatar for Developers - Avatar Requests</a>.';
$string['gradeexport'] = 'Primary grade export methods';
$string['gradeexportdefault'] = 'Default grade export method';
$string['guestroleid'] = 'Role for guest';
@@ -1641,9 +1640,8 @@ $string['registration_help'] = 'By registering:
* You are contributing to our Moodle statistics of the worldwide community';
// Deprecated since Moodle 5.0.
$string['importantupdates_content'] = '<p>In the next Moodle 5.0, planned for release in April 2025, the Chat and Survey activities will
be removed from core Moodle. They will be available as plugins in the
$string['importantupdates_content'] = '<p>In Moodle 5.0, Chat and Survey activities are removed from core Moodle. They are available as plugins in the
<a href="https://moodle.org/plugins/">Moodle plugins directory</a>.</p>
<p>If you wish to continue using Chat or Survey in your site, you will be able to install them as plugins before upgrading to Moodle 5.0.</p>';
<p>If you wish to continue using Chat or Survey on your site, you can install them as plugins when upgrading to Moodle 5.0.</p>';
$string['importantupdates_title'] = 'Important update about Chat and Survey activities';
$string['igbinary322buggyversion'] = 'The php-igbinary extension installed on the site can lead to problems when running with PHP 7.2. You are recommended to either upgrade to php-igbinary 3.2.5 or later, or alternatively to upgrade to PHP 7.3 or later.';
lang/en/course.php
+3 -3
View File
@@ -116,9 +116,9 @@ $string['norecentaccessesinfomessage'] = 'Hi {$a->userfirstname},
$string['noteachinginfomessage'] = 'Hi {$a->userfirstname},
<p>Courses with start dates in the next week have been identified as having no teacher or student enrolments.</p>';
$string['overview_info'] = 'An overview of all activities in the course, with dates and other information.';
$string['overview_missing_notice'] = 'Go to {$a} for more details.';
$string['overview_missing_title'] = 'Information not available here for {$a} activities';
$string['overview_modname'] = '{$a} overview page';
$string['overview_missing_notice'] = 'Go to the {$a}.';
$string['overview_missing_title'] = '{$a} information not available.';
$string['overview_modname'] = '{$a} overview';
$string['overview_page_title'] = 'Course activities: {$a}';
$string['overview_table_caption'] = 'Table listing all {$a} activities';
$string['participants:perpage'] = 'Number of participants per page';
lang/en/courseformat.php
+4 -4
View File
@@ -35,8 +35,8 @@ $string['bulkcancel'] = 'Close bulk actions';
$string['bulkselection'] = '{$a} selected';
$string['bulkselection_plural'] = '{$a} selected';
$string['cm_add_feedback'] = '{$a->modname} added.';
$string['cm_complete_feedback'] = '{$a->name} marked as completed.';
$string['cm_complete_feedback_batch'] = 'Selected {$a->count} activities marked as completed.';
$string['cm_complete_feedback'] = '{$a->name} marked as done.';
$string['cm_complete_feedback_batch'] = 'Selected {$a->count} activities marked as done.';
$string['cm_delete_feedback'] = '{$a->name} deleted.';
$string['cm_delete_feedback_batch'] = 'Selected {$a->count} activities deleted.';
$string['cm_duplicate_feedback'] = '{$a->name} duplicated.';
@@ -51,8 +51,8 @@ $string['cm_show_feedback'] = '{$a->name} is now shown.';
$string['cm_show_feedback_batch'] = 'The selected {$a->count} activities are now shown.';
$string['cm_stealth_feedback'] = '{$a->name} is now available but not shown on the course page.';
$string['cm_stealth_feedback_batch'] = 'The selected {$a->count} activities are now available but not shown on the course page.';
$string['cm_uncomplete_feedback'] = '{$a->name} marked as uncompleted.';
$string['cm_uncomplete_feedback_batch'] = 'Selected {$a->count} activities marked as uncompleted.';
$string['cm_uncomplete_feedback'] = '{$a->name} marked as undone.';
$string['cm_uncomplete_feedback_batch'] = 'Selected {$a->count} activities marked as undone.';
$string['cm_visiblegroups_feedback'] = '{$a->name} group mode changed to Visible groups.';
$string['cmavailability'] = 'Activity availability';
$string['cmdelete_info'] = 'This will delete {$a->name} and any user data it contains.';
lang/en/grades.php
+5 -3
View File
@@ -183,7 +183,7 @@ $string['errorcalculationnoequal'] = 'Formula must start with equal sign (=1+2)'
$string['errorcalculationunknown'] = 'Invalid formula';
$string['errorcalculationbroken'] = 'Error in the calculation of grade item {$a}.';
$string['errorgradevaluenonnumeric'] = 'Received non-numeric for low or high grade for';
$string['errornegativepenalty'] = 'Received negative value during penalty aggregation for grade ID {$a}';
$string['errornegativepenalty'] = 'Negative value received from penalty aggregation for grade ID {$a}.';
$string['errornocalculationallowed'] = 'Calculations are not allowed for this item';
$string['errornocategorisedid'] = 'Could not get an uncategorised id!';
$string['errornocourse'] = 'Could not get course information';
@@ -510,7 +510,9 @@ $string['missingitemtypeoreid'] = 'Array key (itemtype or eid) missing';
$string['missingscale'] = 'Scale must be selected';
$string['mode'] = 'Mode';
$string['modgrade'] = 'Grade';
$string['modgrade_help'] = 'Select the type of grading used for this activity. If \'scale\' is chosen, you can then choose the scale from the drop-down menu. If using point grading, you can then enter the maximum grade available for this activity.';
$string['modgrade_help'] = '* Point - A numerical value
* None - Feedback only
* Scale - An item from a list';
$string['modgradecantchangegradetype'] = 'You cannot change the type, as grades already exist for this item.';
$string['modgradecantchangegradetypemsg'] = 'Some grades have already been awarded, so the grade type cannot be changed. If you wish to change the maximum grade, you must first choose whether or not to rescale existing grades.';
$string['modgradecantchangegradetyporscalemsg'] = 'Some grades have already been awarded, so the grade type and scale cannot be changed.';
@@ -713,7 +715,7 @@ $string['realletter'] = 'Real (letter)';
$string['realpercentage'] = 'Real (percentage)';
$string['recalculatepenalty'] = 'Recalculate penalties';
$string['recalculatepenaltyconfirm'] = 'This will recalculate and apply penalties for all submissions in this context. Are you sure you want to continue?';
$string['recalculatepenaltysuccess'] = 'Successfully initiated penalty recalculation. There may be a delay before grades are updated.';
$string['recalculatepenaltysuccess'] = 'Penalty recalculation in progress. There may be a delay before grades are updated.';
$string['recalculatinggrades'] = 'Recalculating grades';
$string['recalculatinggradesadhoc'] = 'The report will update automatically. You don\'t need to do anything.';
$string['recovergradesdefault'] = 'Recover grades default';
lang/en/payment.php
+1 -1
View File
@@ -43,7 +43,7 @@ $string['gatewaydisabled'] = 'Disabled';
$string['gatewayenabled'] = 'Enabled';
$string['gatewaynotfound'] = 'Gateway not found';
$string['gotomanageplugins'] = 'Enable and disable payment gateways and set surcharges via {$a}.';
$string['gotopaymentaccounts'] = 'You can create multiple payment accounts using any of these gateways on the {$a} page';
$string['gotopaymentaccounts'] = 'Create payment accounts using any of these gateways in {$a}.';
$string['hidearchived'] = 'Hide archived';
$string['noaccountsavilable'] = 'No payment accounts are available.';
$string['nocurrencysupported'] = 'No payment in any currency is supported. Please make sure that at least one payment gateway is enabled.';
lang/en/question.php
+1 -1
View File
@@ -268,7 +268,7 @@ $string['numqas'] = 'No. question attempts';
$string['numquestions'] = 'No. questions';
$string['numquestionsandhidden'] = '{$a->numquestions} (+{$a->numhidden} hidden +{$a->numdraft} draft)';
$string['otherquestionbank'] = 'Other question banks';
$string['otherquestionbankstoomany'] = '> {$a} results, please refine your search.';
$string['otherquestionbankstoomany'] = 'More than {$a} results. You need to refine your search.';
$string['page-question-x'] = 'Any question page';
$string['page-question-edit'] = 'Question editing page';
$string['page-question-category'] = 'Question category page';
lang/en/role.php
+1 -1
View File
@@ -219,7 +219,7 @@ $string['course:viewhiddencourses'] = 'View hidden courses';
$string['course:viewhiddengroups'] = 'View hidden groups';
$string['course:viewhiddensections'] = 'View hidden sections';
$string['course:viewhiddenuserfields'] = 'View hidden user fields';
$string['course:viewoverview'] = 'View course activities overview page';
$string['course:viewoverview'] = 'View activities overview';
$string['course:viewparticipants'] = 'View participants';
$string['course:viewscales'] = 'View scales';
$string['course:visibility'] = 'Hide/show courses';
lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php
+3 -3
View File
@@ -25,13 +25,13 @@
defined('MOODLE_INTERNAL') || die();
$string['accessibilitycheckerinfo'] = 'The premium Accessibility Checker will override the default Accessibility Checker for users who have access to it.';
$string['accessibilitycheckerinfo'] = 'The TinyMCE Premium Accessibility Checker will override the default Accessibility Checker for users who have access to it.';
$string['apikey'] = 'API key';
$string['apikey_desc'] = 'Your API key is available on your <a href="https://www.tiny.cloud">Tiny Cloud</a> account page if you have purchased a subscription, or if you are on a free trial.';
$string['emptyapikeywarning'] = 'Enabled TinyMCE Premium plugins will not be available until an API key is added.';
$string['pluginname'] = 'TinyMCE Premium';
$string['pluginnotfound'] = 'Tiny Premium plugin {$a} not found.';
$string['premium:use'] = 'Use TinyMCE premium';
$string['premium:use'] = 'Use TinyMCE Premium';
$string['premium:usea11ychecker'] = 'Use TinyMCE Premium Accessibility Checker';
$string['premium:useadvtable'] = 'Use TinyMCE Premium Advanced Table';
$string['premium:useautocorrect'] = 'Use TinyMCE Premium Spelling Autocorrect';
@@ -68,7 +68,7 @@ $string['premiumplugin:tinymcespellchecker'] = 'Spell Checker Pro';
$string['premiumplugin:typography'] = 'Advanced Typography';
$string['premiumplugins'] = 'Premium plugins';
$string['premiumplugins_desc'] = 'Access to TinyMCE Premium plugins requires an API key. Not all listed plugins may be available with your TinyMCE Premium subscription. You can check available plugins on your <a href="https://www.tiny.cloud">Tiny Cloud</a> account page.';
$string['privacy:metadata'] = 'The Tiny premium plugin for TinyMCE does not store any personal data.';
$string['privacy:metadata'] = 'The Tiny Premium plugin for TinyMCE does not store any personal data.';
// Deprecated since Moodle 4.5.
$string['helplinktext'] = 'Premium plugins';
lib/editor/tiny/plugins/premium/tests/behat/tiny_premium_settings.feature
+1 -1
View File
@@ -26,4 +26,4 @@ Feature: Check the features of the TinyMCE Premium settings
Scenario: I see a notification when I have both the premium and default accessibility checkers enabled
When I click on "Enable Accessibility Checker" "link"
Then I should see "Accessibility Checker enabled."
And I should see "The premium Accessibility Checker will override the default Accessibility Checker for users who have access to it."
And I should see "The TinyMCE Premium Accessibility Checker will override the default Accessibility Checker for users who have access to it."
mod/assign/lang/en/assign.php
+3 -3
View File
@@ -221,7 +221,7 @@ $string['editingstatus'] = 'Editing status';
$string['enabled'] = 'Enabled';
$string['enabletimelimit'] = 'Enable timed assignments';
$string['enabletimelimit_help'] = 'If enabled, you can set a time limit on assignment settings page.';
$string['errorgradechangessaveddetail'] = 'The changes to the grade and feedback failed to save';
$string['errorgradechangessaveddetail'] = 'The changes to the grade and feedback were not saved.';
$string['eventallsubmissionsdownloaded'] = 'All the submissions are being downloaded.';
$string['eventassessablesubmitted'] = 'A submission has been submitted.';
$string['eventbatchsetmarkerallocationviewed'] = 'Batch set marker allocation viewed';
@@ -662,9 +662,9 @@ $string['subplugintype_assignsubmission'] = 'Submission plugin';
$string['subplugintype_assignsubmission_plural'] = 'Submission plugins';
$string['subplugintype_assignfeedback'] = 'Feedback plugin';
$string['subplugintype_assignfeedback_plural'] = 'Feedback plugins';
$string['teamname'] = 'Team: {$a}';
$string['teamname'] = 'Group: {$a}';
$string['teamsubmission'] = 'Students submit in groups';
$string['teamsubmission_help'] = 'If enabled, students will be divided into groups based on the default set of groups or a custom grouping. A group submission will be shared among group members and all members of the group will see each others\' changes to the submission.';
$string['teamsubmission_help'] = 'If enabled, students will be divided into groups based on the default set of groups or a custom grouping. A group submission will be shared among group members and all members of the group will see each others\' changes to the submission. Note: You cannot change this setting if there are submissions already.';
$string['teamsubmissiongroupingid'] = 'Grouping for student groups';
$string['teamsubmissiongroupingid_help'] = 'This is the grouping that the assignment will use to find groups for student groups. If not set, the default set of groups will be used.';
$string['textinstructions'] = 'Assignment instructions';
mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php
+2 -2
View File
@@ -122,9 +122,9 @@ $string['seb:managetemplates'] = 'Manage SEB configuration templates';
$string['seb_activateurlfiltering'] = 'Enable URL filtering';
$string['seb_activateurlfiltering_help'] = 'If enabled, URLs will be filtered when loading web pages. The filter set has to be defined below.';
$string['seb_allowcapturecamera'] = 'Allow browser access to camera';
$string['seb_allowcapturecamera_help'] = 'If enabled, users will be asked to grant access to the camera for SEB before the exam session is started. In macOS 12/iOS 15 or later, disabling this setting prevents web applications from accessing the camera in any case, i. e. video recording via WebRTC will not be possible.';
$string['seb_allowcapturecamera_help'] = 'If enabled, users will be asked to grant access to the camera for SEB before the exam session is started. In macOS 12/iOS 15 or later, disabling this setting prevents web applications from accessing the camera i.e. video recording via WebRTC will not be possible.';
$string['seb_allowcapturemicrophone'] = 'Allow browser access to microphone';
$string['seb_allowcapturemicrophone_help'] = 'If enabled, users will be asked to grant access to the microphone for SEB before the exam session is started. In macOS 12/iOS 15 or later, disabling this setting prevents web applications from accessing the microphone in any case, i. e. audio recording via WebRTC will not be possible.';
$string['seb_allowcapturemicrophone_help'] = 'If enabled, users will be asked to grant access to the microphone for SEB before the exam session is started. In macOS 12/iOS 15 or later, disabling this setting prevents web applications from accessing the microphone i.e. audio recording via WebRTC will not be possible.';
$string['seb_allowedbrowserexamkeys'] = 'Allowed browser exam keys';
$string['seb_allowedbrowserexamkeys_help'] = 'In this field you can enter the allowed browser exam keys for versions of Safe Exam Browser that are permitted to access this quiz. If no keys are entered, then browser exam keys are not checked.';
$string['seb_allowreloadinexam'] = 'Enable reload in exam';
mod/quiz/lang/en/quiz.php
+2 -3
View File
@@ -1085,10 +1085,9 @@ $string['stateinprogress'] = 'In progress';
$string['statenotloaded'] = 'The state for question {$a} has not been loaded from the database';
$string['statenotstarted'] = 'Not started';
$string['stateoptions'] = 'Attempt state options';
$string['stateoptions_help'] = '
* Not started: The attempt was automatically created before the quiz opened. The student has not started the attempt yet.
$string['stateoptions_help'] = '* Not started: The attempt was automatically created before the quiz opened. The student has not started the attempt yet.
* In progress: The student has started the attempt. They still have time to submit it.
* Overdue: The attempt has been open for longer than the allowed time limit. The student can still submit it within the grade period.
* Overdue: The attempt has been open for longer than the allowed time limit. The student can still submit it within the grace period.
* Submitted: The student has completed the attempt and submitted their responses. It is queued for automatic marking.
* Finished: The attempt has been submitted and any automatic marking is complete.
* Never submitted: The student started the attempt, but did not submit it within the time limit or grace period.';