diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-07 21:07:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-07 21:07:01 +0100 |
commit | ac219dd1f6d660d3728c5881c4eb3b672fea432e (patch) | |
tree | fd2f30f2cb28a964442cc7b10d8ad8729bd659d2 /app/views/notification_mailer | |
parent | c493c967d67058a305006a09de66a1e08d877680 (diff) | |
parent | 2bc22be66cf09ed19eb7fb23b08324882a73b2b9 (diff) |
Merge pull request #1903 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/notification_mailer')
-rw-r--r-- | app/views/notification_mailer/_status.html.haml | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/_status.text.erb | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/favourite.html.haml | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/follow.html.haml | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/follow.text.erb | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/mention.html.haml | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/reblog.html.haml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml index 444b06fe6..e7cd5ba3e 100644 --- a/app/views/notification_mailer/_status.html.haml +++ b/app/views/notification_mailer/_status.html.haml @@ -42,4 +42,4 @@ = link_to a.remote_url, a.remote_url %p.status-footer - = link_to l(status.created_at), web_url("statuses/#{status.id}") + = link_to l(status.created_at), web_url("@#{status.account.pretty_acct}/#{status.id}") diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb index 1dc8de739..e03e8346c 100644 --- a/app/views/notification_mailer/_status.text.erb +++ b/app/views/notification_mailer/_status.text.erb @@ -5,4 +5,4 @@ <% end %> > <%= raw word_wrap(extract_status_plain_text(status), break_sequence: "\n> ") %> -<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %> +<%= raw t('application_mailer.view')%> <%= web_url("@#{status.account.pretty_acct}/#{status.id}") %> diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml index ebc5c29c7..5d9be3f57 100644 --- a/app/views/notification_mailer/favourite.html.haml +++ b/app/views/notification_mailer/favourite.html.haml @@ -41,5 +41,5 @@ %tbody %tr %td.button-primary - = link_to web_url("statuses/#{@status.id}") do + = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do %span= t 'application_mailer.view_status' diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml index a59ef8835..f250cbbd2 100644 --- a/app/views/notification_mailer/follow.html.haml +++ b/app/views/notification_mailer/follow.html.haml @@ -39,5 +39,5 @@ %tbody %tr %td.button-primary - = link_to web_url("accounts/#{@account.id}") do + = link_to web_url("@#{@account.pretty_acct}") do %span= t 'application_mailer.view_profile' diff --git a/app/views/notification_mailer/follow.text.erb b/app/views/notification_mailer/follow.text.erb index 016a0a4cf..e498df093 100644 --- a/app/views/notification_mailer/follow.text.erb +++ b/app/views/notification_mailer/follow.text.erb @@ -2,4 +2,4 @@ <%= raw t('notification_mailer.follow.body', name: @account.pretty_acct) %> -<%= raw t('application_mailer.view')%> <%= web_url("accounts/#{@account.id}") %> +<%= raw t('application_mailer.view')%> <%= web_url("@#{@account.pretty_acct}") %> diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml index cfb7465c1..4ae9bb7b0 100644 --- a/app/views/notification_mailer/mention.html.haml +++ b/app/views/notification_mailer/mention.html.haml @@ -41,5 +41,5 @@ %tbody %tr %td.button-primary - = link_to web_url("statuses/#{@status.id}") do + = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do %span= t 'notification_mailer.mention.action' diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml index c528536ec..f805c79f0 100644 --- a/app/views/notification_mailer/reblog.html.haml +++ b/app/views/notification_mailer/reblog.html.haml @@ -41,5 +41,5 @@ %tbody %tr %td.button-primary - = link_to web_url("statuses/#{@status.id}") do + = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do %span= t 'application_mailer.view_status' |