Add "signed in as" header to some pages (#4523)

31 files changed, 22 insertions, 45 deletions

diff --git a/config/application.rb b/config/application.rb
index 6bd47cd6c..b6ce74147 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -81,7 +81,7 @@ module Mastodon
     config.middleware.use Rack::Deflater
 
     config.to_prepare do
-      Doorkeeper::AuthorizationsController.layout 'public'
+      Doorkeeper::AuthorizationsController.layout 'modal'
       Doorkeeper::AuthorizedApplicationsController.layout 'admin'
       Doorkeeper::Application.send :include, ApplicationExtension
     end
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index b618bf344..056a3651a 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -34,6 +34,11 @@ Doorkeeper.configure do
   # https://github.com/doorkeeper-gem/doorkeeper#custom-access-token-generator
   # access_token_generator "::Doorkeeper::JWT"
 
+  # The controller Doorkeeper::ApplicationController inherits from.
+  # Defaults to ActionController::Base.
+  # https://github.com/doorkeeper-gem/doorkeeper#custom-base-controller
+  base_controller 'ApplicationController'
+
   # Reuse access token for the same resource owner within an application (disabled by default)
   # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
   reuse_access_token
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index ec051591a..575c5114c 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -43,7 +43,6 @@ ar:
   authorize_follow:
     error: Unfortunately, there was an error looking up the remote account
     follow: إتبع
-    prompt_html: 'You (<strong>%{self}</strong>) have requested to follow:'
     title: إتباع %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 65ff5c025..e7c3e1ef6 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -43,7 +43,6 @@ bg:
   authorize_follow:
     error: Възникна грешка в откриването на потребителя
     follow: Последвай
-    prompt_html: "(<strong>%{self}</strong>), молбата ти беше изпратена до:"
     title: Последвай %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 725b120ec..a9f9e4c93 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -185,7 +185,6 @@ ca:
   authorize_follow:
     error: Malauradament, ha ocorregut un error buscant el compte remot
     follow: Seguir
-    prompt_html: 'Tú (<strong>%{self}</strong>) has solicitat seguir:'
     title: Seguir %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 87c5fa67a..1f3675f47 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -166,7 +166,6 @@ de:
   authorize_follow:
     error: Das Profil konnte nicht geladen werden
     follow: Folgen
-    prompt_html: 'Du (<strong>%{self}</strong>) möchtest dieser Person folgen:'
     title: "%{acct} folgen"
   datetime:
     distance_in_words:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1d092d20c..d3f3d4f71 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -215,7 +215,7 @@ en:
       body: "%{reporter} has reported %{target}"
       subject: New report for %{instance} (#%{id})
   application_mailer:
-    salutation: '%{name},'
+    salutation: "%{name},"
     settings: 'Change e-mail preferences: %{link}'
     signature: Mastodon notifications from %{instance}
     view: 'View:'
@@ -228,13 +228,13 @@ en:
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
     didnt_get_confirmation: Didn't receive confirmation instructions?
     forgot_password: Forgot your password?
+    invalid_reset_password_token: Password reset link is invalid or expired. Please try again.
     login: Log in
     logout: Logout
     register: Sign up
     resend_confirmation: Resend confirmation instructions
     reset_password: Reset password
     set_new_password: Set new password
-    invalid_reset_password_token: Password reset link is invalid or expired. Please try again.
   authorize_follow:
     error: Unfortunately, there was an error looking up the remote account
     follow: Follow
@@ -244,7 +244,6 @@ en:
       close: Or, you can just close this window.
       return: Return to the user's profile
       web: Go to web
-    prompt_html: 'You (<strong>%{self}</strong>) have requested to follow:'
     title: Follow %{acct}
   datetime:
     distance_in_words:
@@ -524,3 +523,4 @@ en:
   users:
     invalid_email: The e-mail address is invalid
     invalid_otp_token: Invalid two-factor code
+    signed_in_as: 'Signed in as:'
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 6673b6516..f8b5ec0ac 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -42,7 +42,6 @@ eo:
   authorize_follow:
     error: Bedaŭrinde, okazis eraro provante konsulti la foran konton
     follow: Sekvi
-    prompt_html: 'Vi (<strong>%{self}</strong>) petis sekvi:'
     title: Sekvi %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 89e2828d0..d2d1de14f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -43,7 +43,6 @@ es:
   authorize_follow:
     error: Desafortunadamente, ha ocurrido un error buscando la cuenta remota
     follow: Seguir
-    prompt_html: 'Tú (<strong>%{self}</strong>) has solicitado seguir:'
     title: Seguir %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index eb66a9c41..a947cabd9 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -212,10 +212,10 @@ fa:
     title: مدیریت
   admin_mailer:
     new_report:
-      body: "کاربر %{reporter} کاربر %{target} را گزارش داد"
+      body: کاربر %{reporter} کاربر %{target} را گزارش داد
       subject: گزارش تازه‌ای برای %{instance} (#%{id})
   application_mailer:
-    salutation: '%{name},'
+    salutation: "%{name},"
     settings: 'تغییر تنظیمات ایمیل: %{link}'
     signature: اعلان‌های ماستدون از %{instance}
     view: 'نمایش:'
@@ -243,7 +243,6 @@ fa:
       close: یا این پنجره را ببندید.
       return: به نمایهٔ این کاربر بازگردید
       web: رفتن به وب
-    prompt_html: 'شما (<strong>%{self}</strong>) می‌خواهید این حساب را پی بگیرید:'
     title: پیگیری %{acct}
   datetime:
     distance_in_words:
@@ -500,7 +499,7 @@ fa:
       <p>این نوشته تحت اجازه‌نامهٔ CC-BY-SA قرار دارد. تاریخ آخرین به‌روزرسانی آن ۱۰ خرداد ۱۳۹۲ است.</p>
 
       <p>این نوشته اقتباسی است از <a href="https://github.com/discourse/discourse">سیاست رازداری Discourse</a>.</p>
-    title: "شرایط استفاده و سیاست رازداری %{instance}"
+    title: شرایط استفاده و سیاست رازداری %{instance}
   time:
     formats:
       default: "%d %b %Y, %H:%M"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 23c844741..b748f7184 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -42,7 +42,6 @@ fi:
   authorize_follow:
     error: Valitettavasti tapahtui virhe etätilin haussa.
     follow: Seuraa
-    prompt_html: 'Sinä (<strong>%{self}</strong>) olet pyytänyt lupaa seurata:'
     title: Seuraa %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7fde60a2b..04ab0253a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -235,7 +235,6 @@ fr:
       close: Ou bien, vous pouvez fermer cette fenêtre.
       return: Retour au profil de l'utilisateur⋅trice
       web: Retour à l'interface web
-    prompt_html: 'Vous (<strong>%{self}</strong>) avez demandé à suivre :'
     title: Suivre %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 7772e6a76..f04e8ad62 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -177,7 +177,6 @@ he:
   authorize_follow:
     error: למרבה הצער, היתה שגיאה בחיפוש החשבון המרוחק
     follow: לעקוב
-    prompt_html: 'בקשת מעקב ממך (<strong>%{self}</strong>) אחרי:'
     title: לעקוב אחרי %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 2d43fcad8..52a8bd35f 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -43,7 +43,6 @@ hr:
   authorize_follow:
     error: Nažalost, došlo je do greške looking up the remote račun
     follow: Slijedi
-    prompt_html: 'Ti si (<strong>%{self}</strong>) poslao zahtjev za sljeđenje:'
     title: Slijedi %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 0d5937cfb..c76b3d6bb 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -168,7 +168,6 @@ id:
   authorize_follow:
     error: Sayangnya, ada error saat melihat akun remote
     follow: Ikuti
-    prompt_html: 'Anda (<strong>%{self}</strong>) telah diminta untuk mengikuti:'
     title: Mengikuti %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index c9abd5711..112771ee4 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -166,7 +166,6 @@ io:
   authorize_follow:
     error: Regretinde, eventis eraro probante konsultar la fora konto
     follow: Sequar
-    prompt_html: 'Tu (<strong>%{self}</strong>) demandis sequar:'
     title: Sequar %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index de9682589..75d56362a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -43,7 +43,6 @@ it:
   authorize_follow:
     error: Sfortunatamente c'è stato un errore nel consultare l'account remoto
     follow: Segui
-    prompt_html: 'Tu, (<strong>%{self}</strong>), hai richiesto di seguire:'
     title: Segui %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d87e77ffb..2d3bda336 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -242,7 +242,6 @@ ja:
       close: またはこのウィンドウを閉じます
       return: ユーザーのプロフィールに戻る
       web: Web を開く
-    prompt_html: 'あなた（<strong>%{self}</strong>）は以下のアカウントのフォローをリクエストしました:'
     title: "%{acct} をフォロー"
   datetime:
     distance_in_words:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index aae0e62e7..f3bde5bbb 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -189,7 +189,6 @@ ko:
   authorize_follow:
     error: 리모트 팔로우 도중 오류가 발생했습니다.
     follow: 팔로우
-    prompt_html: '나(<strong>%{self}</strong>) 는 아래 계정의 팔로우를 요청했습니다:'
     title: "%{acct} 를 팔로우"
   datetime:
     distance_in_words:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 272a71eed..6562767a9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -106,7 +106,7 @@ nl:
       domain: Domein
       new:
         create: Blokkade aanmaken
-        hint: Een domeinblokkade voorkomt niet dat accountgegevens van dit domein aan de database worden toegevoegd, maar dat er met terugwerkende kracht en automatisch bepaalde moderatiemethoden op deze accounts worden toegepast. 
+        hint: Een domeinblokkade voorkomt niet dat accountgegevens van dit domein aan de database worden toegevoegd, maar dat er met terugwerkende kracht en automatisch bepaalde moderatiemethoden op deze accounts worden toegepast.
         severity:
           desc_html: "<strong>Negeren</strong> zorgt ervoor dat berichten van accounts van dit domein voor iedereen onzichtbaar zijn, behalve als een account wordt gevolgd. <strong>Opschorten</strong> zorgt ervoor dat alle berichten, media en profielgegevens van accounts van dit domein worden verwijderd. Gebruik <strong>Geen</strong> wanneer je alleen mediabestanden wilt weigeren."
           noop: Geen
@@ -129,7 +129,7 @@ nl:
           suspend: Alle opgeschorste accounts van dit domein niet meer opschorten
         title: Domeinblokkade voor %{domain} ongedaan maken
         undo: Ongedaan maken
-      title: Domeinblokkades 
+      title: Domeinblokkades
       undo: Ongedaan maken
     instances:
       account_count: Bekende accounts
@@ -169,7 +169,7 @@ nl:
           title: Bericht wanneer registratie is uitgeschakeld
         deletion:
           desc_html: Toestaan dat iedereen hun eigen account kan verwijderen
-          title:  Verwijderen account toestaan
+          title: Verwijderen account toestaan
         open:
           desc_html: Toestaan dat iedereen een account kan registereren
           title: Open registratie
@@ -241,7 +241,6 @@ nl:
       close: Of je kan dit venster gewoon sluiten.
       return: Ga terug naar het profiel van de gebruiker
       web: Ga naar de webapp
-    prompt_html: 'Je (<strong>%{self}</strong>) hebt toestemming gevraagd om iemand te mogen volgen:'
     title: Volg %{acct}
   datetime:
     distance_in_words:
@@ -307,7 +306,7 @@ nl:
       following: Volglijst
       muting: Negeerlijst
     upload: Uploaden
-  landing_strip_html: <strong>%{name}</strong> is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt.
+  landing_strip_html: "<strong>%{name}</strong> is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt."
   landing_strip_signup_html: Als je dat niet hebt, kun je je <a href="%{sign_up_path}">hier registreren</a>.
   media_attachments:
     validations:
@@ -510,7 +509,7 @@ nl:
     generate_recovery_codes: Herstelcodes genereren
     instructions_html: "<strong>Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon</strong>. Van nu af aan genereert deze app aanmeldcodes die je bij het aanmelden moet invoeren."
     lost_recovery_codes: Met herstelcodes kun je toegang tot jouw account krijgen wanneer je jouw telefoon bent kwijtgeraakt. Wanneer je jouw herstelcodes bent kwijtgeraakt, kan je ze hier opnieuw genereren. Jouw oude herstelcodes zijn daarna ongeldig.
-    manual_instructions: 'Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.'
+    manual_instructions: Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.
     recovery_codes: Herstelcodes back-uppen
     recovery_codes_regenerated: Opnieuw genereren herstelcodes geslaagd
     recovery_instructions_html: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. Zorg ervoor dat je de herstelcodes op een veilige plek bewaard. (Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.)
diff --git a/config/locales/no.yml b/config/locales/no.yml
index b2e5773de..996ea1d97 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -170,7 +170,6 @@
   authorize_follow:
     error: Uheldigvis så skjedde det en feil da vi prøvde å få tak i en bruker fra en annen instans.
     follow: Følg
-    prompt_html: 'Du (<strong>%{self}</strong>) har spurt om å følge:'
     title: Følg %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 3e1cc3b6f..784a70213 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -31,7 +31,7 @@ oc:
     status_count_after: estatuts
     status_count_before: qu’an escrich
     user_count_after: personas
-    user_count_before: Ostal de 
+    user_count_before: Ostal de
     what_is_mastodon: Qu’es Mastodon ?
   accounts:
     follow: Sègre
@@ -243,7 +243,6 @@ oc:
       close: O podètz tampar aquesta fenèstra.
       return: Tornar al perfil
       web: Tornar a l’interfàcia Web
-    prompt_html: 'Avètz (<strong>%{self}</strong>) demandat de sègre :'
     title: Sègre %{acct}
   date:
     abbr_day_names:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index bfd6b9091..05abf9291 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -215,7 +215,7 @@ pl:
       body: Użytkownik %{reporter} zgłosił %{target}
       subject: Nowe zgłoszenie na %{instance} (#%{id})
   application_mailer:
-    salutation: '%{name},'
+    salutation: "%{name},"
     settings: 'Zmień ustawienia powiadamiania: %{link}'
     signature: Powiadomienie Mastodona z instancji %{instance}
     view: 'Zobacz:'
@@ -243,7 +243,6 @@ pl:
       close: Ewentualnie, możesz po prostu zamknąć tę stronę.
       return: Powróć do strony użytkownika
       web: Przejdź do sieci
-    prompt_html: 'Ty (<strong>%{self}</strong>) chcesz śledzić:'
     title: Śledź %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 68b1c549c..6dec2b50a 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -169,7 +169,6 @@ pt-BR:
   authorize_follow:
     error: Infelizmente houve um erro olhando uma conta remota
     follow: Seguir
-    prompt_html: 'Você (<strong>%{self}</strong>) pediu pra seguir:'
     title: Seguir %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 348f670b5..0156f0e95 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -162,7 +162,6 @@ ru:
   authorize_follow:
     error: К сожалению, при поиске удаленного аккаунта возникла ошибка
     follow: Подписаться
-    prompt_html: 'Вы (<strong>%{self}</strong>) запросили подписку:'
     title: Подписаться на %{acct}
   datetime:
     distance_in_words:
@@ -269,14 +268,14 @@ ru:
     truncate: "&hellip;"
   push_notifications:
     favourite:
-      title: "Ваш статус понравился %{name}"
+      title: Ваш статус понравился %{name}
     follow:
       title: "%{name} теперь подписан(а) на Вас"
     mention:
       action_boost: Продвинуть
       action_expand: Развернуть
       action_favourite: Нравится
-      title: "Вас упомянул(а) %{name}"
+      title: Вас упомянул(а) %{name}
     reblog:
       title: "%{name} продвинул(а) Ваш статус"
     subscribed:
@@ -351,7 +350,7 @@ ru:
     reblogged: продвинул(а)
     sensitive_content: Чувствительный контент
   terms:
-    title: "Условия обслуживания и политика конфиденциальности %{instance}"
+    title: Условия обслуживания и политика конфиденциальности %{instance}
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 801f4886f..9d0887928 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -170,7 +170,6 @@ th:
   authorize_follow:
     error: Unfortunately, there was an error looking up the remote account
     follow: ติดตาม
-    prompt_html: 'คุณ (<strong>%{self}</strong>) ขอติดตาม:'
     title: ติดตาม %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index ac378090c..91ef9544c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -169,7 +169,6 @@ tr:
   authorize_follow:
     error: Uzak hesap aranırken bir hata oluştu.
     follow: Takip et
-    prompt_html: 'Siz (<strong>%{self}</strong>) bu kullanıcıyı takip etmek istiyor musunuz?:'
     title: "%{acct}'i takip et"
   datetime:
     distance_in_words:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 22fff6961..4d12ddf4e 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -160,7 +160,6 @@ uk:
   authorize_follow:
     error: На жаль, при пошуку віддаленого аккаунту виникла помилка
     follow: Підписатися
-    prompt_html: 'Ви (<strong>%{self}</strong>) запитали про підписку:'
     title: Підписатися на %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 5018b48b8..0672202a2 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -176,7 +176,6 @@ zh-CN:
   authorize_follow:
     error: 对不起，寻找这个跨站用户时出错
     follow: 关注
-    prompt_html: 你 (<strong>%{self}</strong>) 正准备关注︰
     title: 关注 %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 40087ed53..9d6c74008 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -169,7 +169,6 @@ zh-HK:
   authorize_follow:
     error: 對不起，尋找這個跨站用戶的過程發生錯誤
     follow: 關注
-    prompt_html: 你 (<strong>%{self}</strong>) 正準備關注︰
     title: 關注 %{acct}
   datetime:
     distance_in_words:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 0ea3457c7..7065acf9a 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -140,7 +140,6 @@ zh-TW:
   authorize_follow:
     error: 對不起，尋找這個跨站使用者的過程發生錯誤
     follow: 關注
-    prompt_html: 您 (<strong>%{self}</strong>) 正準備關注︰
     title: 關注 %{acct}
   datetime:
     distance_in_words: