Merge remote-tracking branch 'origin/develop' into add-file-upload-notification

.meteor/packages

@@ -150,7 +150,7 @@ jalik:ufs-gridfs
 jparker:gravatar
 kadira:blaze-layout
 kadira:flow-router
-kenton:accounts-sandstorm
+#kenton:accounts-sandstorm
 mizzao:autocomplete
 mizzao:timesync
 mrt:reactive-store

.meteor/versions

@@ -62,7 +62,6 @@ jparker:gravatar@0.5.1
 jquery@1.11.10
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.12.1
-kenton:accounts-sandstorm@0.2.0
 konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.5_3

packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js

@@ -31,9 +31,10 @@ function replaceMentionedUsernamesWithFullNames(message, mentions) {
  * @param {number} duration Duration of notification
  */
 function notifyUser(userId, user, message, room, duration) {
+	const lng = user && user.language || RocketChat.settings.get('language') || 'en';
 	const UI_Use_Real_Name = RocketChat.settings.get('UI_Use_Real_Name') === true;
 	if (!message.msg && message.attachments[0]) {
-		message.msg = message.attachments[0].image_type ? TAPi18n.__('User_uploaded_image') : TAPi18n.__('User_uploaded_file');
+		message.msg = message.attachments[0].image_type ? TAPi18n.__('User_uploaded_image', {lng}) : TAPi18n.__('User_uploaded_file', {lng});
 	}
 	if (UI_Use_Real_Name) {
 		message.msg = replaceMentionedUsernamesWithFullNames(message.msg, message.mentions);