Fix translations on conf call banner

 * You can't substitute react elements into a text string
 * Substituting in undefined gives the string 'undefined', so
   initialise it to the empty string.

Author: dbkr

src/components/views/rooms/AuxPanel.js

@@ -89,12 +89,13 @@ module.exports = React.createClass({
 
         var conferenceCallNotification = null;
         if (this.props.displayConfCallNotification) {
-            var supportedText, joinText;
+            let supportedText = '';
+            let joinNode;
             if (!MatrixClientPeg.get().supportsVoip()) {
                 supportedText = _t(" (unsupported)");
             }
             else {
-                joinText = (<span>
+                joinNode = (<span>
                     {_tJsx(
                         "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
                         [/<voiceText>(.*?)<\/voiceText>/, /<videoText>(.*?)<\/videoText>/],
@@ -106,9 +107,13 @@ module.exports = React.createClass({
                 </span>);
 
             }
+            // XXX: the translation here isn't great: appending ' (unsupported)' is likely to not make sense in many languages,
+            // but there are translations for this in the languages we do have so I'm leaving it for now.
             conferenceCallNotification = (
                 <div className="mx_RoomView_ongoingConfCallNotification">
-                    {_t("Ongoing conference call%(supportedText)s. %(joinText)s", {supportedText: supportedText, joinText: joinText})}
+                    {_t("Ongoing conference call%(supportedText)s.", {supportedText: supportedText})}
+                    &nbsp;
+                    {joinNode}
                 </div>
             );
         }

src/i18n/strings/de_DE.json

@@ -814,7 +814,7 @@
     "Drop file here to upload": "Datei hier loslassen zum hochladen",
     "Idle": "Untätig",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen dir für jedes Gerät durch den Verifizierungsprozess zu gehen um zu bestätigen, dass sie ihrem legitimierten Besitzer gehören, aber du kannst die Nachrichten ohne Verifizierung erneut senden, wenn du es vorziehst.",
-    "Ongoing conference call%(supportedText)s. %(joinText)s": "Laufendes Konferenzgespräch%(supportedText)s. %(joinText)s",
+    "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)s.",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Konto  für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
     "Disable URL previews for this room (affects only you)": "URL-Vorschau für diesen Raum deaktivieren (betrifft nur dich)",
     "Start automatically after system login": "Starte automatisch nach System-Login",

src/i18n/strings/en_EN.json

@@ -887,7 +887,7 @@
   "Enable URL previews for this room (affects only you)": "Enable URL previews for this room (affects only you)",
   "Drop file here to upload": "Drop file here to upload",
   " (unsupported)": " (unsupported)",
-  "Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s",
+  "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
   "for %(amount)ss": "for %(amount)ss",
   "for %(amount)sm": "for %(amount)sm",
   "for %(amount)sh": "for %(amount)sh",

src/i18n/strings/en_US.json

@@ -813,7 +813,7 @@
     "Enable URL previews for this room (affects only you)": "Enable URL previews for this room (affects only you)",
     "Drop file here to upload": "Drop file here to upload",
     " (unsupported)": " (unsupported)",
-    "Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s",
+    "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
     "for %(amount)ss": "for %(amount)ss",
     "for %(amount)sm": "for %(amount)sm",
     "for %(amount)sh": "for %(amount)sh",

src/i18n/strings/fr.json

@@ -759,7 +759,7 @@
     "Enable URL previews for this room (affects only you)": "Activer les aperçus d'URL pour ce salon (n'affecte que vous)",
     "Drop file here to upload": "Déposer le fichier ici pour le télécharger",
     " (unsupported)": " (non supporté)",
-    "Ongoing conference call%(supportedText)s. %(joinText)s": "Appel conférence en cours%(supportedText)s. %(joinText)s",
+    "Ongoing conference call%(supportedText)s.": "Appel conférence en cours%(supportedText)s.",
     "Online": "En ligne",
     "Offline": "Déconnecté",
     "Disable URL previews for this room (affects only you)": "Désactiver les aperçus d'URL pour ce salon (n'affecte que vous)",

src/i18n/strings/pt.json

@@ -808,7 +808,7 @@
     "Enable URL previews for this room (affects only you)": "Habilitar pré-visualizações de links para esta sala (afeta somente a você)",
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
     " (unsupported)": " (não suportado)",
-    "Ongoing conference call%(supportedText)s. %(joinText)s": "Conferência%(supportedText)s em andamento. %(joinText)s",
+    "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.",
     "Online": "Online",
     "Idle": "Ocioso",
     "Offline": "Offline",

src/i18n/strings/pt_BR.json

@@ -808,7 +808,7 @@
     "Enable URL previews for this room (affects only you)": "Habilitar pré-visualizações de links para esta sala (afeta somente a você)",
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
     " (unsupported)": " (não suportado)",
-    "Ongoing conference call%(supportedText)s. %(joinText)s": "Conferência%(supportedText)s em andamento. %(joinText)s",
+    "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.",
     "Online": "Online",
     "Idle": "Ocioso",
     "Offline": "Offline",

src/i18n/strings/ru.json

@@ -853,7 +853,7 @@
     "Enable URL previews for this room (affects only you)": "Включить предпросмотр URL в этой комнате (только для вас)",
     "Drop file here to upload": "Перетащите файл сюда для загрузки",
     " (unsupported)": " (не поддерживается)",
-    "Ongoing conference call%(supportedText)s. %(joinText)s": "Идет конференц-звонок%(supportedText)s. %(joinText)s",
+    "Ongoing conference call%(supportedText)s.": "Идет конференц-звонок%(supportedText)s.",
     "for %(amount)ss": "уже %(amount)sс",
     "for %(amount)sm": "уже %(amount)sм",
     "for %(amount)sh": "уже %(amount)sч",

src/i18n/strings/zh_Hant.json

@@ -353,7 +353,7 @@
     "This image cannot be displayed.": "這張圖片無法顯示",
     "Error decrypting video": "解密影片出錯",
     "Add an Integration": "新增整合器",
-    "Ongoing conference call%(supportedText)s. %(joinText)s": "%(supportedText)s. %(joinText)s 正在進行電話會議",
+    "Ongoing conference call%(supportedText)s.": "%(supportedText)s. 正在進行電話會議",
     " (unsupported)": " (不支持)",
     "URL Previews": "網址預覽",
     "Enable URL previews for this room (affects only you)": "啟用此房間的網址預覽（僅影響您）",