Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-26 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4234 from pichalite/chat-fixes

Browse Source 
chat edit fixes
This commit is contained in:
Barış Soner Uşaklı
2016-02-21 09:42:07 +02:00
parent 567b01e0bc f637521105
commit d43a45d0b8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/language/en_GB/error.json
View File

@@ -106,6 +106,7 @@
"chat-message-too-long": "Chat message is too long",
"cant-edit-chat-message": "You are not allowed to edit this message",
"cant-remove-last-user": "You can't remove the last user",
"cant-delete-chat-message": "You are not allowed to delete this message",
"reputation-system-disabled": "Reputation system is disabled.",
"downvoting-disabled": "Downvoting is disabled",
@@ -122,5 +123,6 @@
"invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).",
"no-session-found": "No login session found!"
"no-session-found": "No login session found!",
"not-in-room": "User not in room"
}

2
public/src/client/chats.js
View File

@@ -392,6 +392,8 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
Chats.onChatEdit = function() {
socket.on('event:chats.edit', function(data) {
data.messages.forEach(function(message) {
var self = parseInt(message.fromuid, 10) === parseInt(app.user.uid);
message.self = self ? 1 : 0;
templates.parse('partials/chat_message', {
messages: message
}, function(html) {