MDL-53700 competency: Migrating message definitions to core

diff --git a/admin/tool/lp/db/messages.php b/admin/tool/lp/db/messages.php
deleted file mode 100644 (file)
index 4f34dc1..0000000
--- a/admin/tool/lp/db/messages.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Message producers.
- *
- * @package    tool_lp
- * @copyright  2015 Frédéric Massart - FMCorz.net
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$messageproviders = array (
-    'plan_comment' => array(),
-    'user_competency_comment' => array(),
-);

diff --git a/admin/tool/lp/lang/en/tool_lp.php b/admin/tool/lp/lang/en/tool_lp.php
index 51693ed..6b395b7 100644 (file)
--- a/admin/tool/lp/lang/en/tool_lp.php
+++ b/admin/tool/lp/lang/en/tool_lp.php
@@ -202,8 +202,6 @@ $string['listtemplatescaption'] = 'List of learning plan templates';
 $string['loading'] = 'Loading...';
 $string['locatecompetency'] = 'Locate competency';
 $string['managecompetenciesandframeworks'] = 'Manage competencies and frameworks';
-$string['messageprovider:user_competency_comment'] = 'Comment posted on a competency.';
-$string['messageprovider:plan_comment'] = 'Comment posted on a learning plan.';
 $string['modcompetencies'] = 'Course competencies';
 $string['modcompetencies_help'] = 'Course competencies linked to this activity.';
 $string['move'] = 'Move';

diff --git a/admin/tool/lp/lib.php b/admin/tool/lp/lib.php
index eb6a89f..008abec 100644 (file)
--- a/admin/tool/lp/lib.php
+++ b/admin/tool/lp/lib.php
@@ -282,8 +282,8 @@ function tool_lp_comment_add($comment, $params) {
         }
 
         $message = new \core\message\message();
-        $message->component = 'tool_lp';
-        $message->name = 'user_competency_comment';
+        $message->component = 'moodle';
+        $message->name = 'competencyusercompcomment';
         $message->notification = 1;
         $message->userfrom = core_user::get_noreply_user();
         $message->subject = get_string('usercommentedonacompetencysubject', 'tool_lp', $fullname);
@@ -352,8 +352,8 @@ function tool_lp_comment_add($comment, $params) {
         }
 
         $message = new \core\message\message();
-        $message->component = 'tool_lp';
-        $message->name = 'plan_comment';
+        $message->component = 'moodle';
+        $message->name = 'competencyplancomment';
         $message->notification = 1;
         $message->userfrom = core_user::get_noreply_user();
         $message->subject = get_string('usercommentedonaplansubject', 'tool_lp', $fullname);

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index a540774..d9cac66 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1122,6 +1122,8 @@ $string['messageprovider:availableupdate'] = 'Available update notifications';
 $string['messageprovider:backup'] = 'Backup notifications';
 $string['messageprovider:badgecreatornotice'] = 'Badge creator notifications';
 $string['messageprovider:badgerecipientnotice'] = 'Badge recipient notifications';
+$string['messageprovider:competencyplancomment'] = 'Comment posted on a learning plan';
+$string['messageprovider:competencyusercompcomment'] = 'Comment posted on a competency';
 $string['messageprovider:courserequestapproved'] = 'Course creation request approval notification';
 $string['messageprovider:courserequested'] = 'Course creation request notification';
 $string['messageprovider:courserequestrejected'] = 'Course creation request rejection notification';

diff --git a/lib/db/messages.php b/lib/db/messages.php
index 75afbb7..d9aa373 100644 (file)
--- a/lib/db/messages.php
+++ b/lib/db/messages.php
@@ -94,5 +94,11 @@ $messageproviders = array (
         'defaults' => array(
             'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_LOGGEDOFF,
         )
-    )
+    ),
+
+    // A comment was left on a plan.
+    'competencyplancomment' => array(),
+
+    // A comment was left on a user competency.
+    'competencyusercompcomment' => array(),
 );