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
94c244a3
Commit
94c244a3
authored
8 years ago
by
Gabriel Engel
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #5972 from RocketChat/change-code-to-password
change room "code" label to "Room password"
parents
725fcf18
a94ba065
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/rocketchat-channel-settings/client/views/channelSettings.coffee
+2
-2
2 additions, 2 deletions
...chat-channel-settings/client/views/channelSettings.coffee
packages/rocketchat-i18n/i18n/en.i18n.json
+2
-1
2 additions, 1 deletion
packages/rocketchat-i18n/i18n/en.i18n.json
with
4 additions
and
3 deletions
packages/rocketchat-channel-settings/client/views/channelSettings.coffee
+
2
−
2
View file @
94c244a3
...
@@ -239,13 +239,13 @@ Template.channelSettings.onCreated ->
...
@@ -239,13 +239,13 @@ Template.channelSettings.onCreated ->
joinCode
:
joinCode
:
type
:
'text'
type
:
'text'
label
:
'
Code
'
label
:
'
Password
'
canView
:
(
room
)
=>
room
.
t
is
'c'
and
RocketChat
.
authz
.
hasAllPermission
(
'edit-room'
,
room
.
_id
)
canView
:
(
room
)
=>
room
.
t
is
'c'
and
RocketChat
.
authz
.
hasAllPermission
(
'edit-room'
,
room
.
_id
)
canEdit
:
(
room
)
=>
RocketChat
.
authz
.
hasAllPermission
(
'edit-room'
,
room
.
_id
)
canEdit
:
(
room
)
=>
RocketChat
.
authz
.
hasAllPermission
(
'edit-room'
,
room
.
_id
)
save
:
(
value
,
room
)
->
save
:
(
value
,
room
)
->
Meteor
.
call
'saveRoomSettings'
,
room
.
_id
,
'joinCode'
,
value
,
(
err
,
result
)
->
Meteor
.
call
'saveRoomSettings'
,
room
.
_id
,
'joinCode'
,
value
,
(
err
,
result
)
->
return
handleError
err
if
err
return
handleError
err
if
err
toastr
.
success
TAPi18n
.
__
'Room_
code
_changed_successfully'
toastr
.
success
TAPi18n
.
__
'Room_
password
_changed_successfully'
RocketChat
.
callbacks
.
run
'roomCodeChanged'
,
room
RocketChat
.
callbacks
.
run
'roomCodeChanged'
,
room
...
...
This diff is collapsed.
Click to expand it.
packages/rocketchat-i18n/i18n/en.i18n.json
+
2
−
1
View file @
94c244a3
...
@@ -1160,6 +1160,7 @@
...
@@ -1160,6 +1160,7 @@
"Room_name_changed"
:
"Room name changed to: <em>__room_name__</em> by <em>__user_by__</em>"
,
"Room_name_changed"
:
"Room name changed to: <em>__room_name__</em> by <em>__user_by__</em>"
,
"Room_name_changed_successfully"
:
"Room name changed successfully"
,
"Room_name_changed_successfully"
:
"Room name changed successfully"
,
"Room_not_found"
:
"Room not found"
,
"Room_not_found"
:
"Room not found"
,
"Room_password_changed_successfully"
:
"Room password changed successfully"
,
"Room_topic_changed_successfully"
:
"Room topic changed successfully"
,
"Room_topic_changed_successfully"
:
"Room topic changed successfully"
,
"Room_type_changed_successfully"
:
"Room type changed successfully"
,
"Room_type_changed_successfully"
:
"Room type changed successfully"
,
"Room_unarchived"
:
"Room unarchived"
,
"Room_unarchived"
:
"Room unarchived"
,
...
@@ -1576,4 +1577,4 @@
...
@@ -1576,4 +1577,4 @@
"your_message_optional"
:
"your message (optional)"
,
"your_message_optional"
:
"your message (optional)"
,
"Your_password_is_wrong"
:
"Your password is wrong!"
,
"Your_password_is_wrong"
:
"Your password is wrong!"
,
"Your_push_was_sent_to_s_devices"
:
"Your push was sent to %s devices"
"Your_push_was_sent_to_s_devices"
:
"Your push was sent to %s devices"
}
}
\ No newline at end of file
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