From cb96a267175c8c3badd128c7d0b54b2c1a030589 Mon Sep 17 00:00:00 2001
From: KDSBrowne <kert.browne85@gmail.com>
Date: Sat, 10 Jun 2017 11:56:14 -0700
Subject: [PATCH] remove string concatenation
---
.../user-list/user-list-item/component.jsx | 13 +++++++++----
bigbluebutton-html5/private/locales/en.json | 1 +
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx
index cae9d882f8..3a2451cae9 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-item/component.jsx
@@ -54,6 +54,10 @@ const messages = defineMessages({
id: 'app.userlist.menuTitleContext',
description: 'adds context to userListItem menu title',
},
+ userAriaLabel: {
+ id: 'app.userlist.userAriaLabel',
+ description: 'aria label for each user in the userlist',
+ }
});
const userActionsTransition = {
@@ -253,13 +257,14 @@ class UserListItem extends Component {
? intl.formatMessage(messages.presenter)
: '';
- let userAriaLabel = (user.emoji.status === 'none')
- ? (user.name + " " + presenter + " " + you)
- : (user.name + " " + presenter + " " + you + " " + user.emoji.status);
+ const userAriaLabel = intl.formatMessage(messages.userAriaLabel,
+ { 0: user.name,
+ 1: presenter,
+ 2: you,
+ 3: user.emoji.status });
let actions = this.getAvailableActions();
let contents = (
-
<div
className={cx(styles.userListItem, userItemContentsStyle)}
aria-label={userAriaLabel}
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 0c381f9e16..d24d42edbf 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -25,6 +25,7 @@
"app.userlist.menu.kickUser.label": "Kick user",
"app.userlist.menu.muteUserAudio.label": "Mute user",
"app.userlist.menu.unmuteUserAudio.label": "Unmute user",
+ "app.userlist.userAriaLabel": "user : {0} role: {1} person: {2} status: {3}",
"app.chat.Label": "Chat",
"app.chat.emptyLogLabel": "Chat log empty",
"app.media.Label": "Media",
--
GitLab