From 138025470fd16787a939c6b26e5d5fe0d5ea02c8 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew@moodle.com>
Date: Thu, 1 Nov 2012 09:42:11 +0800
Subject: [PATCH] MDL-36162 core_message: string clean up

---
 lang/en/message.php   | 1 -
 lib/navigationlib.php | 2 +-
 message/edit.php      | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lang/en/message.php b/lang/en/message.php
index 1a2c7514a4ab7..6c8ae809c0e20 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -48,7 +48,6 @@
 $string['disabled'] = 'Messaging is disabled on this site';
 $string['disallowed'] = 'Disallowed';
 $string['discussion'] = 'Discussion';
-$string['editmymessage'] = 'Messaging';
 $string['emailmessages'] = 'Email messages when I am offline';
 $string['emailtagline'] = 'This is a copy of a message sent to you at "{$a->sitename}". Go to {$a->url} to reply.';
 $string['emptysearchstring'] = 'You must search for something';
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 9371e68fd859d..3ac2a8b0cadfc 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -3979,7 +3979,7 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr
         // Messaging
         if (($currentuser && has_capability('moodle/user:editownmessageprofile', $systemcontext)) || (!isguestuser($user) && has_capability('moodle/user:editmessageprofile', $usercontext) && !is_primary_admin($user->id))) {
             $url = new moodle_url('/message/edit.php', array('id'=>$user->id));
-            $usersetting->add(get_string('editmymessage', 'message'), $url, self::TYPE_SETTING);
+            $usersetting->add(get_string('messaging', 'message'), $url, self::TYPE_SETTING);
         }
 
         // Blogs
diff --git a/message/edit.php b/message/edit.php
index eb6c6bd9ef0a3..89c437357f859 100644
--- a/message/edit.php
+++ b/message/edit.php
@@ -158,9 +158,9 @@
 //$preferences->beepnewmessage    =  get_user_preferences( 'message_beepnewmessage', '', $user->id);
 
 /// Display page header
-$streditmymessage = get_string('editmymessage', 'message');
-$PAGE->set_title($streditmymessage);
-$PAGE->set_heading($streditmymessage);
+$strmessaging = get_string('messaging', 'message');
+$PAGE->set_title($strmessaging);
+$PAGE->set_heading($strmessaging);
 
 // Grab the renderer
 $renderer = $PAGE->get_renderer('core', 'message');