From dbba1dedb6a529ce1198f2b2d85ec8e7b046c981 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 1 Jun 2017 22:58:17 +0100
Subject: [PATCH] i18nize all the things and change show logic

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js | 22 ++++++++++------------
 src/i18n/strings/en_EN.json               |  6 ++++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 4cb49d8c1e..b33bdd271d 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -902,9 +902,7 @@ module.exports = React.createClass({
     },
 
     _mapWebRtcDevicesToSpans: function(devices) {
-        return Object.keys(devices).map(
-            (deviceId) => <span key={deviceId}>{devices[deviceId]}</span>
-        );
+        return Object.keys(devices).map((deviceId) => <span key={deviceId}>{devices[deviceId]}</span>);
     },
 
     _setAudioInput: function(deviceId) {
@@ -928,8 +926,8 @@ module.exports = React.createClass({
                 function() {
                     const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
                     Modal.createDialog(ErrorDialog, {
-                        title: "No media permissions",
-                        description: "You may need to manually permit Riot to access your microphone/webcam",
+                        title: _t('No media permissions'),
+                        description: _t('You may need to manually permit Riot to access your microphone/webcam'),
                     });
                 },
             ]);
@@ -939,10 +937,10 @@ module.exports = React.createClass({
     _renderWebRtcSettings: function() {
         if (this.state.mediaDevices === false) {
             return <div>
-                <h3>WebRTC</h3>
+                <h3>{_t('VoIP')}</h3>
                 <div className="mx_UserSettings_section">
                     <p className="mx_UserSettings_link" onClick={this._requestMediaPermissions}>
-                        Missing Media Permissions, click here to request.
+                        {_t('Missing Media Permissions, click here to request.')}
                     </p>
                 </div>
             </div>;
@@ -950,11 +948,11 @@ module.exports = React.createClass({
 
         const Dropdown = sdk.getComponent('elements.Dropdown');
 
-        let microphoneDropdown = <p>No Microphones detected</p>;
-        let webcamDropdown = <p>No Webcams detected</p>;
+        let microphoneDropdown = <p>{_t('No Microphones detected')}</p>;
+        let webcamDropdown = <p>{_t('No Webcams detected')}</p>;
 
         const audioInputs = this.state.mediaDevices.audioinput;
-        if ('default' in audioInputs) {
+        if (Object.keys(videoInputs).length > 0) {
             microphoneDropdown = <div>
                 <h4>Microphone</h4>
                 <Dropdown
@@ -967,7 +965,7 @@ module.exports = React.createClass({
         }
 
         const videoInputs = this.state.mediaDevices.videoinput;
-        if ('default' in videoInputs) {
+        if (Object.keys(videoInputs).length > 0) {
             webcamDropdown = <div>
                 <h4>Cameras</h4>
                 <Dropdown
@@ -980,7 +978,7 @@ module.exports = React.createClass({
         }
 
         return <div>
-            <h3>WebRTC</h3>
+            <h3>{_t('VoIP')}</h3>
             <div className="mx_UserSettings_section">
                 {microphoneDropdown}
                 {webcamDropdown}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 211d164c2a..44a1af57fa 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -129,6 +129,12 @@
   "Add email address": "Add email address",
   "Add phone number": "Add phone number",
   "Admin": "Admin",
+  "VoIP": "VoIP",
+  "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
+  "No Microphones detected": "No Microphones detected",
+  "No Webcams detected": "No Webcams detected",
+  "No media permissions": "No media permissions",
+    "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
   "Always show message timestamps": "Always show message timestamps",