CloudToys/REI-Fixed
1
0
Fork 0
Code

Add lang attribute to preview card (#23869)

Browse Source
This commit is contained in:
Christian Schmidt 2023-02-24 20:04:38 +01:00 committed by GitHub
parent 19614ba247
commit 8000a8f230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/features/status/components/card.jsx
View File

@ -196,11 +196,12 @@ export default class Card extends React.PureComponent {
const interactive = card.get('type') !== 'link'; const interactive = card.get('type') !== 'link';
const className = classnames('status-card', { horizontal, compact, interactive }); const className = classnames('status-card', { horizontal, compact, interactive });
const title = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener noreferrer' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>; const title = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener noreferrer' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
const language = card.get('language') || '';
const ratio = card.get('width') / card.get('height'); const ratio = card.get('width') / card.get('height');
const height = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio); const height = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
const description = ( const description = (
<div className='status-card__content'> <div className='status-card__content' lang={language}>
{title} {title}
{!(horizontal || compact) && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>} {!(horizontal || compact) && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>}
<span className='status-card__host'>{provider}</span> <span className='status-card__host'>{provider}</span>

2
app/serializers/rest/preview_card_serializer.rb
View File

@ -3,7 +3,7 @@
class REST::PreviewCardSerializer < ActiveModel::Serializer class REST::PreviewCardSerializer < ActiveModel::Serializer
include RoutingHelper include RoutingHelper
attributes :url, :title, :description, :type, attributes :url, :title, :description, :language, :type,
:author_name, :author_url, :provider_name, :author_name, :author_url, :provider_name,
:provider_url, :html, :width, :height, :provider_url, :html, :width, :height,
:image, :embed_url, :blurhash :image, :embed_url, :blurhash