From e49583f8e05d36d73ba3ea803220f13b9aa1ae21 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 27 Jun 2019 12:09:58 -0600
Subject: [PATCH] Copy from toml

---
 src/i18n/strings/en_EN.json |  3 ++-
 src/vector/index.js         | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f09f62095d..8fc45a298f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,5 +1,6 @@
 {
-    "Your Riot configuration has invalid JSON in it. Please correct the problem and reload the page. The message from the parser is: %(message)s": "Your Riot configuration has invalid JSON in it. Please correct the problem and reload the page. The message from the parser is: %(message)s",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.",
+    "The message from the parser is: %(message)s": "The message from the parser is: %(message)s",
     "Invalid JSON": "Invalid JSON",
     "Your Riot is misconfigured": "Your Riot is misconfigured",
     "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
diff --git a/src/vector/index.js b/src/vector/index.js
index 29399b70a2..52379257e2 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -304,10 +304,21 @@ async function loadApp() {
 
     // Now that we've loaded the theme (CSS), display the config syntax error if needed.
     if (configSyntaxError) {
-        const errorMessage = _t(
-            "Your Riot configuration has invalid JSON in it. Please correct the problem and reload the page. " +
-            "The message from the parser is: %(message)s",
-            {message: configError.err.message || _t("Invalid JSON")},
+        const errorMessage = (
+            <div>
+                <p>
+                    {_t(
+                        "Your Riot configuration contains invalid JSON. Please correct the problem " +
+                        "and reload the page.",
+                    )}
+                </p>
+                <p>
+                    {_t(
+                        "The message from the parser is: %(message)s",
+                        {message: configError.err.message || _t("Invalid JSON")},
+                    )}
+                </p>
+            </div>
         );
 
         const GenericErrorPage = sdk.getComponent("structures.GenericErrorPage");