djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-23 16:44:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add more explicit explanations about author attribution and fediverse:creator (#32383)

Browse Source
This commit is contained in:
Claire 2024-10-17 11:03:08 +02:00 committed by GitHub
parent 009f2ebc32
commit 8b56509625
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/styles/mastodon/forms.scss
View File

@ -23,6 +23,8 @@ code {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
height: 160px; height: 160px;
max-width: 566px;
margin-inline: auto;
&::after { &::after {
content: ''; content: '';

47
app/views/settings/verifications/show.html.haml
View File

@ -38,25 +38,34 @@
%p.lead= t('author_attribution.hint_html') %p.lead= t('author_attribution.hint_html')
.fields-row .fields-group.fade-out-top
.fields-row__column.fields-row__column-6 %div
.fields-group .status-card.expanded.bottomless
= f.input :attribution_domains_as_text, as: :text, wrapper: :with_block_label, input_html: { placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4 } .status-card__image
.fields-row__column.fields-row__column-6 = image_tag frontend_asset_url('images/preview.png'), alt: '', class: 'status-card__image-image'
.fields-group.fade-out-top .status-card__content
%div %span.status-card__host
.status-card.expanded.bottomless %span= t('author_attribution.s_blog', name: display_name(@account))
.status-card__image ·
= image_tag frontend_asset_url('images/preview.png'), alt: '', class: 'status-card__image-image' %time.time-ago{ datetime: 1.year.ago.to_date.iso8601 }
.status-card__content %strong.status-card__title= t('author_attribution.example_title')
%span.status-card__host .more-from-author
%span= t('author_attribution.s_blog', name: display_name(@account)) = logo_as_symbol(:icon)
· = t('author_attribution.more_from_html', name: link_to(root_url, class: 'story__details__shared__author-link') { image_tag(@account.avatar.url, class: 'account__avatar', width: 16, height: 16, alt: '') + tag.bdi(display_name(@account)) })
%time.time-ago{ datetime: 1.year.ago.to_date.iso8601 }
%strong.status-card__title= t('author_attribution.example_title') %h4= t('verification.here_is_how')
.more-from-author
= logo_as_symbol(:icon) %p.lead= t('author_attribution.instructions')
= t('author_attribution.more_from_html', name: link_to(root_url, class: 'story__details__shared__author-link') { image_tag(@account.avatar.url, class: 'account__avatar', width: 16, height: 16, alt: '') + tag.bdi(display_name(@account)) })
.input-copy.lead
.input-copy__wrapper
= copyable_input value: tag.meta(name: 'fediverse:creator', content: "@#{@account.local_username_and_domain}")
%button{ type: :button }= t('generic.copy')
%p.lead= t('author_attribution.then_instructions')
.fields-group
= f.input :attribution_domains_as_text, as: :text, wrapper: :with_block_label, input_html: { placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4 }
.actions .actions
= f.button :button, t('generic.save_changes'), type: :submit = f.button :button, t('generic.save_changes'), type: :submit

4
config/locales/en.yml
View File

@ -1166,9 +1166,11 @@ en:
use_security_key: Use security key use_security_key: Use security key
author_attribution: author_attribution:
example_title: Sample text example_title: Sample text
hint_html: Control how you're credited when links are shared on Mastodon. hint_html: Are you writing news or blog articles outside of Mastodon? Control how you get credited when they are shared on Mastodon.
instructions: 'Make sure this code is in your article''s HTML:'
more_from_html: More from %{name} more_from_html: More from %{name}
s_blog: "%{name}'s Blog" s_blog: "%{name}'s Blog"
then_instructions: Then, add the domain name of the publication in the field below.
title: Author attribution title: Author attribution
challenge: challenge:
confirm: Continue confirm: Continue

4
config/locales/simple_form.en.yml
View File

@ -3,7 +3,7 @@ en:
simple_form: simple_form:
hints: hints:
account: account:
attribution_domains_as_text: Protects from false attributions. attribution_domains_as_text: One per line. Protects from false attributions.
discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users. discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users.
display_name: Your full name or your fun name. display_name: Your full name or your fun name.
fields: Your homepage, pronouns, age, anything you want. fields: Your homepage, pronouns, age, anything you want.
@ -144,7 +144,7 @@ en:
url: Where events will be sent to url: Where events will be sent to
labels: labels:
account: account:
attribution_domains_as_text: Only allow specific websites attribution_domains_as_text: Websites allowed to credit you
discoverable: Feature profile and posts in discovery algorithms discoverable: Feature profile and posts in discovery algorithms
fields: fields:
name: Label name: Label