Merge remote-tracking branch 'origin/develop' into develop

src/Lifecycle.js

@@ -232,7 +232,9 @@ function _handleRestoreFailure(e) {
     let msg = e.message;
     if (msg == "OLM.BAD_LEGACY_ACCOUNT_PICKLE") {
         msg = _t(
-            'You need to log back in to generate end-to-end encryption keys for this device and submit the public key to your homeserver. This is a once off; sorry for the inconvenience.'
+            'You need to log back in to generate end-to-end encryption keys'
+            + ' for this device and submit the public key to your homeserver.'
+            + ' This is a once off; sorry for the inconvenience.',
         );
 
         _clearLocalStorage();

src/components/structures/login/Registration.js

@@ -267,7 +267,7 @@ module.exports = React.createClass({
                 errMsg = _t('Passwords don\'t match.');
                 break;
             case "RegistrationForm.ERR_PASSWORD_LENGTH":
-                errMsg = _t('Password too short (min %(MIN_PASSWORD_LENGTH)s).', {MIN_PASSWORD_LENGTH: $MIN_PASSWORD_LENGTH})
+                errMsg = _t('Password too short (min %(MIN_PASSWORD_LENGTH)s).', {MIN_PASSWORD_LENGTH: MIN_PASSWORD_LENGTH});
                 break;
             case "RegistrationForm.ERR_EMAIL_INVALID":
                 errMsg = _t('This doesn\'t look like a valid email address.');

src/components/views/dialogs/SetDisplayNameDialog.js

@@ -18,6 +18,8 @@ import React from 'react';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 
+import { _t } from '../../../languageHandler';
+
 /**
  * Prompt the user to set a display name.
  *