Skip to content

Commit e49583f

Browse files
committed
Copy from toml
1 parent 6766436 commit e49583f

2 files changed

Lines changed: 17 additions & 5 deletions

File tree

src/i18n/strings/en_EN.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"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",
2+
"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.",
3+
"The message from the parser is: %(message)s": "The message from the parser is: %(message)s",
34
"Invalid JSON": "Invalid JSON",
45
"Your Riot is misconfigured": "Your Riot is misconfigured",
56
"Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",

src/vector/index.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,21 @@ async function loadApp() {
304304

305305
// Now that we've loaded the theme (CSS), display the config syntax error if needed.
306306
if (configSyntaxError) {
307-
const errorMessage = _t(
308-
"Your Riot configuration has invalid JSON in it. Please correct the problem and reload the page. " +
309-
"The message from the parser is: %(message)s",
310-
{message: configError.err.message || _t("Invalid JSON")},
307+
const errorMessage = (
308+
<div>
309+
<p>
310+
{_t(
311+
"Your Riot configuration contains invalid JSON. Please correct the problem " +
312+
"and reload the page.",
313+
)}
314+
</p>
315+
<p>
316+
{_t(
317+
"The message from the parser is: %(message)s",
318+
{message: configError.err.message || _t("Invalid JSON")},
319+
)}
320+
</p>
321+
</div>
311322
);
312323

313324
const GenericErrorPage = sdk.getComponent("structures.GenericErrorPage");

0 commit comments

Comments
 (0)