mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-15 19:31:42 +00:00
c1c514ca70
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
41 lines
1.9 KiB
Plaintext
41 lines
1.9 KiB
Plaintext
- content_for :page_title do
|
|
= t('settings.edit_profile')
|
|
|
|
= simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f|
|
|
= render 'shared/error_messages', object: @account
|
|
|
|
.fields-group
|
|
= f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe
|
|
= f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 500 - @account.note.size).html_safe
|
|
|
|
= render 'application/card', account: @account
|
|
|
|
.fields-group
|
|
= f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT))
|
|
|
|
= f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT))
|
|
|
|
.fields-group
|
|
= f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
|
|
|
|
.fields-group
|
|
= f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
|
|
|
|
.fields-group
|
|
.input.with_block_label
|
|
%label= t('simple_form.labels.defaults.fields')
|
|
%span.hint= t('simple_form.hints.defaults.fields')
|
|
|
|
= f.simple_fields_for :fields do |fields_f|
|
|
.row
|
|
= fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name')
|
|
= fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value')
|
|
|
|
.actions
|
|
= f.button :button, t('generic.save_changes'), type: :submit
|
|
|
|
%hr/
|
|
|
|
%h6= t('auth.migrate_account')
|
|
%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
|