post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Improve translation show/hide logic

Browse source
This commit is contained in:
KMY 2023-08-25 13:16:25 +09:00
parent 2085e732b6
commit 579a48ce5f
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/components/status_content.jsx
View file

@ -241,7 +241,7 @@ class StatusContent extends PureComponent {
const renderReadMore = this.props.onClick && status.get('collapsed'); const renderReadMore = this.props.onClick && status.get('collapsed');
const contentLocale = intl.locale.replace(/[_-].*/, ''); const contentLocale = intl.locale.replace(/[_-].*/, '');
const targetLanguages = this.props.languages?.get(status.get('language') || 'und'); const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale); const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && status.get('language') && targetLanguages?.includes(contentLocale);
const content = { __html: statusContent ?? getStatusContent(status) }; const content = { __html: statusContent ?? getStatusContent(status) };
const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') }; const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };

4
app/serializers/rest/status_serializer.rb
View file

@ -97,10 +97,6 @@ class REST::StatusSerializer < ActiveModel::Serializer
ActivityPub::TagManager.instance.url_for(object) ActivityPub::TagManager.instance.url_for(object)
end end
def language
object.language || (current_user? && current_user.locale)
end
def status_reference_ids def status_reference_ids
@status_reference_ids = object.reference_objects.pluck(:target_status_id) @status_reference_ids = object.reference_objects.pluck(:target_status_id)
end end