ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Add paragraph about browser add-ons when encountering some errors 

Port b67caf9be4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
rebase/4.0.0rc2
ThibG 2020-09-14 15:05:22 +02:00 committed by Thibaut Girka
parent 14869ee656
commit f8205b7b4a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/flavours/glitch/components/error_boundary.js
View File

@ -48,6 +48,8 @@ export default class ErrorBoundary extends React.PureComponent {
if (!hasError) return this.props.children; if (!hasError) return this.props.children;
const likelyBrowserAddonIssue = errorMessage && errorMessage.includes('NotFoundError');
let debugInfo = ''; let debugInfo = '';
if (stackTrace) { if (stackTrace) {
debugInfo += 'Stack trace\n-----------\n\n```\n' + errorMessage + '\n' + stackTrace.toString() + '\n```'; debugInfo += 'Stack trace\n-----------\n\n```\n' + errorMessage + '\n' + stackTrace.toString() + '\n```';
@ -70,6 +72,14 @@ export default class ErrorBoundary extends React.PureComponent {
<FormattedMessage id='web_app_crash.content' defaultMessage='You could try any of the following:' /> <FormattedMessage id='web_app_crash.content' defaultMessage='You could try any of the following:' />
</p> </p>
<ul> <ul>
{ likelyBrowserAddonIssue && (
<li>
<FormattedMessage
id='web_app_crash.disable_addons'
defaultMessage='Disable browser add-ons or built-in translation tools'
/>
</li>
) }
<li> <li>
<FormattedMessage <FormattedMessage
id='web_app_crash.report_issue' id='web_app_crash.report_issue'