merge upstream

packages/backend/src/server/web/views/error.pug

@@ -13,7 +13,7 @@ doctype html
 
 	 Thank you for using Sharkey!
 	 If you are reading this message... how about joining the development?
-	 https://activitypub.software/TransFem-org/Sharkey
+	 https://github.com/misskey-dev/misskey
 
 
 html
@@ -31,39 +31,45 @@ html
 		style
 			include ../error.css
 
+		script
+			include ../error.js
+
 body
 	svg.icon-warning(xmlns="http://www.w3.org/2000/svg", viewBox="0 0 24 24", stroke-width="2", stroke="currentColor", fill="none", stroke-linecap="round", stroke-linejoin="round")
 		path(stroke="none", d="M0 0h24v24H0z", fill="none")
 		path(d="M12 9v2m0 4v.01")
 		path(d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75")
 
-	h1 An error has occurred!
+	h1(data-i18n="title") Failed to initialize Sharkey
 
 	button.button-big(onclick="location.reload();")
-		span.button-label-big Refresh
+		span.button-label-big(data-i18n-reload) Reload
 
-	p.dont-worry Don't worry, it's (probably) not your fault.
-
-	p If reloading after a period of time does not resolve the problem, contact the server administrator with the following ERROR ID.
+	p(data-i18n="serverError") If reloading after a period of time does not resolve the problem, contact the server administrator with the following ERROR ID.
 
 	div#errors
 		code.
 			ERROR CODE: #{code}
 			ERROR ID: #{id}
 
-	p You may also try the following options:
+	p
+		b(data-i18n="solution") The following actions may solve the problem.
 
-	p Update your os and browser.
-	p Disable an adblocker.
+	p(data-i18n="solution1") Update your os and browser
+	p(data-i18n="solution2") Disable an adblocker
+	p(data-i18n="solution3") Clear your browser cache
+	p(data-i18n="solution4") (Tor Browser) Set dom.webaudio.enabled to true
 
-	a(href="/flush")
-		button.button-small
-			span.button-label-small Clear preferences and cache
-	br
-	a(href="/cli")
-		button.button-small
-			span.button-label-small Start the simple client
-	br
-	a(href="/bios")
-		button.button-small
-			span.button-label-small Start the repair tool
+	details(style="color: #86b300;")
+		summary(data-i18n="otherOption") Other options
+		a(href="/flush")
+			button.button-small
+				span.button-label-small(data-i18n="otherOption1") Clear preferences and cache
+		br
+		a(href="/cli")
+			button.button-small
+				span.button-label-small(data-i18n="otherOption2") Start the simple client
+		br
+		a(href="/bios")
+			button.button-small
+				span.button-label-small(data-i18n="otherOption3") Start the repair tool

packages/backend/src/server/web/views/oauth.pug

@@ -6,4 +6,6 @@ block meta
 	//- XXX: Remove navigation bar in auth page?
 	meta(name='misskey:oauth:transaction-id' content=transactionId)
 	meta(name='misskey:oauth:client-name' content=clientName)
+	if clientLogo
+		meta(name='misskey:oauth:client-logo' content=clientLogo)
 	meta(name='misskey:oauth:scope' content=scope)