Add settings for set user's name to alias in message

RocketChat · May 25, 2016 · efad8e1 · efad8e1
1 parent 0dbfa4d
commit efad8e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/packages/rocketchat-lib/i18n/en.i18n.json b/packages/rocketchat-lib/i18n/en.i18n.json
@@ -653,6 +653,8 @@
   "Message_MaxAllowedSize" : "Maximum Allowed Message Size",
   "Message_pinning" : "Message pinning",
   "Message_removed" : "Message removed",
+  "Message_SetNameToAliasEnabled" : "Set a user name to alias in message",
+  "Message_SetNameToAliasEnabled_Description" : "Only if not already set alias. The old messages alias not changed if user has changed the name.",
   "Message_ShowDeletedStatus" : "Show Deleted Status",
   "Message_ShowEditedStatus" : "Show Edited Status",
   "Message_ShowFormattingTips" : "Show Formatting Tips",

diff --git a/packages/rocketchat-lib/i18n/ja.i18n.json b/packages/rocketchat-lib/i18n/ja.i18n.json
@@ -650,6 +650,8 @@
   "Message_MaxAllowedSize" : "メッセージの最大文字数",
   "Message_pinning" : "ピニングメッセージ",
   "Message_removed" : "メッセージを削除しました",
+  "Message_SetNameToAliasEnabled" : "ユーザの名前をメッセージのエイリアスにセット",
+  "Message_SetNameToAliasEnabled_Description" : "エイリアスが既にセットされていない場合のみ。古いメッセージのエイリアスは、ユーザが名前を変えたとしても変更されません。",
   "Message_ShowDeletedStatus" : "削除した状態を表示する",
   "Message_ShowEditedStatus" : "編集した状態を表示する",
   "Message_ShowFormattingTips" : "書式のヒントを表示する",
@@ -1162,4 +1164,4 @@
   "Your_mail_was_sent_to_s" : "メールは %s へを送信されました",
   "Your_password_is_wrong" : "パスワードが間違っています!",
   "Your_push_was_sent_to_s_devices" : "プッシュ通知が %s 台のデバイスへ送信されました"
-}
+}
diff --git a/packages/rocketchat-lib/server/methods/sendMessage.coffee b/packages/rocketchat-lib/server/methods/sendMessage.coffee
@@ -22,7 +22,7 @@ Meteor.methods
 			}
 			return false
 
-		message.alias = message.alias or user.name
+		message.alias = user.name if not message.alias? and RocketChat.settings.get 'Message_SetNameToAliasEnabled'
 
 		RocketChat.sendMessage user, message, room
 

diff --git a/packages/rocketchat-lib/server/startup/settings.coffee b/packages/rocketchat-lib/server/startup/settings.coffee
@@ -157,6 +157,7 @@ RocketChat.settings.addGroup 'Message', ->
 	@add 'Message_MaxAll', 0, { type: 'int', public: true }
 	@add 'Message_MaxAllowedSize', 5000, { type: 'int', public: true }
 	@add 'Message_ShowFormattingTips', true, { type: 'boolean', public: true }
+	@add 'Message_SetNameToAliasEnabled', false, { type: 'boolean', public: false, i18nDescription: 'Message_SetNameToAliasEnabled_Description' }
 	@add 'Message_AudioRecorderEnabled', true, { type: 'boolean', public: true, i18nDescription: 'Message_AudioRecorderEnabledDescription' }
 	@add 'Message_GroupingPeriod', 300, { type: 'int', public: true, i18nDescription: 'Message_GroupingPeriodDescription' }
 	@add 'API_Embed', true, { type: 'boolean', public: true }