Merge pull request #9526 from RocketChat/contextual-bar-redesign

Fix: Notification Preferences panel is using old layout
RocketChat · Jan 27, 2018 · 42f2306 · 42f2306
2 parents 3f070ce + dbacccb
commit 42f2306
Show file tree

Hide file tree

Showing 7 changed files with 300 additions and 447 deletions.
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -65,10 +65,10 @@
 		{{#with settings.t}}
 			<div class="rc-user-info__row rc-user-info__row--separator">
 				<div class="rc-switch-double">
-					<div class="rc-switch-double__label  {{equal true value 'disabled'}}">
-						{{_ "Private"}}
+					<div class="rc-switch-double__label {{equal true value 'disabled'}}">
+						{{_ "Public"}}{{equal default value '*'}}
 						<div class="rc-switch-double__description">
-							{{_ "Just_invited_people_can_access_this_channel"}}
+							{{_ "Everyone_can_access_this_channel"}}
 						</div>
 					</div>
 					<div class="rc-switch rc-switch--blue">
@@ -79,13 +79,13 @@
 							</span>
 						</label>
 					</div>
-					<div class="rc-switch-double__label {{equal false value 'disabled'}}">
-						{{_ "Public"}}{{equal default value '*'}}
+					<div class="rc-switch-double__label  {{equal false value 'disabled'}}">
+						{{_ "Private"}}
 						<div class="rc-switch-double__description">
-							{{_ "Everyone_can_access_this_channel"}}
+							{{_ "Just_invited_people_can_access_this_channel"}}
 						</div>
 					</div>
-
+				
 				</div>
 			</div>
 		{{/with}}

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -175,6 +175,7 @@
   "Agent": "Agent",
   "Agent_added": "Agent added",
   "Agent_removed": "Agent removed",
+  "Alerts": "Alerts",
   "Alias": "Alias",
   "Alias_Format": "Alias Format",
   "Alias_Format_Description": "Import messages from Slack with an alias; %s is replaced by the username of the user. If empty, no alias will be used.",
@@ -259,6 +260,7 @@
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "File Uploaded",
   "Attribute_handling": "Attribute handling",
+  "Audio": "Audio",
   "Audio_message": "Audio message",
   "Audio_Notification_Value_Description": "Can be any custom sound or the default ones: beep, chelle, ding, droplet, highbell, seasons",
   "Audio_Notifications_Default_Alert": "Audio Notifications Default Alert",
@@ -1346,6 +1348,7 @@
   "Notifications": "Notifications",
   "Notifications_Always_Notify_Mobile" : "Always notify mobile",
   "Notifications_Always_Notify_Mobile_Description" : "Choose to always notify mobile device regardless of presence status.",
+  "Notifications_Duration": "Notifications_Duration",
   "Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications",
   "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
   "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",