From 4bc252a16b3bc3c1c126e17dc4f4c67fcf6e1130 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 31 May 2017 17:28:08 +0100
Subject: [PATCH 1/2] delint src/Lifecycle

---
 src/Lifecycle.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 0bf4c575e5..bf7b25fd2b 100644
--- a/src/Lifecycle.js
+++ b/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();

From cbbed3f54443059270df75cddb6eba8332453e5e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 31 May 2017 18:31:10 +0100
Subject: [PATCH 2/2] Fixes to i18n code

---
 src/components/structures/login/Registration.js      | 2 +-
 src/components/views/dialogs/SetDisplayNameDialog.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 6dfd700d13..d9b7c46b6b 100644
--- a/src/components/structures/login/Registration.js
+++ b/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.');
diff --git a/src/components/views/dialogs/SetDisplayNameDialog.js b/src/components/views/dialogs/SetDisplayNameDialog.js
index 17de0aea1b..1134b1f8cd 100644
--- a/src/components/views/dialogs/SetDisplayNameDialog.js
+++ b/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.
  *