Merge pull request #808 from RocketChat/send-temp-message

Display message as private

client/lib/RoomManager.coffee

@@ -37,6 +37,7 @@ onDeleteMessageStream = (msg) ->
 RocketChat.Notifications.onUser 'message', (msg) ->
 	msg.u =
 		username: 'rocketbot'
+	msg.private = true
 
 	ChatMessage.upsert { _id: msg._id }, msg
 

client/stylesheets/base.less

@@ -1014,7 +1014,7 @@ a.github-fork {
 		.calc(height, ~'100% - ' @header-min-height + @footer-min-height);
 		.transition(transform .3s cubic-bezier(.5, 0, .1, 1));
 		z-index:99;
-		
+
 		&._hidden {
 			.transform(translateY(-100%) translateY(-50px));
 		}
@@ -2123,7 +2123,7 @@ a.github-fork {
 				border-right: none;
 				cursor: pointer;
 				.transition(background-color 0.1s linear, color 0.1s linear);
-				
+
 				&:hover {
 				}
 
@@ -2403,6 +2403,9 @@ a.github-fork {
 	.info {
 		font-size: 12px;
 	}
+	.private {
+		margin-left: 10px;
+	}
 	&.sequential {
 		min-height: 20px;
 		padding-top: 4px;
@@ -2424,6 +2427,9 @@ a.github-fork {
 			.edited {
 				display: inline-block;
 			}
+			.private {
+				display: none;
+			}
 			.edit-message {
 				float: left;
 				margin-left: 1px;

client/views/app/message.html

@@ -7,6 +7,9 @@
 		{{#if edited}}
 			<span class="edited">({{_ "edited"}})</span>
 		{{/if}}
+		{{#if private}}
+			<span class="private">{{_ "Only_you_can_see_this_message"}}</span>
+		{{/if}}
 
 		{{#if canEdit}}
 			<i class="icon-pencil edit-message"></i>

i18n/en.i18n.json

@@ -202,6 +202,7 @@
   "Not_found_or_not_allowed" : "Not Found or Not Allowed",
   "Nothing_found" : "Nothing found",
   "Notify_all_in_this_room" : "Notify all in this room",
+  "Only_you_can_see_this_message" : "Only you can see this message",
   "Online" : "Online",
   "Oops!" : "Oops",
   "Opt_out_statistics" : "Don't send my anonymous statistics to Rocket.Chat",
@@ -353,4 +354,4 @@
   "You_will_not_be_able_to_recover" : "You will not be able to recover!",
   "Your_entry_has_been_deleted" : "Your entry has been deleted.",
   "Your_Open_Source_solution" : "Your own Open Source chat solution"
-}
\ No newline at end of file
+}

i18n/pt.i18n.json

@@ -188,6 +188,7 @@
   "Not_found_or_not_allowed" : "Não encontrado ou não permitido",
   "Nothing_found" : "Nada encontrado",
   "Notify_all_in_this_room" : "Notificar todos nesta sala",
+  "Only_you_can_see_this_message" : "Apenas você pode ver esta mensagem",
   "Online" : "Online",
   "Oops!" : "Ops",
   "Opt_out_statistics" : "Não envie as minhas estatísticas anonimamente para Rocket.Chat",
@@ -331,4 +332,4 @@
   "You_will_not_be_able_to_recover" : "Você não será capaz de desfazer!",
   "Your_entry_has_been_deleted" : "Sua mensagem foi excluída.",
   "Your_Open_Source_solution" : "Sua própria solução Open Source"
-}
\ No newline at end of file
+}