Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps

src/components/views/rooms/AuxPanel.js

@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const React = require('react');
-const MatrixClientPeg = require("../../../MatrixClientPeg");
-const sdk = require('../../../index');
-const dis = require("../../../dispatcher");
-const ObjectUtils = require('../../../ObjectUtils');
-const AppsDrawer = require('./AppsDrawer');
+import React from 'react';
+import MatrixClientPeg from "../../../MatrixClientPeg";
+import sdk from '../../../index';
+import dis from "../../../dispatcher";
+import ObjectUtils from '../../../ObjectUtils';
+import AppsDrawer from './AppsDrawer';
+import  { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'AuxPanel',
@@ -80,7 +81,7 @@ module.exports = React.createClass({
                       title="Drop File Here">
                         <TintableSvg src="img/upload-big.svg" width="45" height="59"/>
                         <br/>
-                        Drop file here to upload
+                        {_t("Drop file here to upload")}
                     </div>
                 </div>
             );
@@ -91,7 +92,7 @@ module.exports = React.createClass({
             let supportedText;
             let joinText;
             if (!MatrixClientPeg.get().supportsVoip()) {
-                supportedText = " (unsupported)";
+                supportedText = _t(" (unsupported)");
             } else {
                 joinText = (<span>
                     Join as <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}}
@@ -101,7 +102,7 @@ module.exports = React.createClass({
             }
             conferenceCallNotification = (
                 <div className="mx_RoomView_ongoingConfCallNotification">
-                    Ongoing conference call{ supportedText }. { joinText }
+                    {_t("Ongoing conference call%(supportedText)s. %(joinText)s", {supportedText: supportedText, joinText: joinText})}
                 </div>
             );
         }