Merge pull request #3951 from KDSBrowne/x0-change-locale-string-format

[HTML5] - Change the format of locale strings

bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx

@@ -46,7 +46,7 @@ class EmojiMenu extends Component {
             // even after the DropdownTrigger inject an onClick handler
             onClick={() => null}>
             <div id="currentStatus" hidden>
-              {intl.formatMessage(intlMessages.currentStatusDesc, { status: userEmojiStatus}) }
+              {intl.formatMessage(intlMessages.currentStatusDesc, { 0: userEmojiStatus}) }
             </div>
           </Button>
         </DropdownTrigger>

bigbluebutton-html5/imports/ui/components/app/container.jsx

@@ -31,7 +31,6 @@ const intlMessages = defineMessages({
   kickedMessage: {
     id: 'app.error.kicked',
     description: 'Message when the user is kicked out of the meeting',
-    defaultMessage: 'You have been kicked out of the meeting',
   },
 });
 

bigbluebutton-html5/imports/ui/components/chat/component.jsx

@@ -47,7 +47,7 @@ class Chat extends Component {
             <Link
               to="/users"
               role="button"
-              aria-label={intl.formatMessage(intlMessages.hideChatLabel, { title: title })}>
+              aria-label={intl.formatMessage(intlMessages.hideChatLabel, { 0: title })}>
                 <Icon iconName="left_arrow"/> {title}
             </Link>
           </div>
@@ -58,7 +58,7 @@ class Chat extends Component {
                 <Link
                   to="/users"
                   role="button"
-                  aria-label={intl.formatMessage(intlMessages.closeChatLabel, { title: title })}>
+                  aria-label={intl.formatMessage(intlMessages.closeChatLabel, { 0: title })}>
                     <Icon iconName="close" onClick={() => actions.handleClosePrivateChat(chatID)}/>
                 </Link>)
             }

bigbluebutton-html5/imports/ui/components/chat/container.jsx

@@ -11,17 +11,14 @@ import ChatService from './service';
 const intlMessages = defineMessages({
   titlePublic: {
     id: 'app.chat.titlePublic',
-    defaultMessage: 'Public Chat',
     description: 'Public chat title',
   },
   titlePrivate: {
     id: 'app.chat.titlePrivate',
-    defaultMessage: 'Private Chat with {name}',
     description: 'Private chat title',
   },
   partnerDisconnected: {
     id: 'app.chat.partnerDisconnected',
-    defaultMessage: '{name} has left the meeting',
     description: 'System chat message when the private chat partnet disconnect from the meeting',
   },
 });
@@ -65,7 +62,7 @@ export default injectIntl(createContainer(({ params, intl }) => {
       let userMessage = messages.find(m => m.sender !== null);
       let user = ChatService.getUser(chatID, '{{NAME}}');
 
-      title = intl.formatMessage(intlMessages.titlePrivate, { name: user.name });
+      title = intl.formatMessage(intlMessages.titlePrivate, { 0: user.name });
       chatName = user.name;
 
       if (!user.isOnline) {
@@ -75,7 +72,7 @@ export default injectIntl(createContainer(({ params, intl }) => {
           id,
           content: [{
             id,
-            text: intl.formatMessage(intlMessages.partnerDisconnected, { name: user.name }),
+            text: intl.formatMessage(intlMessages.partnerDisconnected, { 0: user.name }),
             time,
           },],
           time,

bigbluebutton-html5/imports/ui/components/chat/message-form/component.jsx

@@ -105,9 +105,9 @@ class MessageForm extends Component {
         <TextareaAutosize
           className={styles.input}
           id="message-input"
-          placeholder={intl.formatMessage(messages.inputPlaceholder, { name: chatName })}
+          placeholder={intl.formatMessage(messages.inputPlaceholder, { 0: chatName })}
           aria-controls={this.props.chatAreaId}
-          aria-label={intl.formatMessage(messages.inputLabel, { name: chatTitle })}
+          aria-label={intl.formatMessage(messages.inputLabel, { 0: chatTitle })}
           autoCorrect="off"
           autoComplete="off"
           spellCheck="true"

bigbluebutton-html5/imports/ui/components/notifications-bar/container.jsx

@@ -27,32 +27,26 @@ const STATUS_OFFLINE = 'offline';
 const intlMessages = defineMessages({
   failedMessage: {
     id: 'app.failedMessage',
-    defaultMessage: 'Apologies, trouble connecting to the server.',
-    description: 'Message when the client is trying to connect to the server',
+    description: 'Notification for connecting to server problems',
   },
   connectingMessage: {
     id: 'app.connectingMessage',
-    defaultMessage: 'Connecting...',
-    description: 'Message when the client is trying to connect to the server',
+    description: 'Notification message for when client is connecting to server',
   },
   waitingMessage: {
     id: 'app.waitingMessage',
-    defaultMessage: 'Disconnected. Trying to reconnect in {seconds} seconds...',
-    description: 'Message when the client is trying to reconnect to the server',
+    description: 'Notification message for disconnection with reconnection counter',
   },
   breakoutTimeRemaining: {
     id: 'app.breakoutTimeRemainingMessage',
-    defaultMessage: 'Breakout Room time remaining: {time}',
     description: 'Message that tells how much time is remaining for the breakout room',
   },
   breakoutWillClose: {
     id: 'app.breakoutWillCloseMessage',
-    defaultMessage: 'Time ended. Breakout Room will close soon',
     description: 'Message that tells time has ended and breakout will close',
   },
   calculatingBreakoutTimeRemaining: {
     id: 'app.calculatingBreakoutTimeRemaining',
-    defaultMessage: 'Calculating remaining time...',
     description: 'Message that tells that the remaining time is being calculated',
   },
 });
@@ -146,7 +140,7 @@ export default injectIntl(createContainer(({ intl }) => {
         retryInterval = startCounter(sec, setRetrySeconds, getRetrySeconds, retryInterval);
         data.message = intl.formatMessage(
           intlMessages.waitingMessage,
-          { seconds: getRetrySeconds() }
+          { 0: getRetrySeconds() }
         );
         break;
     }

bigbluebutton-html5/imports/ui/components/presentation/default-content/component.jsx

@@ -31,8 +31,8 @@ export default class DefaultContent extends Component {
                 <FormattedMessage
                   id="app.home.greeting"
                   description="Message to greet the user."
-                  defaultMessage="Welcome {name}! Your presentation will begin shortly..."
-                  values={{ name: 'James Bond' }}
+                  defaultMessage="Welcome {0}! Your presentation will begin shortly..."
+                  values={{ 0: 'James Bond' }}
                 />
                 <br/>
                 Today is {' '}<FormattedDate value={Date.now()} />

bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx

@@ -71,8 +71,8 @@ class ChatListItem extends Component {
               <div
                 className={styles.unreadMessages}
                 aria-label={isSingleMessage
-                  ? intl.formatMessage(intlMessages.unreadSingular, { count: chat.unreadCounter })
-                  : intl.formatMessage(intlMessages.unreadPlural, { count: chat.unreadCounter })}>
+                  ? intl.formatMessage(intlMessages.unreadSingular, { 0: chat.unreadCounter })
+                  : intl.formatMessage(intlMessages.unreadPlural, { 0: chat.unreadCounter })}>
                 <div className={styles.unreadMessagesText} aria-hidden="true">
                   {chat.unreadCounter}
                 </div>

bigbluebutton-html5/private/locales/bg_BG.json

@@ -1,16 +1,16 @@
 {
-  "app.home.greeting": "Добре дошли, {name}! Вашата презентация ще започне всеки момент",
+  "app.home.greeting": "Добре дошли, {0}! Вашата презентация ще започне всеки момент",
   "app.userlist.usersTitle": "Потребители",
   "app.userlist.participantsTitle": "Участници",
   "app.userlist.messagesTitle": "Съобщения",
   "app.userlist.presenter": "Лектор",
   "app.userlist.you": "Вие",
   "app.chat.submitLabel": "Изпрати",
-  "app.chat.inputLabel": "Въведи съобщение за {name}",
-  "app.chat.inputPlaceholder": "Съобщение {name}",
+  "app.chat.inputLabel": "Въведи съобщение за {0}",
+  "app.chat.inputPlaceholder": "Съобщение {0}",
   "app.chat.titlePublic": "Общ чат",
-  "app.chat.titlePrivate": "Private Chat with {name}",
-  "app.chat.partnerDisconnected": "{name} has left the meeting",
+  "app.chat.titlePrivate": "Private Chat with {0}",
+  "app.chat.partnerDisconnected": "{0} has left the meeting",
   "app.chat.moreMessages": "More messages below",
   "app.kickMessage": "You have been kicked out of the meeting",
   "app.whiteboard.slideControls.prevSlideLabel": "Previous slide",
@@ -27,7 +27,7 @@
   "app.whiteboard.slideControls.zoomDescrip": "Change the zoom level of the presentation",
   "app.failedMessage": "Apologies, trouble connecting to the server.",
   "app.connectingMessage": "Connecting...",
-  "app.waitingMessage": "Disconnected. Trying to reconnect in {seconds} seconds...",
+  "app.waitingMessage": "Disconnected. Trying to reconnect in {0} seconds...",
   "app.navBar.settingsDropdown.optionsLabel": "Options",
   "app.navBar.settingsDropdown.fullscreenLabel": "Make fullscreen",
   "app.navBar.settingsDropdown.settingsLabel": "Open settings",
@@ -89,7 +89,7 @@
   "app.breakoutJoinConfirmation.confirmDesc": "Join you to the Breakout Room",
   "app.breakoutJoinConfirmation.dismissLabel": "Cancel",
   "app.breakoutJoinConfirmation.dismissDesc": "Closes and rejects Joining the Breakout Room",
-  "app.breakoutTimeRemainingMessage": "Breakout Room time remaining: {time}",
+  "app.breakoutTimeRemainingMessage": "Breakout Room time remaining: {0}",
   "app.breakoutWillCloseMessage": "Time ended. Breakout Room will close soon",
   "app.calculatingBreakoutTimeRemaining": "Calculating remaining time...",
   "app.audioModal.microphoneLabel": "Microphone",

bigbluebutton-html5/private/locales/de.json

@@ -1,5 +1,5 @@
 {
-  "app.home.greeting": "Willkommen {name}! Ihre Präsentation startet in Kürze...",
+  "app.home.greeting": "Willkommen {0}! Ihre Präsentation startet in Kürze...",
   "app.userlist.usersTitle": "Teilnehmer",
   "app.userlist.participantsTitle": "Teilnehmer",
   "app.userlist.messagesTitle": "Nachrichten",
@@ -7,17 +7,17 @@
   "app.userlist.you": "Sie",
   "app.userlist.Label": "Teilnehmerliste",
   "app.chat.submitLabel": "Nachricht senden",
-  "app.chat.inputLabel": "Chat-Nachricht eingeben für {name}",
-  "app.chat.inputPlaceholder": "Nachricht an {name}",
+  "app.chat.inputLabel": "Chat-Nachricht eingeben für {0}",
+  "app.chat.inputPlaceholder": "Nachricht an {0}",
   "app.chat.titlePublic": "Öffentlicher Chat",
-  "app.chat.titlePrivate": "Privater Chat mit {name}",
-  "app.chat.partnerDisconnected": "{name} hat die Konferenz verlassen",
-  "app.chat.closeChatLabel": "Schließe {title}",
-  "app.chat.hideChatLabel": "Verstecke {title}",
+  "app.chat.titlePrivate": "Privater Chat mit {0}",
+  "app.chat.partnerDisconnected": "{0} hat die Konferenz verlassen",
+  "app.chat.closeChatLabel": "Schließe {0}",
+  "app.chat.hideChatLabel": "Verstecke {0}",
   "app.chat.moreMessages": "Weitere Nachrichten",
   "app.userlist.menuTitleContext": "verfügbare Optionen",
-  "app.userlist.chatlistitem.unreadSingular": "{count} neue Nachricht",
-  "app.userlist.chatlistitem.unreadPlural": "{count} neue Nachrichten",
+  "app.userlist.chatlistitem.unreadSingular": "{0} neue Nachricht",
+  "app.userlist.chatlistitem.unreadPlural": "{0} neue Nachrichten",
   "app.chat.Label": "Chat",
   "app.chat.emptyLogLabel": "Chat-Log ist leer",
   "app.media.Label": "Medien",
@@ -100,7 +100,7 @@
   "app.submenu.closedCaptions.fontColorLabel": "Schriftfarbe",
   "app.submenu.participants.muteAllLabel": "Alle stummschalten außer Präsentator",
   "app.submenu.participants.lockAllLabel": "Alle Teilnehmer sperren",
-  "app.submenu.participants.lockItemLabel": "Teilnehmer {lockItem}",
+  "app.submenu.participants.lockItemLabel": "Teilnehmer {0}",
   "app.submenu.participants.lockMicDesc": "Deaktiviert das Mikrofon für alle gesperrten Teilnehmer",
   "app.submenu.participants.lockCamDesc": "Deaktiviert die Webcam für alle gesperrten Teilnehmer",
   "app.submenu.participants.lockPublicChatDesc": "Deaktiviert den öffentlichen Chat für alle gesperrten Teilnehmer",
@@ -158,7 +158,7 @@
   "app.breakoutJoinConfirmation.confirmDesc": "Dem Breakout-Raum beitreten",
   "app.breakoutJoinConfirmation.dismissLabel": "Abbrechen",
   "app.breakoutJoinConfirmation.dismissDesc": "Beitritt zum Breakout-Raum ablehnen",
-  "app.breakoutTimeRemainingMessage": "Verbleibende Zeit für den Breakout-Raum: {time}",
+  "app.breakoutTimeRemainingMessage": "Verbleibende Zeit für den Breakout-Raum: {0}",
   "app.breakoutWillCloseMessage": "Zeit abgelaufen. Der Breakout-Raum wird in Kürze geschlossen",
   "app.calculatingBreakoutTimeRemaining": "Berechne die verbleibende Zeit...",
   "app.audioModal.microphoneLabel": "Mit Mikrofon",

bigbluebutton-html5/private/locales/en.json

@@ -1,5 +1,5 @@
 {
-  "app.home.greeting": "Welcome {name}! Your presentation will begin shortly...",
+  "app.home.greeting": "Welcome {0}! Your presentation will begin shortly...",
   "app.userlist.usersTitle": "Users",
   "app.userlist.participantsTitle": "Participants",
   "app.userlist.messagesTitle": "Messages",
@@ -8,17 +8,17 @@
   "app.userlist.locked": "Locked",
   "app.userlist.Label": "User List",
   "app.chat.submitLabel": "Send Message",
-  "app.chat.inputLabel": "Message input for chat {name}",
-  "app.chat.inputPlaceholder": "Message {name}",
+  "app.chat.inputLabel": "Message input for chat {0}",
+  "app.chat.inputPlaceholder": "Message {0}",
   "app.chat.titlePublic": "Public Chat",
-  "app.chat.titlePrivate": "Private Chat with {name}",
-  "app.chat.partnerDisconnected": "{name} has left the meeting",
-  "app.chat.closeChatLabel": "Close {title}",
-  "app.chat.hideChatLabel": "Hide {title}",
+  "app.chat.titlePrivate": "Private Chat with {0}",
+  "app.chat.partnerDisconnected": "{0} has left the meeting",
+  "app.chat.closeChatLabel": "Close {0}",
+  "app.chat.hideChatLabel": "Hide {0}",
   "app.chat.moreMessages": "More messages below",
   "app.userlist.menuTitleContext": "available options",
-  "app.userlist.chatlistitem.unreadSingular": "{count} New Message",
-  "app.userlist.chatlistitem.unreadPlural": "{count} New Messages",
+  "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",
@@ -43,7 +43,7 @@
   "app.polling.pollingTitle": "Polling Options",
   "app.failedMessage": "Apologies, trouble connecting to the server.",
   "app.connectingMessage": "Connecting...",
-  "app.waitingMessage": "Disconnected. Trying to reconnect in {seconds} seconds...",
+  "app.waitingMessage": "Disconnected. Trying to reconnect in {0} seconds...",
   "app.navBar.settingsDropdown.optionsLabel": "Options",
   "app.navBar.settingsDropdown.fullscreenLabel": "Make fullscreen",
   "app.navBar.settingsDropdown.settingsLabel": "Open settings",
@@ -108,7 +108,7 @@
   "app.submenu.closedCaptions.fontColorLabel": "Font color",
   "app.submenu.participants.muteAllLabel": "Mute all except the presenter",
   "app.submenu.participants.lockAllLabel": "Lock all participants",
-  "app.submenu.participants.lockItemLabel": "Participants {lockItem}",
+  "app.submenu.participants.lockItemLabel": "Participants {0}",
   "app.submenu.participants.lockMicDesc": "Disables the microphone for all locked participants",
   "app.submenu.participants.lockCamDesc": "Disables the webcam for all locked participants",
   "app.submenu.participants.lockPublicChatDesc": "Disables public chat for all locked participants",
@@ -162,7 +162,7 @@
   "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 {status}",
+  "app.actionsBar.currentStatusDesc": "current status {0}",
   "app.audioNotification.audioFailedMessage": "Your audio connection failed to connect",
   "app.audioNotification.mediaFailedMessage": "getUserMicMedia failed, Only secure origins are allowed",
   "app.audioNotification.closeLabel": "Close",
@@ -172,7 +172,7 @@
   "app.breakoutJoinConfirmation.confirmDesc": "Join you to the Breakout Room",
   "app.breakoutJoinConfirmation.dismissLabel": "Cancel",
   "app.breakoutJoinConfirmation.dismissDesc": "Closes and rejects Joining the Breakout Room",
-  "app.breakoutTimeRemainingMessage": "Breakout Room time remaining: {time}",
+  "app.breakoutTimeRemainingMessage": "Breakout Room time remaining: {0}",
   "app.breakoutWillCloseMessage": "Time ended. Breakout Room will close soon",
   "app.calculatingBreakoutTimeRemaining": "Calculating remaining time...",
   "app.audioModal.microphoneLabel": "Microphone",

bigbluebutton-html5/private/locales/pt_BR.json

@@ -1,16 +1,16 @@
 {
-  "app.home.greeting": "Bem-vindo {name}! Sua aprensentação começará em breve...",
+  "app.home.greeting": "Bem-vindo {0}! Sua aprensentação começará em breve...",
   "app.userlist.usersTitle": "Users",
   "app.userlist.participantsTitle": "Participantes",
   "app.userlist.messagesTitle": "Mensagens",
   "app.userlist.presenter": "Apresentador",
   "app.userlist.you": "Você",
   "app.chat.submitLabel": "Enviar Mensagem",
-  "app.chat.inputLabel": "Campo de mensagem para conversa {name}",
-  "app.chat.inputPlaceholder": "Message {name}",
+  "app.chat.inputLabel": "Campo de mensagem para conversa {0}",
+  "app.chat.inputPlaceholder": "Message {0}",
   "app.chat.titlePublic": "Conversa Publíca",
-  "app.chat.titlePrivate": "Conversa Privada com {name}",
-  "app.chat.partnerDisconnected": "{name} saiu da sala",
+  "app.chat.titlePrivate": "Conversa Privada com {0}",
+  "app.chat.partnerDisconnected": "{0} saiu da sala",
   "app.chat.moreMessages": "Mais mensagens abaixo",
   "app.kickMessage": "Você foi expulso da apresentação",
   "app.whiteboard.slideControls.prevSlideLabel": "Slide Anterior",
@@ -27,7 +27,7 @@
   "app.whiteboard.slideControls.zoomDescrip": "Change the zoom level of the presentation",
   "app.failedMessage": "Desculpas, estamos com problemas para se conectar ao servidor.",
   "app.connectingMessage": "Conectando...",
-  "app.waitingMessage": "Desconectado. Tentando reconectar em {seconds} segundos...",
+  "app.waitingMessage": "Desconectado. Tentando reconectar em {0} segundos...",
   "app.navBar.settingsDropdown.optionsLabel": "Options",
   "app.navBar.settingsDropdown.fullscreenLabel": "Make fullscreen",
   "app.navBar.settingsDropdown.settingsLabel": "Open settings",
@@ -89,7 +89,7 @@
   "app.breakoutJoinConfirmation.confirmDesc": "Join you to the Breakout Room",
   "app.breakoutJoinConfirmation.dismissLabel": "Cancel",
   "app.breakoutJoinConfirmation.dismissDesc": "Closes and rejects Joining the Breakout Room",
-  "app.breakoutTimeRemainingMessage": "Breakout Room time remaining: {time}",
+  "app.breakoutTimeRemainingMessage": "Breakout Room time remaining: {0}",
   "app.breakoutWillCloseMessage": "Time ended. Breakout Room will close soon",
   "app.calculatingBreakoutTimeRemaining": "Calculating remaining time...",
   "app.audioModal.microphoneLabel": "Microphone",