cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Fix punycode being rendered instead of unicode in some places (#13030)

This commit is contained in:
Eugen Rochko 2020-02-03 18:44:54 +01:00 committed by GitHub
parent c31d61d7f2
commit c253f5c57e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/accounts_helper.rb
View File

@ -11,7 +11,7 @@ module AccountsHelper
def acct(account) def acct(account)
if account.local? if account.local?
"@#{account.acct}@#{Rails.configuration.x.local_domain}" "@#{account.acct}@#{site_hostname}"
else else
"@#{account.pretty_acct}" "@#{account.pretty_acct}"
end end

2
app/views/accounts/_og.html.haml
View File

@ -10,4 +10,4 @@
= opengraph 'og:image:width', '120' = opengraph 'og:image:width', '120'
= opengraph 'og:image:height', '120' = opengraph 'og:image:height', '120'
= opengraph 'twitter:card', 'summary' = opengraph 'twitter:card', 'summary'
= opengraph 'profile:username', account.local_username_and_domain = opengraph 'profile:username', acct(account)[1..-1]

2
app/views/accounts/show.html.haml
View File

@ -1,5 +1,5 @@
- content_for :page_title do - content_for :page_title do
= "#{display_name(@account)} (@#{@account.local_username_and_domain})" = "#{display_name(@account)} (#{acct(@account)})"
- content_for :header_tags do - content_for :header_tags do
- if @account.user&.setting_noindex - if @account.user&.setting_noindex

2
app/views/statuses/show.html.haml
View File

@ -10,7 +10,7 @@
= opengraph 'og:site_name', site_title = opengraph 'og:site_name', site_title
= opengraph 'og:type', 'article' = opengraph 'og:type', 'article'
= opengraph 'og:title', "#{display_name(@account)} (@#{@account.local_username_and_domain})" = opengraph 'og:title', "#{display_name(@account)} (#{acct(@account)})"
= opengraph 'og:url', short_account_status_url(@account, @status) = opengraph 'og:url', short_account_status_url(@account, @status)
= render 'og_description', activity: @status = render 'og_description', activity: @status