iv-org-mirror/invidious
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/invidious.git synced 2024-08-15 00:53:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't show "next steps" message with a stack trace

Browse source 
Usually, next steps are after the error message.
Here, we want the same options to be right above the stack trace,
so users are less likely to report duplicates.
This commit is contained in:
Samantaz Fox 2022-01-10 22:01:12 +01:00
parent fd30f5775a
commit 34a79c5f1e
No known key found for this signature in database
GPG key ID: F42821059186176E
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en-US.json
View file

@ -433,6 +433,8 @@
"preferences_save_player_pos_label": "Save playback position: ", "preferences_save_player_pos_label": "Save playback position: ",
"crash_page_you_found_a_bug": "It looks like you found a bug in Invidious!", "crash_page_you_found_a_bug": "It looks like you found a bug in Invidious!",
"crash_page_before_reporting": "Before reporting a bug, make sure that you have:", "crash_page_before_reporting": "Before reporting a bug, make sure that you have:",
"crash_page_refresh": "Tried to refresh the page",
"crash_page_switch_instance": "Tried to use another instance",
"crash_page_read_the_faq": "looked at the <a href=\"`x`\">Frenquently Asked Queqtions (FAQ)</a>", "crash_page_read_the_faq": "looked at the <a href=\"`x`\">Frenquently Asked Queqtions (FAQ)</a>",
"crash_page_search_issue": "searched for <a href=\"`x`\">existing issues on Github</a>", "crash_page_search_issue": "searched for <a href=\"`x`\">existing issues on Github</a>",
"crash_page_report_issue": "If none of the above helped, please <a href=\"`x`\">open a new issue on GitHub</a> (preferably in English) and include the following text in your message (do NOT translate that text):" "crash_page_report_issue": "If none of the above helped, please <a href=\"`x`\">open a new issue on GitHub</a> (preferably in English) and include the following text in your message (do NOT translate that text):"

10
src/invidious/helpers/errors.cr
View file

@ -43,6 +43,8 @@ def error_template_helper(env : HTTP::Server::Context, locale : String?, status_
url_faq = "https://github.com/iv-org/documentation/blob/master/FAQ.md" url_faq = "https://github.com/iv-org/documentation/blob/master/FAQ.md"
url_search_issues = "https://github.com/iv-org/invidious/issues" url_search_issues = "https://github.com/iv-org/invidious/issues"
url_switch = "https://redirect.invidious.io" + env.request.resource
url_new_issue = "https://github.com/iv-org/invidious/issues/new" url_new_issue = "https://github.com/iv-org/invidious/issues/new"
url_new_issue += "?labels=bug&template=bug_report.md&title=" url_new_issue += "?labels=bug&template=bug_report.md&title="
url_new_issue += URI.encode_www_form("[Bug] " + issue_title) url_new_issue += URI.encode_www_form("[Bug] " + issue_title)
@ -52,8 +54,10 @@ def error_template_helper(env : HTTP::Server::Context, locale : String?, status_
<h2>#{translate(locale, "crash_page_you_found_a_bug")}</h2> <h2>#{translate(locale, "crash_page_you_found_a_bug")}</h2>
<br/><br/> <br/><br/>
<p>#{translate(locale, "crash_page_before_reporting")}</p> <p><b>#{translate(locale, "crash_page_before_reporting")}</b></p>
<ul> <ul>
<li><a href="#{env.request.resource}">#{translate(locale, "crash_page_refresh")}</a></li>
<li><a href="#{url_switch}">#{translate(locale, "crash_page_switch_instance")}</a></li>
<li>#{translate(locale, "crash_page_read_the_faq", url_faq)}</li> <li>#{translate(locale, "crash_page_read_the_faq", url_faq)}</li>
<li>#{translate(locale, "crash_page_search_issue", url_search_issues)}</li> <li>#{translate(locale, "crash_page_search_issue", url_search_issues)}</li>
</ul> </ul>
@ -66,7 +70,9 @@ def error_template_helper(env : HTTP::Server::Context, locale : String?, status_
</div> </div>
END_HTML END_HTML
next_steps = error_redirect_helper(env, locale) # Don't show the usual "next steps" widget. The same options are
# proposed above the error message, just worded differently.
next_steps = ""
return templated "error" return templated "error"
end end