diff --git a/packages/rocketchat-lib/i18n/en.i18n.json b/packages/rocketchat-lib/i18n/en.i18n.json
index 114f33f238a669e7448fbdc108e0591f804307fe..27f8c296b2513a47c5e03db2beacf29bdef1ac60 100644
--- a/packages/rocketchat-lib/i18n/en.i18n.json
+++ b/packages/rocketchat-lib/i18n/en.i18n.json
@@ -805,8 +805,12 @@
"Remove_as_owner" : "Remove as owner",
"Remove_custom_oauth" : "Remove custom oauth",
"Remove_from_room" : "Remove from room",
+ "Report_sent" : "Report sent",
"Remove_someone_from_room" : "Remove someone from the room",
"Removed" : "Removed",
+ "Report_Abuse" : "Report Abuse",
+ "Report_exclamation_mark" : "Report!",
+ "Report_this_message_question_mark" : "Report this message?",
"Require_password_change" : "Require password change",
"Resend_verification_email" : "Resend verification email",
"Reset" : "Reset",
@@ -944,6 +948,7 @@
"Sync_Users" : "Sync Users",
"Test_Connection" : "Test Connection",
"Test_Desktop_Notifications" : "Test Desktop Notifications",
+ "Thank_you_exclamation_mark" : "Thank you!",
"Thank_you_for_your_feedback" : "Thank you for your feedback",
"The_application_name_is_required" : "The application name is required",
"The_channel_name_is_required" : "The channel name is required",
@@ -1096,6 +1101,7 @@
"WebRTC_Servers_Description" : "A list of STUN and TURN servers separated by comma.<br/>Username, password and port are allowed in the format `username:password@stun:host:port` or `username:password@turn:host:port`.",
"Welcome" : "Welcome <em>%s</em>.",
"Welcome_to_the" : "Welcome to the",
+ "Why_do_you_want_to_report_question_mark" : "Why do you want to report?",
"will_be_able_to" : "will be able to",
"Yes" : "Yes",
"Yes_clear_all" : "Yes, clear all!",
@@ -1120,6 +1126,7 @@
"You_need_to_type_in_your_password_in_order_to_do_this" : "You need to type in your password in order to do this!",
"You_need_to_type_in_your_username_in_order_to_do_this" : "You need to type in your username in order to do this!",
"You_need_to_verifiy_your_email_address_to_get_notications" : "You need to verifiy your email address to get notifications",
+ "You_need_to_write_something" : "You need to write something!",
"You_should_name_it_to_easily_manage_your_integrations" : "You should name it to easily manage your integrations.",
"You_will_not_be_able_to_recover" : "You will not be able to recover this message!",
"You_will_not_be_able_to_recover_file" : "You will not be able to recover this file!",
diff --git a/packages/rocketchat-lib/i18n/pt.i18n.json b/packages/rocketchat-lib/i18n/pt.i18n.json
index 34b0422c58d3a22d0c0ef7073152ba7f1a6a33db..9d16a18d782de76f50f876426399c4181f33e745 100644
--- a/packages/rocketchat-lib/i18n/pt.i18n.json
+++ b/packages/rocketchat-lib/i18n/pt.i18n.json
@@ -738,7 +738,7 @@
"Past_Chats" : "Bate-papo últimos",
"Payload" : "Payload",
"People" : "Pessoas",
- "Permalink" : "permalink",
+ "Permalink" : "Permalink",
"Permissions" : "Permissões",
"Pin_Message" : "Fixar Mensagem",
"Pinned_a_message" : "Fixou uma mensagem:",
diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.coffee b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.coffee
index 31c0bdd6eff43de3823dd436eab38f78f2af0511..416d662d69cc869d6bc80392e88ed05ceaba1aeb 100644
--- a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.coffee
+++ b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.coffee
@@ -5,6 +5,9 @@ Template.mentionsFlexTab.helpers
messages: ->
return MentionedMessage.find { rid: @rid }, { sort: { ts: -1 } }
+ message: ->
+ return _.extend(this, { customClass: 'mentions' })
+
notReadySubscription: ->
return 'notready' unless Template.instance().subscriptionsReady()
diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.html b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.html
index 71012d478af2104a042b422c95f039f4c72c68e2..88b36c3e7418f29be1928b6f97625150a736ca59 100644
--- a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.html
+++ b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.html
@@ -12,7 +12,7 @@
</div>
<ul class="mentioned-messages-list list clearfix">
{{#each messages}}
- {{#nrr nrrargs 'message' .}}{{/nrr}}
+ {{#nrr nrrargs 'message' message}}{{/nrr}}
{{/each}}
{{#if hasMore}}
<li class="load-more">
diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.coffee b/packages/rocketchat-message-pin/client/views/pinnedMessages.coffee
index 85330b90b6d7ccfcee84420e5169f3a89f675cf1..363d1df76b31a37844173fcfe74755f35b35d145 100644
--- a/packages/rocketchat-message-pin/client/views/pinnedMessages.coffee
+++ b/packages/rocketchat-message-pin/client/views/pinnedMessages.coffee
@@ -5,6 +5,9 @@ Template.pinnedMessages.helpers
messages: ->
return PinnedMessage.find { rid: @rid }, { sort: { ts: -1 } }
+ message: ->
+ return _.extend(this, { customClass: 'pinned' })
+
hasMore: ->
return Template.instance().hasMore.get()
diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.html b/packages/rocketchat-message-pin/client/views/pinnedMessages.html
index 9ee3d684190b57fb498d4e4773d7b0c5cd8e71bb..e932f46ee7a2c490f15820e1b2d1badf6344519d 100644
--- a/packages/rocketchat-message-pin/client/views/pinnedMessages.html
+++ b/packages/rocketchat-message-pin/client/views/pinnedMessages.html
@@ -12,7 +12,7 @@
</div>
<ul class="list clearfix">
{{#each messages}}
- {{#nrr nrrargs 'message' .}}{{/nrr}}
+ {{#nrr nrrargs 'message' message}}{{/nrr}}
{{/each}}
{{#if hasMore}}
<li class="load-more">
diff --git a/packages/rocketchat-message-star/client/views/starredMessages.coffee b/packages/rocketchat-message-star/client/views/starredMessages.coffee
index 6e281304bb746edfa20d45766fc4b6a244ad747a..4fcdd5a24ad38cd3f797d087989c4d015a58ab59 100644
--- a/packages/rocketchat-message-star/client/views/starredMessages.coffee
+++ b/packages/rocketchat-message-star/client/views/starredMessages.coffee
@@ -5,6 +5,9 @@ Template.starredMessages.helpers
messages: ->
return StarredMessage.find { rid: @rid }, { sort: { ts: -1 } }
+ message: ->
+ return _.extend(this, { customClass: 'starred' })
+
hasMore: ->
return Template.instance().hasMore.get()
diff --git a/packages/rocketchat-message-star/client/views/starredMessages.html b/packages/rocketchat-message-star/client/views/starredMessages.html
index 1a48deba6fdd81b730171a5fa3f47a4cb5de3f04..7487384a5f66f8e23252bb7d759a04734e3ae460 100644
--- a/packages/rocketchat-message-star/client/views/starredMessages.html
+++ b/packages/rocketchat-message-star/client/views/starredMessages.html
@@ -12,7 +12,7 @@
</div>
<ul class="list clearfix">
{{#each messages}}
- {{#nrr nrrargs 'message' .}}{{/nrr}}
+ {{#nrr nrrargs 'message' message}}{{/nrr}}
{{/each}}
{{#if hasMore}}
<li class="load-more">
diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.coffee
index 10b9504e3524195083691fbe160c0af7964d52f4..6f74b293443ffc82e0131e6ac69b0383d9e69311 100644
--- a/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.coffee
+++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.coffee
@@ -30,6 +30,9 @@ Template.messageSearch.helpers
ready: ->
return Template.instance().ready.get()
+ message: ->
+ return _.extend(this, { customClass: 'search' })
+
Template.messageSearch.events
"keydown #message-search": (e) ->
if e.keyCode is 13
diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.html
index 764a15e70e0d80b09daa41331df3f130aa681d4e..8a2862ab7f903c5ba80b961c6e1953e581606611 100644
--- a/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.html
+++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.html
@@ -23,7 +23,7 @@
{{#if currentSearchTerm}}
{{#if searchResultMessages}}
{{#each searchResultMessages}}
- {{#nrr nrrargs 'message' .}}{{/nrr}}
+ {{#nrr nrrargs 'message' message}}{{/nrr}}
{{/each}}
{{#if hasMore}}
<li class="load-more">
diff --git a/packages/rocketchat-ui-message/message/message.html b/packages/rocketchat-ui-message/message/message.html
index ee4725f342323d647f8e013fbd2aa29ef5966e96..ff1f3cefeb331d25f2173ebe34370d53e30e36ce 100644
--- a/packages/rocketchat-ui-message/message/message.html
+++ b/packages/rocketchat-ui-message/message/message.html
@@ -1,5 +1,5 @@
<template name="message">
- <li id="{{_id}}" class="message {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
+ <li id="{{_id}}" class="message {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
{{#if avatar}}
{{#if avatarFromUsername}}
<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=avatarFromUsername}}</button>
diff --git a/packages/rocketchat-ui/views/app/spotlight/mobileMessageMenu.coffee b/packages/rocketchat-ui/views/app/spotlight/mobileMessageMenu.coffee
index a680ecc9d10fe21160a6ab3e38b3490774c4cd90..dec5b24d4162d60491bd0bab0bdfec7a4e48a397 100644
--- a/packages/rocketchat-ui/views/app/spotlight/mobileMessageMenu.coffee
+++ b/packages/rocketchat-ui/views/app/spotlight/mobileMessageMenu.coffee
@@ -6,8 +6,7 @@
options =
'androidTheme': window.plugins.actionsheet.ANDROID_THEMES.THEME_HOLO_LIGHT
'buttonLabels': [
- 'Report Abuse'
- 'Copy Message'
+ TAPi18n.__('Report Abuse')
]
androidEnableCancelButton: true
addCancelButtonWithLabel: TAPi18n.__('Cancel')
@@ -15,10 +14,19 @@
buttonActions = [
mobileMessageMenu.reportAbuse
- mobileMessageMenu.copyMessage
]
- buttons = RocketChat.MessageAction.getButtons message, 'message-mobile'
+ context = 'message-mobile'
+ if $(e.currentTarget).hasClass('pinned')
+ context = 'pinned'
+ if $(e.currentTarget).hasClass('starred')
+ context = 'starred'
+ if $(e.currentTarget).hasClass('mentions')
+ context = 'mentions'
+ if $(e.currentTarget).hasClass('search')
+ context = 'search'
+
+ buttons = RocketChat.MessageAction.getButtons message, context
for button in buttons
if button.id is 'delete-message'
options.addDestructiveButtonWithLabel = TAPi18n.__(button.i18nLabel)
@@ -31,19 +39,15 @@
if buttonActions[buttonIndex-1]?
buttonActions[buttonIndex-1].call scope, e, template, message
- copyMessage: (e, t, message) ->
- cordova.plugins.clipboard.copy(message.msg)
- console.log 'copyMessage', message.msg
-
reportAbuse: (e, t, message) ->
swal {
- title: 'Report this message?'
- text: message.html
- inputPlaceholder: 'Why do you want to report?'
+ title: TAPi18n.__('Report_this_message_question_mark')
+ text: message.msg
+ inputPlaceholder: TAPi18n.__('Why_do_you_want_to_report_question_mark')
type: 'input'
showCancelButton: true
confirmButtonColor: '#DD6B55'
- confirmButtonText: "Report!"
+ confirmButtonText: TAPi18n.__("Report_exclamation_mark")
cancelButtonText: TAPi18n.__('Cancel')
closeOnConfirm: false
html: false
@@ -52,14 +56,14 @@
return false
if inputValue is ""
- swal.showInputError("You need to write something!")
+ swal.showInputError(TAPi18n.__("You_need_to_write_something"))
return false
Meteor.call 'reportMessage', message, inputValue
swal
- title: "Report sent"
- text: "Thank you!"
+ title: TAPi18n.__("Report_sent")
+ text: TAPi18n("Thank_you_exclamation_mark")
type: 'success'
timer: 1000
showConfirmButton: false