diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
index 2ecc99ee2fadd9454d680f4c6826ddf9c51c4849..a0a0b0ee69a62f2e74c02f0a83c97f7c14a85379 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
@@ -100,15 +100,15 @@ class EmojiMenu extends Component {
/>
<DropdownListItem
icon="thumbs_up"
- label={intl.formatMessage(intlMessages.thumbsupLabel)}
- description={intl.formatMessage(intlMessages.thumbsupDesc)}
+ label={intl.formatMessage(intlMessages.thumbsUpLabel)}
+ description={intl.formatMessage(intlMessages.thumbsUpDesc)}
onClick={() => actions.setEmojiHandler('thumbsUp')}
tabIndex={-1}
/>
<DropdownListItem
icon="thumbs_down"
- label={intl.formatMessage(intlMessages.thumbsdownLabel)}
- description={intl.formatMessage(intlMessages.thumbsdownDesc)}
+ label={intl.formatMessage(intlMessages.thumbsDownLabel)}
+ description={intl.formatMessage(intlMessages.thumbsDownDesc)}
onClick={() => actions.setEmojiHandler('thumbsDown')}
tabIndex={-1}
/>
@@ -203,20 +203,20 @@ const intlMessages = defineMessages({
id: 'app.actionsBar.emojiMenu.applauseDesc',
description: 'adds context to applause option',
},
- thumbsupLabel: {
- id: 'app.actionsBar.emojiMenu.thumbsupLabel',
+ thumbsUpLabel: {
+ id: 'app.actionsBar.emojiMenu.thumbsUpLabel',
description: 'thumbs up emoji label',
},
- thumbsupDesc: {
- id: 'app.actionsBar.emojiMenu.thumbsupDesc',
+ thumbsUpDesc: {
+ id: 'app.actionsBar.emojiMenu.thumbsUpDesc',
description: 'adds context to thumbs up option',
},
- thumbsdownLabel: {
- id: 'app.actionsBar.emojiMenu.thumbsdownLabel',
+ thumbsDownLabel: {
+ id: 'app.actionsBar.emojiMenu.thumbsDownLabel',
description: 'thumbs down emoji label',
},
- thumbsdownDesc: {
- id: 'app.actionsBar.emojiMenu.thumbsdownDesc',
+ thumbsDownDesc: {
+ id: 'app.actionsBar.emojiMenu.thumbsDownDesc',
description: 'adds context to thumbs down option',
},
changeStatusLabel: {
diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index 73d262e4e71cbcfda7ec0d49b58ccbbb8ebe6c4e..ce1f3184d33db705f53100dbbf45e76106d5e5ca 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -16,19 +16,19 @@ import cx from 'classnames';
const intlMessages = defineMessages({
userListLabel: {
- id: 'app.userlist.Label',
+ id: 'app.userList.label',
description: 'Aria-label for Userlist Nav',
},
chatLabel: {
- id: 'app.chat.Label',
+ id: 'app.chat.label',
description: 'Aria-label for Chat Section',
},
mediaLabel: {
- id: 'app.media.Label',
+ id: 'app.media.label',
description: 'Aria-label for Media Section',
},
- actionsbarLabel: {
- id: 'app.actionsBar.Label',
+ actionsBarLabel: {
+ id: 'app.actionsBar.label',
description: 'Aria-label for ActionsBar Section',
},
});
@@ -162,7 +162,7 @@ class App extends Component {
<section
className={styles.actionsbar}
role="region"
- aria-label={intl.formatMessage(intlMessages.actionsbarLabel)}
+ aria-label={intl.formatMessage(intlMessages.actionsBarLabel)}
>
{actionsbar}
</section>
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
index 62a1707d94c5a4c3606882c5d5a931fc8e52ed89..a312d765e0a7c694b4527849f9c64f2486a91846 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -22,7 +22,7 @@ const intlMessages = defineMessages({
description: 'Toggle button label',
},
newMessages: {
- id: 'app.navbar.toggleUserList.newMessages',
+ id: 'app.navBar.toggleUserList.newMessages',
description: 'label for toggleUserList btn when showing red notification',
},
});
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
index fd08eeee8749d80531172edd960bf5a4447af64d..3212b1f191e6c58b45699242ae64ca28038ac49c 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
@@ -55,12 +55,12 @@ const intlMessages = defineMessages({
id: 'app.navBar.settingsDropdown.leaveSessionDesc',
description: 'Describes leave session option',
},
- exitFullScreenDesc: {
- id: 'app.navBar.settingsDropdown.exitFullScreenDesc',
+ exitFullscreenDesc: {
+ id: 'app.navBar.settingsDropdown.exitFullscreenDesc',
description: 'Describes exit fullscreen option',
},
- exitFullScreenLabel: {
- id: 'app.navBar.settingsDropdown.exitFullScreenLabel',
+ exitFullscreenLabel: {
+ id: 'app.navBar.settingsDropdown.exitFullscreenLabel',
description: 'Exit fullscreen option label',
},
});
@@ -97,8 +97,8 @@ class SettingsDropdown extends Component {
let fullScreenIcon = 'fullscreen';
if (isFullScreen) {
- fullScreenLabel = intl.formatMessage(intlMessages.exitFullScreenLabel);
- fullScreenDesc = intl.formatMessage(intlMessages.exitFullScreenDesc);
+ fullScreenLabel = intl.formatMessage(intlMessages.exitFullscreenLabel);
+ fullScreenDesc = intl.formatMessage(intlMessages.exitFullscreenDesc);
fullScreenIcon = 'exit_fullscreen';
}
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx
index 1eafd134682b954715ba2939d09b791a89999ef4..ca219028e9a44e9392097950182a3a8c7403715c 100755
--- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/component.jsx
@@ -69,7 +69,7 @@ class PresentationToolbar extends Component {
<Button
role="button"
aria-labelledby="prevSlideLabel"
- aria-describedby="prevSlideDescrip"
+ aria-describedby="prevSlideDesc"
disabled={!(currentSlideNum > 1)}
color={'default'}
icon={'left_arrow'}
@@ -84,7 +84,7 @@ class PresentationToolbar extends Component {
id="skipSlide"
role="listbox"
aria-labelledby="skipSlideLabel"
- aria-describedby="skipSlideDescrip"
+ aria-describedby="skipSlideDesc"
aria-live="polite"
aria-relevant="all"
value={currentSlideNum}
@@ -97,7 +97,7 @@ class PresentationToolbar extends Component {
<Button
role="button"
aria-labelledby="nextSlideLabel"
- aria-describedby="nextSlideDescrip"
+ aria-describedby="nextSlideDesc"
disabled={!(currentSlideNum < numberOfSlides)}
color={'default'}
icon={'right_arrow'}
@@ -171,9 +171,9 @@ class PresentationToolbar extends Component {
defaultMessage="Previous slide"
/>
</div>
- <div id="prevSlideDescrip">
+ <div id="prevSlideDesc">
<FormattedMessage
- id="app.presentation.presentationToolbar.prevSlideDescrip"
+ id="app.presentation.presentationToolbar.prevSlideDesc"
description="Aria description for when switching to previous slide"
defaultMessage="Change the presentation to the previous slide"
/>
@@ -186,9 +186,9 @@ class PresentationToolbar extends Component {
defaultMessage="Next slide"
/>
</div>
- <div id="nextSlideDescrip">
+ <div id="nextSlideDesc">
<FormattedMessage
- id="app.presentation.presentationToolbar.nextSlideDescrip"
+ id="app.presentation.presentationToolbar.nextSlideDesc"
description="Aria description for when switching to next slide"
defaultMessage="Change the presentation to the next slide"
/>
@@ -201,9 +201,9 @@ class PresentationToolbar extends Component {
defaultMessage="Skip slide"
/>
</div>
- <div id="skipSlideDescrip">
+ <div id="skipSlideDesc">
<FormattedMessage
- id="app.presentation.presentationToolbar.skipSlideDescrip"
+ id="app.presentation.presentationToolbar.skipSlideDesc"
description="Aria description for when switching to a specific slide"
defaultMessage="Change the presentation to a specific slide"
/>
@@ -216,9 +216,9 @@ class PresentationToolbar extends Component {
defaultMessage="Fit to width"
/>
</div>
- <div id="fitWidthDescrip">
+ <div id="fitWidthDesc">
<FormattedMessage
- id="app.presentation.presentationToolbar.fitWidthDescrip"
+ id="app.presentation.presentationToolbar.fitWidthDesc"
description="Aria description to display the whole width of the slide"
defaultMessage="Display the whole width of the slide"
/>
@@ -231,9 +231,9 @@ class PresentationToolbar extends Component {
defaultMessage="Fit to screen"
/>
</div>
- <div id="fitScreenDescrip">
+ <div id="fitScreenDesc">
<FormattedMessage
- id="app.presentation.presentationToolbar.fitScreenDescrip"
+ id="app.presentation.presentationToolbar.fitScreenDesc"
description="Aria label to display the whole slide"
defaultMessage="Display the whole slide"
/>
@@ -246,9 +246,9 @@ class PresentationToolbar extends Component {
defaultMessage="Zoom"
/>
</div>
- <div id="zoomDescrip">
+ <div id="zoomDesc">
<FormattedMessage
- id="app.presentation.presentationToolbar.zoomDescrip"
+ id="app.presentation.presentationToolbar.zoomDesc"
description="Aria label to zoom presentation"
defaultMessage="Change the zoom level of the presentation"
/>
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
index 870571f07d00af7a80a6253a3d9992f88fbe83a0..81d9198747ea0c2596a901f2285ece97df2d31e3 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
@@ -14,11 +14,11 @@ const intlMessages = defineMessages({
description: 'title for public chat',
},
unreadPlural: {
- id: 'app.userlist.chatlistitem.unreadPlural',
+ id: 'app.userList.chatListItem.unreadPlural',
description: 'singular aria label for new message',
},
unreadSingular: {
- id: 'app.userlist.chatlistitem.unreadSingular',
+ id: 'app.userList.chatListItem.unreadSingular',
description: 'plural aria label for new messages',
},
});
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
index ea5762df85025a75bc4ab92e60709583c015f67b..42a9870bcb431216b25a9c473ff8103eae765a68 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
@@ -34,43 +34,43 @@ const listTransition = {
const intlMessages = defineMessages({
usersTitle: {
- id: 'app.userlist.usersTitle',
+ id: 'app.userList.usersTitle',
description: 'Title for the Header',
},
messagesTitle: {
- id: 'app.userlist.messagesTitle',
+ id: 'app.userList.messagesTitle',
description: 'Title for the messages list',
},
participantsTitle: {
- id: 'app.userlist.participantsTitle',
+ id: 'app.userList.participantsTitle',
description: 'Title for the Users list',
},
toggleCompactView: {
- id: 'app.userlist.toggleCompactView.label',
+ id: 'app.userList.toggleCompactView.label',
description: 'Toggle user list view mode',
},
ChatLabel: {
- id: 'app.userlist.menu.chat.label',
+ id: 'app.userList.menu.chat.label',
description: 'Save the changes and close the settings menu',
},
ClearStatusLabel: {
- id: 'app.userlist.menu.clearStatus.label',
+ id: 'app.userList.menu.clearStatus.label',
description: 'Clear the emoji status of this user',
},
MakePresenterLabel: {
- id: 'app.userlist.menu.makePresenter.label',
+ id: 'app.userList.menu.makePresenter.label',
description: 'Set this user to be the presenter in this meeting',
},
KickUserLabel: {
- id: 'app.userlist.menu.kickUser.label',
+ id: 'app.userList.menu.kickUser.label',
description: 'Forcefully remove this user from the meeting',
},
MuteUserAudioLabel: {
- id: 'app.userlist.menu.muteUserAudio.label',
+ id: 'app.userList.menu.muteUserAudio.label',
description: 'Forcefully mute this user',
},
UnmuteUserAudioLabel: {
- id: 'app.userlist.menu.unmuteUserAudio.label',
+ id: 'app.userList.menu.unmuteUserAudio.label',
description: 'Forcefully unmute this user',
},
});
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 71a705ff8617d24f23908352bd9704a83c8d6d71..b98158cb9446c1175a683fd2449c82d9e0af7f75 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
@@ -52,27 +52,27 @@ const defaultProps = {
const messages = defineMessages({
presenter: {
- id: 'app.userlist.presenter',
+ id: 'app.userList.presenter',
description: 'Text for identifying presenter user',
},
you: {
- id: 'app.userlist.you',
+ id: 'app.userList.you',
description: 'Text for identifying your user',
},
locked: {
- id: 'app.userlist.locked',
+ id: 'app.userList.locked',
description: 'Text for identifying locked user',
},
guest: {
- id: 'app.userlist.guest',
+ id: 'app.userList.guest',
description: 'Text for identifying guest user',
},
menuTitleContext: {
- id: 'app.userlist.menuTitleContext',
+ id: 'app.userList.menuTitleContext',
description: 'adds context to userListItem menu title',
},
userAriaLabel: {
- id: 'app.userlist.userAriaLabel',
+ id: 'app.userList.userAriaLabel',
description: 'aria label for each user in the userlist',
},
});
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
old mode 100644
new mode 100755
index b9c9ede692c6c8c75c9c27aa60b238b1d50bff25..b439e9de8140c14d8d4b20e81159e22136b86e33
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -1,14 +1,5 @@
{
"app.home.greeting": "Welcome {0}! Your presentation will begin shortly...",
- "app.userlist.usersTitle": "Users",
- "app.userlist.participantsTitle": "Participants",
- "app.userlist.messagesTitle": "Messages",
- "app.userlist.presenter": "Presenter",
- "app.userlist.you": "You",
- "app.userlist.locked": "Locked",
- "app.userlist.Label": "User List",
- "app.userlist.toggleCompactView.label": "Toggle compact view mode",
- "app.userlist.guest": "Guest",
"app.chat.submitLabel": "Send Message",
"app.chat.inputLabel": "Message input for chat {0}",
"app.chat.inputPlaceholder": "Message {0}",
@@ -22,31 +13,40 @@
"app.chat.dropdown.clear": "Clear",
"app.chat.dropdown.copy": "Copy",
"app.chat.dropdown.save": "Save",
- "app.userlist.menuTitleContext": "available options",
- "app.userlist.chatlistitem.unreadSingular": "{0} New Message",
- "app.userlist.chatlistitem.unreadPlural": "{0} New Messages",
- "app.userlist.menu.chat.label": "Chat",
- "app.userlist.menu.clearStatus.label": "Clear Status",
- "app.userlist.menu.makePresenter.label": "Make Presenter",
- "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.label": "Chat",
"app.chat.emptyLogLabel": "Chat log empty",
- "app.media.Label": "Media",
+ "app.userList.usersTitle": "Users",
+ "app.userList.participantsTitle": "Participants",
+ "app.userList.messagesTitle": "Messages",
+ "app.userList.presenter": "Presenter",
+ "app.userList.you": "You",
+ "app.userList.locked": "Locked",
+ "app.userList.label": "User List",
+ "app.userList.toggleCompactView.label": "Toggle compact view mode",
+ "app.userList.guest": "Guest",
+ "app.userList.menuTitleContext": "Available Options",
+ "app.userList.chatListItem.unreadSingular": "{0} New Message",
+ "app.userList.chatListItem.unreadPlural": "{0} New Messages",
+ "app.userList.menu.chat.label": "Chat",
+ "app.userList.menu.clearStatus.label": "Clear Status",
+ "app.userList.menu.makePresenter.label": "Make Presenter",
+ "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.media.label": "Media",
"app.presentation.presentationToolbar.prevSlideLabel": "Previous slide",
- "app.presentation.presentationToolbar.prevSlideDescrip": "Change the presentation to the previous slide",
+ "app.presentation.presentationToolbar.prevSlideDesc": "Change the presentation to the previous slide",
"app.presentation.presentationToolbar.nextSlideLabel": "Next slide",
- "app.presentation.presentationToolbar.nextSlideDescrip": "Change the presentation to the next slide",
+ "app.presentation.presentationToolbar.nextSlideDesc": "Change the presentation to the next slide",
"app.presentation.presentationToolbar.skipSlideLabel": "Skip slide",
- "app.presentation.presentationToolbar.skipSlideDescrip": "Change the presentation to a specific slide",
+ "app.presentation.presentationToolbar.skipSlideDesc": "Change the presentation to a specific slide",
"app.presentation.presentationToolbar.fitWidthLabel": "Fit to width",
- "app.presentation.presentationToolbar.fitWidthDescrip": "Display the whole width of the slide",
+ "app.presentation.presentationToolbar.fitWidthDesc": "Display the whole width of the slide",
"app.presentation.presentationToolbar.fitScreenLabel": "Fit to screen",
- "app.presentation.presentationToolbar.fitScreenDescrip": "Display the whole slide",
+ "app.presentation.presentationToolbar.fitScreenDesc": "Display the whole slide",
"app.presentation.presentationToolbar.zoomLabel": "Zoom",
- "app.presentation.presentationToolbar.zoomDescrip": "Change the zoom level of the presentation",
+ "app.presentation.presentationToolbar.zoomDesc": "Change the zoom level of the presentation",
"app.polling.pollingTitle": "Polling Options",
"app.failedMessage": "Apologies, trouble connecting to the server.",
"app.connectingMessage": "Connecting...",
@@ -56,14 +56,14 @@
"app.navBar.settingsDropdown.settingsLabel": "Open settings",
"app.navBar.settingsDropdown.aboutLabel": "About",
"app.navBar.settingsDropdown.leaveSessionLabel": "Logout",
+ "app.navBar.settingsDropdown.exitFullscreenLabel": "Exit fullscreen",
"app.navBar.settingsDropdown.fullscreenDesc": "Make the settings menu fullscreen",
"app.navBar.settingsDropdown.settingsDesc": "Change the general settings",
"app.navBar.settingsDropdown.aboutDesc": "Show information about the client",
"app.navBar.settingsDropdown.leaveSessionDesc": "Leave the meeting",
- "app.navBar.settingsDropdown.exitFullScreenLabel": "Exit fullscreen",
- "app.navBar.settingsDropdown.exitFullScreenDesc": "Exit fullscreen mode",
+ "app.navBar.settingsDropdown.exitFullscreenDesc": "Exit fullscreen mode",
"app.navBar.userListToggleBtnLabel": "User List Toggle",
- "app.navbar.toggleUserList.newMessages": "with new message notification",
+ "app.navBar.toggleUserList.newMessages": "with new message notification",
"app.leaveConfirmation.title": "Leave Session",
"app.leaveConfirmation.message": "Do you want to leave this meeting?",
"app.leaveConfirmation.confirmLabel": "Leave",
@@ -82,7 +82,7 @@
"app.actionsBar.unmuteLabel": "Unmute",
"app.actionsBar.camOffLabel": "Cam Off",
"app.actionsBar.raiseLabel": "Raise",
- "app.actionsBar.Label": "Actions Bar",
+ "app.actionsBar.label": "Actions Bar",
"app.submenu.application.applicationSectionTitle": "Application",
"app.submenu.application.audioNotifyLabel": "Audio notifications for chat",
"app.submenu.application.pushNotifyLabel": "Push notifications for chat",
@@ -165,10 +165,10 @@
"app.actionsBar.emojiMenu.clearDesc": "Clear your status",
"app.actionsBar.emojiMenu.applauseLabel": "Applaud",
"app.actionsBar.emojiMenu.applauseDesc": "Change your status to applause",
- "app.actionsBar.emojiMenu.thumbsupLabel": "Thumbs up",
- "app.actionsBar.emojiMenu.thumbsupDesc": "Change your status to thumbs up",
- "app.actionsBar.emojiMenu.thumbsdownLabel": "Thumbs down",
- "app.actionsBar.emojiMenu.thumbsdownDesc": "Change your status to thumbs down",
+ "app.actionsBar.emojiMenu.thumbsUpLabel": "Thumbs up",
+ "app.actionsBar.emojiMenu.thumbsUpDesc": "Change your status to thumbs up",
+ "app.actionsBar.emojiMenu.thumbsDownLabel": "Thumbs down",
+ "app.actionsBar.emojiMenu.thumbsDownDesc": "Change your status to thumbs down",
"app.actionsBar.currentStatusDesc": "current status {0}",
"app.audioNotification.audioFailedError1001": "Error 1001: WebSocket disconnected",
"app.audioNotification.audioFailedError1002": "Error 1002: Could not make a WebSocket connection",
@@ -196,7 +196,7 @@
"app.audioModal.microphoneLabel": "Microphone",
"app.audioModal.listenOnlyLabel": "Listen Only",
"app.audioModal.audioChoiceLabel": "How would you like to join the audio?",
- "app.audioModal.audioChoiceDescription": "Select how to join the audio in this meeting",
+ "app.audioModal.audioChoiceDesc": "Select how to join the audio in this meeting",
"app.audioModal.closeLabel": "Close",
"app.audio.joinAudio": "Join Audio",
"app.audio.leaveAudio": "Leave Audio",