Removed unused 'nu' message type

pull/1382/head^2
Marcelo Schmidt 10 years ago
parent fdd0c2a154
commit 2ddb27db6a
  1. 5
      client/views/app/message.coffee
  2. 3
      i18n/en.i18n.json
  3. 3
      packages/rocketchat-livechat/app/client/views/message.coffee

@ -25,7 +25,6 @@ Template.message.helpers
when 'au' then t('User_added_by', { user_added: this.msg, user_by: this.u.username }) when 'au' then t('User_added_by', { user_added: this.msg, user_by: this.u.username })
when 'ru' then t('User_removed_by', { user_removed: this.msg, user_by: this.u.username }) when 'ru' then t('User_removed_by', { user_removed: this.msg, user_by: this.u.username })
when 'ul' then t('User_left', { user_left: this.u.username }) when 'ul' then t('User_left', { user_left: this.u.username })
when 'nu' then t('User_added', { user_added: this.u.username })
when 'uj' then t('User_joined_channel', { user: this.u.username }) when 'uj' then t('User_joined_channel', { user: this.u.username })
when 'wm' then t('Welcome', { user: this.u.username }) when 'wm' then t('Welcome', { user: this.u.username })
when 'rm' then t('Message_removed', { user: this.u.username }) when 'rm' then t('Message_removed', { user: this.u.username })
@ -45,7 +44,7 @@ Template.message.helpers
return this.html return this.html
system: -> system: ->
return 'system' if this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm', 'uj', 'rm'] return 'system' if this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'wm', 'uj', 'rm']
edited: -> Template.instance().wasEdited?(@) edited: -> Template.instance().wasEdited?(@)
editTime: -> editTime: ->
return "" unless Template.instance().wasEdited?(@) return "" unless Template.instance().wasEdited?(@)
@ -92,7 +91,7 @@ Template.message.helpers
Template.message.onCreated -> Template.message.onCreated ->
@wasEdited = (msg) -> @wasEdited = (msg) ->
msg.editedAt? and msg.t not in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm', 'uj', 'rm'] msg.editedAt? and msg.t not in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'wm', 'uj', 'rm']
Template.message.onViewRendered = (context) -> Template.message.onViewRendered = (context) ->
view = this view = this

@ -410,7 +410,6 @@
"Use_this_username" : "Use this username", "Use_this_username" : "Use this username",
"Use_uploaded_avatar" : "Use uploaded avatar", "Use_uploaded_avatar" : "Use uploaded avatar",
"Use_url_for_avatar" : "Use url for avatar", "Use_url_for_avatar" : "Use url for avatar",
"User_added" : "User <em>__user_added__</em> added.",
"User_added_by" : "User <em>__user_added__</em> added by <em>__user_by__</em>.", "User_added_by" : "User <em>__user_added__</em> added by <em>__user_by__</em>.",
"User_Channels" : "User Channels", "User_Channels" : "User Channels",
"User_has_been_activated" : "User has been activated", "User_has_been_activated" : "User has been activated",
@ -453,4 +452,4 @@
"You_will_not_be_able_to_recover" : "You will not be able to recover this message!", "You_will_not_be_able_to_recover" : "You will not be able to recover this message!",
"Your_entry_has_been_deleted" : "Your entry has been deleted.", "Your_entry_has_been_deleted" : "Your entry has been deleted.",
"Your_Open_Source_solution" : "Your own Open Source chat solution" "Your_Open_Source_solution" : "Your own Open Source chat solution"
} }

@ -23,7 +23,6 @@ Template.message.helpers
when 'au' then t('User_added_by', { user_added: this.msg, user_by: this.u.username }) when 'au' then t('User_added_by', { user_added: this.msg, user_by: this.u.username })
when 'ru' then t('User_removed_by', { user_removed: this.msg, user_by: this.u.username }) when 'ru' then t('User_removed_by', { user_removed: this.msg, user_by: this.u.username })
when 'ul' then tr('User_left', { context: this.u.gender }, { user_left: this.u.username }) when 'ul' then tr('User_left', { context: this.u.gender }, { user_left: this.u.username })
when 'nu' then t('User_added', { user_added: this.u.username })
when 'uj' then tr('User_joined_channel', { context: this.u.gender }, { user: this.u.username }) when 'uj' then tr('User_joined_channel', { context: this.u.gender }, { user: this.u.username })
when 'wm' then t('Welcome', { user: this.u.username }) when 'wm' then t('Welcome', { user: this.u.username })
# when 'rtc' then RocketChat.callbacks.run 'renderRtcMessage', this # when 'rtc' then RocketChat.callbacks.run 'renderRtcMessage', this
@ -37,7 +36,7 @@ Template.message.helpers
return this.html return this.html
system: -> system: ->
return 'system' if this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm', 'uj'] return 'system' if this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'wm', 'uj']
Template.message.onViewRendered = (context) -> Template.message.onViewRendered = (context) ->

Loading…
Cancel
Save