From b08fbf57fdb14becbe29e7d2ceeed96734ffdbe8 Mon Sep 17 00:00:00 2001
From: Michael Hawkins <michaelh@moodle.com>
Date: Thu, 3 Oct 2024 13:43:08 +0800
Subject: [PATCH] MDL-83352 message: Update usercantbemessaged string

---
 lang/en/message.php                | 2 +-
 message/externallib.php            | 2 +-
 message/tests/externallib_test.php | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lang/en/message.php b/lang/en/message.php
index 9cced44628c..7f178f66493 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -263,7 +263,7 @@ $string['unreadnotifications'] = 'There are {$a} unread notifications';
 $string['unreadnewgroupconversationmessage'] = 'New message from {$a->name} in {$a->conversationname}';
 $string['unreadnewmessage'] = 'New message from {$a}';
 $string['useentertosend'] = 'Use enter to send';
-$string['usercantbemessaged'] = 'You can\'t message {$a} due to their message preferences. Try adding them as a contact.';
+$string['usercantbemessaged'] = 'You can\'t message this user due to their message preferences. Try adding them as a contact.';
 $string['userwouldliketocontactyou'] = '{$a} would like to contact you';
 $string['viewfullnotification'] = 'View full notification';
 $string['viewmessageswith'] = 'View messages with {$a}';
diff --git a/message/externallib.php b/message/externallib.php
index 56c40012fd4..eb4c84a4a5f 100644
--- a/message/externallib.php
+++ b/message/externallib.php
@@ -212,7 +212,7 @@ class core_message_external extends external_api {
             // Check if the recipient can be messaged by the sender.
             if ($success && !\core_message\api::can_send_message($tousers[$message['touserid']]->id, $USER->id)) {
                 $success = false;
-                $errormessage = get_string('usercantbemessaged', 'message', fullname(\core_user::get_user($message['touserid'])));
+                $errormessage = get_string('usercantbemessaged', 'message');
             }
 
             // Now we can send the message (at least try).
diff --git a/message/tests/externallib_test.php b/message/tests/externallib_test.php
index 6769c630c8a..8b8c3f73b3c 100644
--- a/message/tests/externallib_test.php
+++ b/message/tests/externallib_test.php
@@ -128,7 +128,7 @@ class externallib_test extends externallib_advanced_testcase {
         $sentmessages = core_message_external::send_instant_messages($messages);
         $sentmessages = external_api::clean_returnvalue(core_message_external::send_instant_messages_returns(), $sentmessages);
         $this->assertEquals(
-            get_string('usercantbemessaged', 'message', fullname(\core_user::get_user($message1['touserid']))),
+            get_string('usercantbemessaged', 'message'),
             array_pop($sentmessages)['errormessage']
         );
 
@@ -224,7 +224,7 @@ class externallib_test extends externallib_advanced_testcase {
 
         $sentmessage = reset($sentmessages);
 
-        $this->assertEquals(get_string('usercantbemessaged', 'message', fullname($user2)), $sentmessage['errormessage']);
+        $this->assertEquals(get_string('usercantbemessaged', 'message'), $sentmessage['errormessage']);
 
         $this->assertEquals(0, $DB->count_records('messages'));
     }
@@ -260,7 +260,7 @@ class externallib_test extends externallib_advanced_testcase {
 
         $sentmessage = reset($sentmessages);
 
-        $this->assertEquals(get_string('usercantbemessaged', 'message', fullname($user2)), $sentmessage['errormessage']);
+        $this->assertEquals(get_string('usercantbemessaged', 'message'), $sentmessage['errormessage']);
 
         $this->assertEquals(0, $DB->count_records('messages'));
     }