From 4c1ea21ff46ea7b552e9ed4a4e5f1939bc86c58b Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@gmail.com>
Date: Tue, 22 Dec 2015 16:24:38 -0200
Subject: [PATCH] Fix: don't change locale globally

---
 .../server/methods/mailMessages.coffee                         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.coffee b/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.coffee
index 5fe2674159f..505a21d9cc0 100644
--- a/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.coffee
+++ b/packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.coffee
@@ -23,11 +23,10 @@ Meteor.methods
 			localeFn = Meteor.call 'loadLocale', data.language
 			if localeFn
 				Function(localeFn)()
-				moment.locale(data.language)
 
 		html = ""
 		RocketChat.models.Messages.findByRoomIdAndMessageIds(data.rid, data.messages, { sort: { ts: 1 } }).forEach (message) ->
-			dateTime = moment(message.ts).format('L LT')
+			dateTime = moment(message.ts).locale(data.language).format('L LT')
 			html += "<p style='margin-bottom: 5px'><b>#{message.u.username}</b> <span style='color: #aaa; font-size: 12px'>#{dateTime}</span><br />" + RocketChat.Message.parse(message, data.language) + "</p>"
 
 		Meteor.defer ->