feat: Make the user statuses lowercase throughout the app

RocketChat · Feb 26, 2018 · 390c538 · 390c538
1 parent 5033cab
commit 390c538
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1424,6 +1424,7 @@
   "Offline_unavailable": "Offline unavailable",
   "On": "On",
   "Online": "Online",
+  "online": "online",
   "Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages",
   "Only_On_Desktop": "Desktop mode (only sends with enter on desktop)",
   "Only_you_can_see_this_message": "Only you can see this message",
@@ -2216,4 +2217,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
+}
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js
@@ -266,25 +266,25 @@ Template.sidebarHeader.events({
 								items: [
 									{
 										icon: 'circle',
-										name: t('Online'),
+										name: t('online'),
 										modifier: 'online',
 										action: () => setStatus('online')
 									},
 									{
 										icon: 'circle',
-										name: t('Away'),
+										name: t('away'),
 										modifier: 'away',
 										action: () => setStatus('away')
 									},
 									{
 										icon: 'circle',
-										name: t('Busy'),
+										name: t('busy'),
 										modifier: 'busy',
 										action: () => setStatus('busy')
 									},
 									{
 										icon: 'circle',
-										name: t('Invisible'),
+										name: t('invisible'),
 										modifier: 'offline',
 										action: () => setStatus('offline')
 									}

diff --git a/packages/rocketchat-ui-sidenav/client/userStatus.html b/packages/rocketchat-ui-sidenav/client/userStatus.html
@@ -13,10 +13,10 @@ <h4>{{username}}</h4>
 			</div>
 			<nav class="options primary-background-color animated-hidden">
 				<div class="wrapper">
-					<button data-status="online" class="status online"><span>{{_ "Online"}}</span></button>
-					<button data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></button>
-					<button data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></button>
-					<button data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></button>
+					<button data-status="online" class="status online"><span>{{_ "online"}}</span></button>
+					<button data-status="away" class="status away"><span>{{_ "away" context="male"}}</span></button>
+					<button data-status="busy" class="status busy"><span>{{_ "busy" context="male"}}</span></button>
+					<button data-status="offline" class="status offline"><span>{{_ "invisible"}}</span></button>
 					<button id="account" class='account-link'><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></button>
 					{{#if showAdminOption }}
 						<button id="admin" class='account-link'><i class="icon-wrench"></i><span>{{_ "Administration"}}</span></button>

diff --git a/packages/rocketchat-ui/client/components/header/header.js b/packages/rocketchat-ui/client/components/header/header.js
@@ -80,7 +80,7 @@ Template.header.helpers({
 
 	userStatus() {
 		const roomData = Session.get(`roomData${ this._id }`);
-		return RocketChat.roomTypes.getUserStatus(roomData.t, this._id) || 'offline';
+		return RocketChat.roomTypes.getUserStatus(roomData.t, this._id) || t('offline');
 	},
 
 	showToggleFavorite() {