Merge branch 'MDL-64309_master' of git://github.com/markn86/moodle

ragusa87 · Dec 18, 2018 · 1c30321 · 1c30321
2 parents 78f8d05 + 0db6fd3
commit 1c30321
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
@@ -139,4 +139,5 @@ eventmessagecontactblocked,core_message
 eventmessagecontactunblocked,core_message
 userisblockingyou,core_message
 userisblockingyounoncontact,core_message
-error:invalidbadgeurl,core_badges
+error:invalidbadgeurl,core_badges
+nomessages,core_message
diff --git a/lang/en/message.php b/lang/en/message.php
@@ -77,9 +77,10 @@
 $string['guestnoeditmessage'] = 'Guest user can not edit messaging options';
 $string['guestnoeditmessageother'] = 'Guest user can not edit other user messaging options';
 $string['groupinfo'] = 'Group info';
-$string['groupmessages'] = 'Group messages';
+$string['groupconversations'] = 'Group';
 $string['hidemessagewindow'] = 'Hide message window';
 $string['hidenotificationwindow'] = 'Hide notification window';
+$string['individualconversations'] = 'Private';
 $string['info'] = 'Info';
 $string['isnotinyourcontacts'] = '{$a} is not in your contacts';
 $string['loadmore'] = 'Load more';
@@ -109,13 +110,13 @@
 $string['newonlymsg'] = 'Show only new';
 $string['newmessage'] = 'New message';
 $string['newmessagesearch'] = 'Select or search for a contact to send a new message.';
-$string['nofavourites'] = 'No starred messages';
+$string['nofavourites'] = 'No starred conversations';
 $string['noframesjs'] = 'Use more accessible interface';
 $string['nocontactrequests'] = 'No contact requests';
 $string['nocontacts'] = 'No contacts';
 $string['nocontactsgetstarted'] = 'No contacts';
-$string['nogroupmessages'] = 'No group messages';
-$string['nomessages'] = 'No messages';
+$string['nogroupconversations'] = 'No group conversations';
+$string['noindividualconversations'] = 'No private conversations';
 $string['nomessagesfound'] = 'No messages were found';
 $string['noreply'] = 'Do not reply to this message';
 $string['noncontacts'] = 'Non-contacts';
@@ -260,3 +261,6 @@
 $string['messagingdisabled'] = 'Messaging is disabled on this site, emails will be sent instead';
 $string['userisblockingyou'] = 'This user has blocked you from sending messages to them.';
 $string['userisblockingyounoncontact'] = '{$a} only accepts messages from their contacts.';
+
+// Deprecated since Moodle 3.7.
+$string['nomessages'] = 'No messages';
diff --git a/message/templates/message_drawer_view_overview_section_group_messages.mustache b/message/templates/message_drawer_view_overview_section_group_messages.mustache
@@ -37,11 +37,11 @@
 
 {{< core_message/message_drawer_view_overview_section }}
     {{$region}}view-overview-group-messages{{/region}}
-    {{$title}}{{#str}} groupmessages, core_message {{/str}}{{/title}}
+    {{$title}}{{#str}} groupconversations, core_message {{/str}}{{/title}}
     {{$placeholder}}
         <div class="text-center py-2">{{> core/loading }}</div>
     {{/placeholder}}
     {{$emptymessage}}
-        <p class="text-muted mt-2">{{#str}} nogroupmessages, core_message {{/str}}</p>
+        <p class="text-muted mt-2">{{#str}} nogroupconversations, core_message {{/str}}</p>
     {{/emptymessage}}
 {{/ core_message/message_drawer_view_overview_section }}
diff --git a/message/templates/message_drawer_view_overview_section_messages.mustache b/message/templates/message_drawer_view_overview_section_messages.mustache
@@ -37,11 +37,11 @@
 
 {{< core_message/message_drawer_view_overview_section }}
     {{$region}}view-overview-messages{{/region}}
-    {{$title}}{{#str}} messages, core_message {{/str}}{{/title}}
+    {{$title}}{{#str}} individualconversations, core_message {{/str}}{{/title}}
     {{$placeholder}}
         <div class="text-center py-2">{{> core/loading }}</div>
     {{/placeholder}}
     {{$emptymessage}}
-        <p class="text-muted mt-2">{{#str}} nomessages, core_message {{/str}}</p>
+        <p class="text-muted mt-2">{{#str}} noindividualconversations, core_message {{/str}}</p>
     {{/emptymessage}}
 {{/ core_message/message_drawer_view_overview_section }}