From e29866b57f7962640c78f685fe56a15ea66d897e Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Fri, 10 Apr 2015 16:05:30 +0800
Subject: [PATCH] MDL-49819 navigation: User profile string improvement.

Part of MDL-45774.
---
 blog/lib.php                | 2 +-
 lang/en/blog.php            | 2 +-
 lang/en/notes.php           | 1 -
 mod/forum/lang/en/forum.php | 3 +--
 mod/forum/lib.php           | 4 ++--
 notes/lib.php               | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/blog/lib.php b/blog/lib.php
index 6ae92ff2d11f1..6ff118ff660dd 100644
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -1035,7 +1035,7 @@ function core_blog_myprofile_navigation(core_user\output\myprofile\tree $tree, $
     if ($iscurrentuser) {
         $title = get_string('myprofilemyblogs', 'core_blog');
     } else {
-        $title = get_string('myprofileuserblogs', 'core_blog', fullname($user));
+        $title = get_string('myprofileuserblogs', 'core_blog');
     }
     $blognode = new core_user\output\myprofile\node('miscellaneous', 'blogs', $title, null, $url);
     $tree->add_node($blognode);
diff --git a/lang/en/blog.php b/lang/en/blog.php
index 548c7a0746434..7c501b3dd99c1 100644
--- a/lang/en/blog.php
+++ b/lang/en/blog.php
@@ -109,7 +109,7 @@
 $string['linktooriginalentry'] = 'Link to original blog entry';
 $string['maxexternalblogsperuser'] = 'Maximum number of external blogs per user';
 $string['myprofilemyblogs'] = 'My blog entries';
-$string['myprofileuserblogs'] = 'View all blog entries by {$a}';
+$string['myprofileuserblogs'] = 'View all blog entries';
 $string['name'] = 'Name';
 $string['name_help'] = 'Enter a descriptive name for your external blog. (If no name is supplied, the title of your external blog will be used).';
 $string['noentriesyet'] = 'No visible entries here';
diff --git a/lang/en/notes.php b/lang/en/notes.php
index 23ebef666c477..16f7097cec3f6 100644
--- a/lang/en/notes.php
+++ b/lang/en/notes.php
@@ -44,7 +44,6 @@
 $string['invalidid'] = 'Invalid note ID specified';
 $string['invaliduserid'] = 'Invalid user id: {$a}';
 $string['myprofileownnotes'] = 'My notes';
-$string['myprofileothernotes'] = 'Notes by {$a}';
 $string['nocontent'] = 'Note content can not be empty';
 $string['nonotes'] = 'There are no notes of this type yet';
 $string['nopermissiontodelete'] = 'You may not delete this note';
diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index 359838dd1f777..a25b420a7c949 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -326,9 +326,8 @@
 $string['movethisdiscussionto'] = 'Move this discussion to ...';
 $string['mustprovidediscussionorpost'] = 'You must provide either a discussion id or post id to export';
 $string['myprofileownpost'] = 'My forum posts';
-$string['myprofileotherpost'] = 'Forum posts by {$a}';
 $string['myprofileowndis'] = 'My forum discussions';
-$string['myprofileotherdis'] = 'Forum discussions by {$a}';
+$string['myprofileotherdis'] = 'Forum discussions';
 $string['namenews'] = 'News forum';
 $string['namenews_help'] = 'The news forum is a special forum for announcements that is automatically created when a course is created. A course can have only one news forum. Only teachers and administrators can post in the news forum. The "Latest news" block will display recent discussions from the news forum.';
 $string['namesocial'] = 'Social forum';
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index d24030c705a31..16e17350936c3 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -7834,7 +7834,7 @@ function mod_forum_myprofile_navigation(core_user\output\myprofile\tree $tree, $
         $postsurl->param('course', $course->id);
     }
     $string = $iscurrentuser ? get_string('myprofileownpost', 'mod_forum') :
-            get_string('myprofileotherpost', 'mod_forum', fullname($user));
+            get_string('forumposts', 'mod_forum');
     $node = new core_user\output\myprofile\node('miscellaneous', 'forumposts', $string, null, $postsurl);
     $tree->add_node($node);
 
@@ -7843,7 +7843,7 @@ function mod_forum_myprofile_navigation(core_user\output\myprofile\tree $tree, $
         $postsurl->param('course', $course->id);
     }
     $string = $iscurrentuser ? get_string('myprofileowndis', 'mod_forum') :
-            get_string('myprofileotherdis', 'mod_forum', fullname($user));
+            get_string('myprofileotherdis', 'mod_forum');
     $node = new core_user\output\myprofile\node('miscellaneous', 'forumdiscussions', $string, null,
         $discussionssurl);
     $tree->add_node($node);
diff --git a/notes/lib.php b/notes/lib.php
index 7ed5a556a7f6b..3d2fae04c15c7 100644
--- a/notes/lib.php
+++ b/notes/lib.php
@@ -381,7 +381,7 @@ function note_view($context, $userid) {
 function core_notes_myprofile_navigation(core_user\output\myprofile\tree $tree, $user, $iscurrentuser, $course) {
     $url = new moodle_url("/notes/index.php", array('user' => $user->id));
     $title = $iscurrentuser ? get_string('myprofileownnotes', 'core_notes') :
-            get_string('myprofileothernotes', 'core_notes', fullname($user));;
+            get_string('notes', 'core_notes');
     if (empty($course)) {
         // Site level profile.
         if (!has_capability('moodle/notes:view', context_system::instance())) {