gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into upstream-20240128

Browse source
This commit is contained in:
KMY 2025-01-31 08:52:03 +09:00
commit bd5b417d2b
107 changed files with 795 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/views/settings/preferences/appearance/show.html.haml
View file

@ -119,6 +119,7 @@
.fields-group
= ff.input :'web.reblog_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_boost_modal')
= ff.input :'web.delete_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_delete_modal')
= ff.input :'web.missing_alt_text_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_missing_alt_text_modal')
%h4= t 'appearance.sensitive_content'

4
app/views/settings/verifications/show.html.haml
View file

@ -17,7 +17,7 @@
.input-copy.lead
.input-copy__wrapper
= copyable_input value: link_to('Mastodon', ActivityPub::TagManager.instance.url_for(@account), rel: :me)
%button{ type: :button }= t('generic.copy')
%button.button{ type: :button }= t('generic.copy')
%p.lead= t('verification.extra_instructions_html')
@ -60,7 +60,7 @@
.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')
%button.button{ type: :button }= t('generic.copy')
%p.lead= t('author_attribution.then_instructions')