moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jake Dallimore 2018-12-18 11:11:23 +08:00
commit 1c30321e7f
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lang/en/deprecated.txt
View file

@ -140,3 +140,4 @@ eventmessagecontactunblocked,core_message
userisblockingyou,core_message userisblockingyou,core_message
userisblockingyounoncontact,core_message userisblockingyounoncontact,core_message
error:invalidbadgeurl,core_badges error:invalidbadgeurl,core_badges
nomessages,core_message

12
lang/en/message.php
View file

@ -77,9 +77,10 @@ $string['forced'] = 'Locked';
$string['guestnoeditmessage'] = 'Guest user can not edit messaging options'; $string['guestnoeditmessage'] = 'Guest user can not edit messaging options';
$string['guestnoeditmessageother'] = 'Guest user can not edit other user messaging options'; $string['guestnoeditmessageother'] = 'Guest user can not edit other user messaging options';
$string['groupinfo'] = 'Group info'; $string['groupinfo'] = 'Group info';
$string['groupmessages'] = 'Group messages'; $string['groupconversations'] = 'Group';
$string['hidemessagewindow'] = 'Hide message window'; $string['hidemessagewindow'] = 'Hide message window';
$string['hidenotificationwindow'] = 'Hide notification window'; $string['hidenotificationwindow'] = 'Hide notification window';
$string['individualconversations'] = 'Private';
$string['info'] = 'Info'; $string['info'] = 'Info';
$string['isnotinyourcontacts'] = '{$a} is not in your contacts'; $string['isnotinyourcontacts'] = '{$a} is not in your contacts';
$string['loadmore'] = 'Load more'; $string['loadmore'] = 'Load more';
@ -109,13 +110,13 @@ $string['messagingdatahasnotbeenmigrated'] = 'Your messages are temporarily unav
$string['newonlymsg'] = 'Show only new'; $string['newonlymsg'] = 'Show only new';
$string['newmessage'] = 'New message'; $string['newmessage'] = 'New message';
$string['newmessagesearch'] = 'Select or search for a contact to send a 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['noframesjs'] = 'Use more accessible interface';
$string['nocontactrequests'] = 'No contact requests'; $string['nocontactrequests'] = 'No contact requests';
$string['nocontacts'] = 'No contacts'; $string['nocontacts'] = 'No contacts';
$string['nocontactsgetstarted'] = 'No contacts'; $string['nocontactsgetstarted'] = 'No contacts';
$string['nogroupmessages'] = 'No group messages'; $string['nogroupconversations'] = 'No group conversations';
$string['nomessages'] = 'No messages'; $string['noindividualconversations'] = 'No private conversations';
$string['nomessagesfound'] = 'No messages were found'; $string['nomessagesfound'] = 'No messages were found';
$string['noreply'] = 'Do not reply to this message'; $string['noreply'] = 'Do not reply to this message';
$string['noncontacts'] = 'Non-contacts'; $string['noncontacts'] = 'Non-contacts';
@ -260,3 +261,6 @@ $string['eventmessagecontactunblocked'] = 'Message contact unblocked';
$string['messagingdisabled'] = 'Messaging is disabled on this site, emails will be sent instead'; $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['userisblockingyou'] = 'This user has blocked you from sending messages to them.';
$string['userisblockingyounoncontact'] = '{$a} only accepts messages from their contacts.'; $string['userisblockingyounoncontact'] = '{$a} only accepts messages from their contacts.';
// Deprecated since Moodle 3.7.
$string['nomessages'] = 'No messages';

4
message/templates/message_drawer_view_overview_section_group_messages.mustache
View file

@ -37,11 +37,11 @@
{{< core_message/message_drawer_view_overview_section }} {{< core_message/message_drawer_view_overview_section }}
{{$region}}view-overview-group-messages{{/region}} {{$region}}view-overview-group-messages{{/region}}
{{$title}}{{#str}} groupmessages, core_message {{/str}}{{/title}} {{$title}}{{#str}} groupconversations, core_message {{/str}}{{/title}}
{{$placeholder}} {{$placeholder}}
<div class="text-center py-2">{{> core/loading }}</div> <div class="text-center py-2">{{> core/loading }}</div>
{{/placeholder}} {{/placeholder}}
{{$emptymessage}} {{$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}} {{/emptymessage}}
{{/ core_message/message_drawer_view_overview_section }} {{/ core_message/message_drawer_view_overview_section }}

4
message/templates/message_drawer_view_overview_section_messages.mustache
View file

@ -37,11 +37,11 @@
{{< core_message/message_drawer_view_overview_section }} {{< core_message/message_drawer_view_overview_section }}
{{$region}}view-overview-messages{{/region}} {{$region}}view-overview-messages{{/region}}
{{$title}}{{#str}} messages, core_message {{/str}}{{/title}} {{$title}}{{#str}} individualconversations, core_message {{/str}}{{/title}}
{{$placeholder}} {{$placeholder}}
<div class="text-center py-2">{{> core/loading }}</div> <div class="text-center py-2">{{> core/loading }}</div>
{{/placeholder}} {{/placeholder}}
{{$emptymessage}} {{$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}} {{/emptymessage}}
{{/ core_message/message_drawer_view_overview_section }} {{/ core_message/message_drawer_view_overview_section }}