mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Fix links to the Web UI in notifications (#19981)
Most of the old routes are broken because of the /web removal.
This commit is contained in:
parent
8515bc7962
commit
e1227457f1
@ -1,4 +1,4 @@
|
|||||||
.post-follow-actions
|
.post-follow-actions
|
||||||
%div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@resource.id}"), class: 'button button--block'
|
%div= link_to t('authorize_follow.post_follow.web'), web_url("@#{@resource.pretty_acct}"), class: 'button button--block'
|
||||||
%div= link_to t('authorize_follow.post_follow.return'), ActivityPub::TagManager.instance.url_for(@resource), class: 'button button--block'
|
%div= link_to t('authorize_follow.post_follow.return'), ActivityPub::TagManager.instance.url_for(@resource), class: 'button button--block'
|
||||||
%div= t('authorize_follow.post_follow.close')
|
%div= t('authorize_follow.post_follow.close')
|
||||||
|
@ -42,4 +42,4 @@
|
|||||||
= link_to a.remote_url, a.remote_url
|
= link_to a.remote_url, a.remote_url
|
||||||
|
|
||||||
%p.status-footer
|
%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}")
|
||||||
|
@ -5,4 +5,4 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
> <%= raw word_wrap(extract_status_plain_text(status), break_sequence: "\n> ") %>
|
> <%= 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}") %>
|
||||||
|
@ -41,5 +41,5 @@
|
|||||||
%tbody
|
%tbody
|
||||||
%tr
|
%tr
|
||||||
%td.button-primary
|
%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'
|
%span= t 'application_mailer.view_status'
|
||||||
|
@ -39,5 +39,5 @@
|
|||||||
%tbody
|
%tbody
|
||||||
%tr
|
%tr
|
||||||
%td.button-primary
|
%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'
|
%span= t 'application_mailer.view_profile'
|
||||||
|
@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
<%= raw t('notification_mailer.follow.body', name: @account.pretty_acct) %>
|
<%= 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}") %>
|
||||||
|
@ -41,5 +41,5 @@
|
|||||||
%tbody
|
%tbody
|
||||||
%tr
|
%tr
|
||||||
%td.button-primary
|
%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'
|
%span= t 'notification_mailer.mention.action'
|
||||||
|
@ -41,5 +41,5 @@
|
|||||||
%tbody
|
%tbody
|
||||||
%tr
|
%tr
|
||||||
%td.button-primary
|
%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'
|
%span= t 'application_mailer.view_status'
|
||||||
|
@ -77,4 +77,4 @@
|
|||||||
|
|
||||||
- if user_signed_in?
|
- if user_signed_in?
|
||||||
·
|
·
|
||||||
= link_to t('statuses.open_in_web'), web_url("statuses/#{status.id}"), class: 'detailed-status__application', target: '_blank'
|
= link_to t('statuses.open_in_web'), web_url("@#{status.account.pretty_acct}/#{status.id}"), class: 'detailed-status__application', target: '_blank'
|
||||||
|
Loading…
Reference in New Issue
Block a user