mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-25 12:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-81130-main' of https://github.com/raortegar/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2024-08-20 08:51:05 +08:00
commit 2bfd4c2950
No known key found for this signature in database
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/renderer.php
View File

@ -843,14 +843,14 @@ class core_admin_renderer extends plugin_renderer_base {
$registerbutton = $this->single_button(new moodle_url('/admin/registration/index.php'),
get_string('register', 'admin'));
$str = 'registrationwarning';
$type = 'error alert alert-danger';
} else {
$registerbutton = '';
$str = 'registrationwarningcontactadmin';
$type = 'info';
}
return $this->warning( get_string($str, 'admin')
. ' ' . $this->help_icon('registration', 'admin') . $registerbutton ,
'error alert alert-danger');
return $this->warning( get_string($str, 'admin') . ' ' . $registerbutton , $type);
}
return '';

16
lang/en/admin.php
View File

@ -1140,13 +1140,8 @@ $string['recaptchaprivatekey'] = 'ReCAPTCHA secret key';
$string['recaptchapublickey'] = 'ReCAPTCHA site key';
$string['register'] = 'Register your site';
$string['registration'] = 'Registration';
$string['registration_help'] = 'By registering:
* You will receive security alerts
* You can activate mobile app push notifications from your site
* You are contributing to our Moodle statistics of the worldwide community';
$string['registrationwarning'] = 'Your site is not yet registered.';
$string['registrationwarningcontactadmin'] = 'Your site is not yet registered. Please notify your administrator.';
$string['registrationwarning'] = 'Don\'t miss out on important updates and security alerts.';
$string['registrationwarningcontactadmin'] = 'This site is not registered. Please ask your administrator to register the site so they don\'t miss out on important updates.';
$string['releasenoteslink'] = 'For information about this version of Moodle, please see the online <a target="_blank" href="{$a}">Release Notes</a>';
$string['rememberuserlicensepref'] = 'Remember user licence preference';
$string['rememberuserlicensepref_help'] = 'If enabled, the last licence selected by the user is preselected when uploading a file in the file picker. Otherwise, the default site licence is preselected.';
@ -1657,3 +1652,10 @@ $string['moodlepartners_help'] = '<p>Moodle Partners are services providers that
<a href="https://moodle.com/partners">Find a Partner</a>';
$string['moodleservices'] = 'Moodle services';
$string['moodleservices_help'] = 'Make sure you get the best from your Moodle learning environment by using these Moodle services:';
// Deprecated since Moodle 4.5.
$string['registration_help'] = 'By registering:
* You will receive security alerts
* You can activate mobile app push notifications from your site
* You are contributing to our Moodle statistics of the worldwide community';

1
lang/en/deprecated.txt
View File

@ -128,3 +128,4 @@ myisamproblem,core_error
newpasswordtext,core
cannotsetpassword,core_error
registerwithmoodleorginfoapp,core_hub
registration_help,core_admin

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2024081600.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2024081600.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '4.5dev+ (Build: 20240816)'; // Human-friendly version name