Skip to content
Snippets Groups Projects
Commit 94c244a3 authored by Gabriel Engel's avatar Gabriel Engel Committed by GitHub
Browse files

Merge pull request #5972 from RocketChat/change-code-to-password

change room "code" label to "Room password"
parents 725fcf18 a94ba065
No related merge requests found
...@@ -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
......
...@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment