Merge 7ad62051b7 into a50c8e951f

app/javascript/styles/mastodon/forms.scss

@@ -35,6 +35,17 @@ code {
     display: none;
   }
 
+  a {
+    color: $highlight-text-color;
+    text-decoration: underline;
+
+    &:hover,
+    &:active,
+    &:focus {
+      text-decoration: none;
+    }
+  }
+
   .input {
     margin-bottom: 16px;
     overflow: hidden;

app/views/oauth/authorizations/new.html.haml

@@ -6,6 +6,8 @@
     %h3= t('doorkeeper.authorizations.new.title')
 
     %p= t('doorkeeper.authorizations.new.prompt_html', client_name: content_tag(:strong, @pre_auth.client.name))
+    - if @pre_auth.client.application.owner
+      %p= t('doorkeeper.authorizations.new.prompt_author_html', author_profile: link_to(@pre_auth.client.application.owner.account.local_username_and_domain, account_path(@pre_auth.client.application.owner.account)))
 
     %h3= t('doorkeeper.authorizations.new.review_permissions')
 

config/locales/doorkeeper.en.yml

@@ -61,6 +61,7 @@ en:
         title: An error has occurred
       new:
         prompt_html: "%{client_name} would like permission to access your account. It is a third-party application. <strong>If you do not trust it, then you should not authorize it.</strong>"
+        prompt_author_html: 'This application was created by <span class="username">@%{author_profile}</span>'
         review_permissions: Review permissions
         title: Authorization required
       show: