Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] No pattern for user's status text capitalization #9783

Merged
merged 1 commit into from
Mar 26, 2018
Merged

[FIX] No pattern for user's status text capitalization #9783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
8 changes: 4 additions & 4 deletions packages/rocketchat-ui-sidenav/client/sidebarHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand Down
8 changes: 4 additions & 4 deletions packages/rocketchat-ui-sidenav/client/userStatus.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/components/header/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down