From 3efd707d63c68b69e4f0392639a0c9819ecbf2f9 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Wed, 28 Jan 2015 20:38:09 +0100 Subject: [PATCH] MDL-48975 core_registration: altered registration strings --- admin/registration/confirmregistration.php | 2 +- admin/registration/index.php | 6 +++--- admin/registration/renderer.php | 17 +++++++++++------ lang/en/admin.php | 7 +++---- lang/en/hub.php | 4 ++-- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/admin/registration/confirmregistration.php b/admin/registration/confirmregistration.php index e7c82889cfa..d1a4e8b23d3 100644 --- a/admin/registration/confirmregistration.php +++ b/admin/registration/confirmregistration.php @@ -65,7 +65,7 @@ if (!empty($registeredhub) and $registeredhub->token == $token) { $registeredhub->hubname = $hubname; $registrationmanager->update_registeredhub($registeredhub); - //display notficiation message + // Display notification message. $notificationmessage = $OUTPUT->notification( get_string('registrationconfirmedon', 'hub', $hublink), 'notifysuccess'); echo $notificationmessage; diff --git a/admin/registration/index.php b/admin/registration/index.php index 42f1c07b51d..8b3301436b2 100644 --- a/admin/registration/index.php +++ b/admin/registration/index.php @@ -22,9 +22,9 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL * @copyright (C) 1999 onwards Martin Dougiamas http://dougiamas.com * - * On this page the administrator selects which hub he wants to register, - * except for MOOCH. Admins can register with MOOCH with the top admin menu "Registration" link. - * On this page the administrator can also unregister from any hubs, including MOOCH. + * On this page the administrator selects which hub he wants to register (except for moodle.net) + * Admins can register with moodle.net via the site admin menu "Registration" link. + * On this page the administrator can also unregister from any hubs including moodle.net. */ require('../../config.php'); diff --git a/admin/registration/renderer.php b/admin/registration/renderer.php index 3ab5b364235..f3aba406db6 100644 --- a/admin/registration/renderer.php +++ b/admin/registration/renderer.php @@ -36,13 +36,18 @@ class core_register_renderer extends plugin_renderer_base { * @return string */ public function moodleorg_registration_message() { - $moodleorgurl = html_writer::link('http://moodle.org', 'Moodle.org'); - $moodleorgstatsurl = html_writer::link('http://moodle.org/stats', get_string('statsmoodleorg', 'admin')); - $moochurl = html_writer::link(HUB_MOODLEORGHUBURL, get_string('moodleorghubname', 'admin')); - $moodleorgregmsg = get_string('registermoodleorg', 'admin', $moodleorgurl); + + $moodleorgstatslink = html_writer::link('http://moodle.net/stats', + get_string('statsmoodleorg', 'admin'), + array('target' => '_blank')); + + $hublink = html_writer::link('https://moodle.net/mod/page/view.php?id=1', + get_string('moodleorghubname', 'admin'), + array('target' => '_blank')); + + $moodleorgregmsg = get_string('registermoodleorg', 'admin', $hublink); $items = array(get_string('registermoodleorgli1', 'admin'), - get_string('registermoodleorgli2', 'admin', $moodleorgstatsurl), - get_string('registermoodleorgli3', 'admin', $moochurl)); + get_string('registermoodleorgli2', 'admin', $moodleorgstatslink)); $moodleorgregmsg .= html_writer::alist($items); return $moodleorgregmsg; } diff --git a/lang/en/admin.php b/lang/en/admin.php index d9193b9d9ca..69dbb497bc9 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -800,7 +800,7 @@ $string['performance'] = 'Performance'; $string['pgcluster'] = 'PostgreSQL Cluster'; $string['pgclusterdescription'] = 'PostgreSQL version/cluster parameter for command line operations. If you only have one postgresql on your system or you are not sure what this is, leave this blank.'; $string['phpfloatproblem'] = 'Detected unexpected problem in handling of PHP float numbers - {$a}'; -$string['pleaserefreshregistration'] = 'Your site has been registered. Registration last updated {$a}. You can manually update your registration at any time.'; +$string['pleaserefreshregistration'] = 'Your site is registered. Registration last updated {$a}.
The \'Site registration\' scheduled task keeps your registration up to date. You can also manually update your registration at any time.'; $string['pleaserefreshregistrationunknown'] = 'Your site has been registered but the registration date is unknown. Please update your registration using the \'Update registration\' button or ensure that the \'Site registration\' scheduled task is enabled so your registration is automatically updated.'; $string['plugin'] = 'Plugin'; $string['plugins'] = 'Plugins'; @@ -897,11 +897,10 @@ $string['quizattemptsupgradedmessage'] = 'In Moodle 2.1 there was a major upgrad $string['recaptchaprivatekey'] = 'ReCAPTCHA private key'; $string['recaptchapublickey'] = 'ReCAPTCHA public key'; $string['register'] = 'Register your site'; -$string['registermoodleorg'] = 'When you register your site with {$a}'; +$string['registermoodleorg'] = 'When you register your site'; $string['registermoodleorgli1'] = 'You are added to a low-volume mailing list for important notifications such as security alerts and new releases of Moodle.'; $string['registermoodleorgli2'] = 'Statistics about your site will be added to the {$a} of the worldwide Moodle community.'; -$string['registermoodleorgli3'] = 'Your site is also registered with Moodle.net ({$a}), allowing users with the publish courses capability (by default only managers) the option of publishing courses to Moodle.net.'; -$string['registerwithmoodleorg'] = 'Register with Moodle.org'; +$string['registerwithmoodleorg'] = 'Register your site'; $string['registration'] = 'Registration'; $string['registration_help'] = 'Registering your site with Moodle.org is recommended in order to receive security alert notifications, to contribute Moodle usage statistics and to be able to share courses on Moodle.net.'; $string['registrationwarning'] = 'Your site is not yet registered.'; diff --git a/lang/en/hub.php b/lang/en/hub.php index 753ebe45166..02d240b6cd5 100644 --- a/lang/en/hub.php +++ b/lang/en/hub.php @@ -159,12 +159,12 @@ $string['registeredcourses'] = 'Registered courses'; $string['registeredsites'] = 'Registered sites'; $string['registrationinfo'] = 'Registration information'; $string['registeredmoodleorg'] = 'Moodle.org ({$a})'; -$string['registeredon'] = 'Hubs with which you are registered'; +$string['registeredon'] = 'Where your site is registered'; $string['registermoochtips'] = 'In order to register with Moodle.net, your site must be registered with Moodle.org.'; $string['registersite'] = 'Register with {$a}'; $string['registerwith'] = 'Register with a hub'; $string['registrationconfirmed'] = 'Site registration confirmed'; -$string['registrationconfirmedon'] = 'You are now registered on the hub {$a}. You are now able to publish courses to this hub, using the "Publish" link in course administration menus.'; +$string['registrationconfirmedon'] = 'Thank you for registering your site. Registration information will be kept up to date by the \'Site registration\' scheduled task.'; $string['registrationupdated'] = 'Registration has been updated.'; $string['registrationupdatedfailed'] = 'Registration update failed.'; $string['removefromhub'] = 'Remove from hub';