gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Copy from toml

This commit is contained in:
Travis Ralston 2019-06-27 12:09:58 -06:00
parent 67664365bd
commit e49583f8e0
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/strings/en_EN.json
View File

@ -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", "Invalid JSON": "Invalid JSON",
"Your Riot is misconfigured": "Your Riot is misconfigured", "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.", "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",

15
src/vector/index.js
View File

@ -304,10 +304,21 @@ async function loadApp() {
// Now that we've loaded the theme (CSS), display the config syntax error if needed. // Now that we've loaded the theme (CSS), display the config syntax error if needed.
if (configSyntaxError) { if (configSyntaxError) {
const errorMessage = _t( const errorMessage = (
"Your Riot configuration has invalid JSON in it. Please correct the problem and reload the page. " + <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", "The message from the parser is: %(message)s",
{message: configError.err.message || _t("Invalid JSON")}, {message: configError.err.message || _t("Invalid JSON")},
)}
</p>
</div>
); );
const GenericErrorPage = sdk.getComponent("structures.GenericErrorPage"); const GenericErrorPage = sdk.getComponent("structures.GenericErrorPage");