diff --git a/scripts/langindex.json b/scripts/langindex.json index 7ca7eb8c2..97ebde71e 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -281,6 +281,7 @@ "addon.messages.noncontacts": "message", "addon.messages.nousersfound": "local_moodlemobileapp", "addon.messages.numparticipants": "message", + "addon.messages.pendingcontactrequests": "message", "addon.messages.removecontact": "message", "addon.messages.removecontactconfirm": "message", "addon.messages.removefromfavourites": "message", @@ -301,6 +302,8 @@ "addon.messages.unblockuser": "message", "addon.messages.unblockuserconfirm": "message", "addon.messages.unmuteconversation": "message", + "addon.messages.unreadconversations": "message", + "addon.messages.unreadmessages": "message", "addon.messages.useentertosend": "message", "addon.messages.useentertosenddescdesktop": "local_moodlemobileapp", "addon.messages.useentertosenddescmac": "local_moodlemobileapp", @@ -1450,6 +1453,7 @@ "core.course.completion_automatic:todo": "course", "core.course.completion_manual:aria:done": "course", "core.course.completion_manual:aria:markdone": "course", + "core.course.completion_manual:done": "course", "core.course.completion_manual:markdone": "course", "core.course.completion_setby:auto:done": "course", "core.course.completion_setby:auto:todo": "course", @@ -1748,6 +1752,7 @@ "core.hasdatatosync": "local_moodlemobileapp", "core.help": "moodle", "core.hide": "moodle", + "core.hideadvanced": "form", "core.hour": "moodle", "core.hours": "moodle", "core.humanreadablesize": "local_moodlemobileapp", @@ -2114,6 +2119,7 @@ "core.sharedfiles.sharedfiles": "local_moodlemobileapp", "core.sharedfiles.successstorefile": "local_moodlemobileapp", "core.show": "moodle", + "core.showadvanced": "form", "core.showless": "form", "core.showmore": "form", "core.site": "moodle", diff --git a/src/addons/messages/lang.json b/src/addons/messages/lang.json index 0b728d3e9..a6c556cda 100644 --- a/src/addons/messages/lang.json +++ b/src/addons/messages/lang.json @@ -51,6 +51,7 @@ "noncontacts": "Non-contacts", "nousersfound": "No users found", "numparticipants": "{{$a}} participants", + "pendingcontactrequests": "There are {{$a}} pending contact requests", "removecontact": "Remove contact", "removecontactconfirm": "Are you sure you want to remove {{$a}} from your contacts?", "removefromfavourites": "Unstar conversation", @@ -71,6 +72,8 @@ "unblockuser": "Unblock user", "unblockuserconfirm": "Are you sure you want to unblock {{$a}}?", "unmuteconversation": "Unmute", + "unreadconversations": "There are {{$a}} unread conversations", + "unreadmessages": "There are {{$a}} unread messages", "useentertosend": "Use enter to send", "useentertosenddescdesktop": "If disabled, you can use Ctrl+Enter to send the message.", "useentertosenddescmac": "If disabled, you can use Cmd+Enter to send the message.", @@ -81,4 +84,4 @@ "you": "You:", "youhaveblockeduser": "You have blocked this user.", "yourcontactrequestpending": "Your contact request is pending with {{$a}}" -} \ No newline at end of file +} diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html index bbcea3e60..5a2a475c6 100644 --- a/src/addons/messages/pages/group-conversations/group-conversations.html +++ b/src/addons/messages/pages/group-conversations/group-conversations.html @@ -25,11 +25,13 @@ - +

{{ 'addon.messages.contacts' | translate }}

- {{contactRequestsCount}} + + + {{ 'addon.messages.pendingcontactrequests' | translate:{$a: contactRequestsCount} }} +
@@ -78,7 +83,10 @@

{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})

- {{ group.unread }} + + + {{ 'addon.messages.unreadconversations' | translate:{$a: group.unread} }} +
@@ -111,7 +119,10 @@

{{ 'addon.messages.individualconversations' | translate }} ({{ individual.count }})

- {{ individual.unread }} + + + {{ 'addon.messages.unreadconversations' | translate:{$a: individual.unread} }} +
@@ -171,7 +182,10 @@

- {{ conversation.unreadcount }} + {{ conversation.unreadcount }} + + {{ 'addon.messages.unreadmessages' | translate:{$a: conversation.unreadcount} }} + {{conversation.lastmessagedate | coreDateDayOrTime}}