Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
2ddb27db
Commit
2ddb27db
authored
9 years ago
by
Marcelo Schmidt
Browse files
Options
Downloads
Patches
Plain Diff
Removed unused 'nu' message type
parent
fdd0c2a1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
client/views/app/message.coffee
+2
-3
2 additions, 3 deletions
client/views/app/message.coffee
i18n/en.i18n.json
+1
-2
1 addition, 2 deletions
i18n/en.i18n.json
packages/rocketchat-livechat/app/client/views/message.coffee
+1
-2
1 addition, 2 deletions
packages/rocketchat-livechat/app/client/views/message.coffee
with
4 additions
and
7 deletions
client/views/app/message.coffee
+
2
−
3
View file @
2ddb27db
...
...
@@ -25,7 +25,6 @@ Template.message.helpers
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
'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
'wm'
then
t
(
'Welcome'
,
{
user
:
this
.
u
.
username
})
when
'rm'
then
t
(
'Message_removed'
,
{
user
:
this
.
u
.
username
})
...
...
@@ -45,7 +44,7 @@ Template.message.helpers
return
this
.
html
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
?
(
@
)
editTime
:
->
return
""
unless
Template
.
instance
().
wasEdited
?
(
@
)
...
...
@@ -92,7 +91,7 @@ Template.message.helpers
Template
.
message
.
onCreated
->
@
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
)
->
view
=
this
...
...
This diff is collapsed.
Click to expand it.
i18n/en.i18n.json
+
1
−
2
View file @
2ddb27db
...
...
@@ -410,7 +410,6 @@
"Use_this_username"
:
"Use this username"
,
"Use_uploaded_avatar"
:
"Use uploaded 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_Channels"
:
"User Channels"
,
"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!"
,
"Your_entry_has_been_deleted"
:
"Your entry has been deleted."
,
"Your_Open_Source_solution"
:
"Your own Open Source chat solution"
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
packages/rocketchat-livechat/app/client/views/message.coffee
+
1
−
2
View file @
2ddb27db
...
...
@@ -23,7 +23,6 @@ Template.message.helpers
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
'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
'wm'
then
t
(
'Welcome'
,
{
user
:
this
.
u
.
username
})
# when 'rtc' then RocketChat.callbacks.run 'renderRtcMessage', this
...
...
@@ -37,7 +36,7 @@ Template.message.helpers
return
this
.
html
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
)
->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment