diff options
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/account.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/services/post_status_service.rb | 2 | ||||
| -rwxr-xr-x | app/views/layouts/application.html.haml | 14 |
5 files changed, 11 insertions, 11 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index ee26fd022..80b52223e 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -40,7 +40,7 @@ module StreamEntriesHelper roles << content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot') if account.bot? roles << content_tag(:div, t('accounts.roles.adults_only'), class: 'account-role adults-only') if account.adults_only? roles << content_tag(:div, t('accounts.roles.gentlies_kobolds'), class: 'account-role gentlies') if account.user_gentlies_kobolds? - roles << content_tag(:div, t('accounts.roles.kobold'), class: 'account-role kobold') if account.user_is_kobold? + roles << content_tag(:div, t('accounts.roles.kobold'), class: 'account-role kobold') if account.user_is_a_kobold? if (Setting.show_staff_badge && account.user_staff?) || all if all && !account.user_staff? diff --git a/app/models/account.rb b/app/models/account.rb index 704e5bcc7..163e0161e 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -153,7 +153,7 @@ class Account < ApplicationRecord :hides_filtered_gap?, :hides_mascot?, :hides_color_formatting?, - :hides_captions, + :hides_captions?, to: :user, prefix: true, diff --git a/app/models/user.rb b/app/models/user.rb index 343d68db5..7f2892b00 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -318,7 +318,7 @@ class User < ApplicationRecord end def default_language - @_default_language ||= (setting.default_language || 'en') + @_default_language ||= (settings.default_language || 'en') end def setting_default_privacy diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 0030fc603..60a5cac5c 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -184,7 +184,7 @@ class PostStatusService < BaseService visibility: @visibility, local_only: @local_only, sharekey: @sharekey, - language: language_from_option(@options[:language]) || @account.default_language&.presence || 'en', + language: language_from_option(@options[:language]) || @account.user_default_language&.presence || 'en', application: @options[:application], content_type: @options[:content_type] || @account.user&.setting_default_content_type, }.compact diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f01329914..2f66532c5 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -37,7 +37,7 @@ - if Setting.custom_css.present? = stylesheet_link_tag custom_css_path, media: 'all' - - if current_account.user_hides_color_formatting? + - if current_account&.user_hides_color_formatting? :css .status__content p > span, .reply-indicator__content p > span, @@ -46,20 +46,20 @@ .account__header__fields p > span { color: inherit !important } - - if current_account.user_hides_captions? + - if current_account&.user_hides_captions? :css div .media-caption, span .caption { display: none } - - if current_account.user_wants_larger_menus? + - if current_account&.user_wants_larger_menus? :css .dropdown-menu__item a { padding: 14px 14px !important; font-size: 14px !important } .dropdown--active .dropdown__content > ul > li > a { padding: 14px 0 !important; font-size: 14px !important } - - if current_account.user_wants_larger_buttons? + - if current_account&.user_wants_larger_buttons? :css .drawer { min-width: 350px !important } .status__action-bar .icon-button, @@ -73,15 +73,15 @@ margin-right: 24px; } - - if current_account.user_wants_larger_drawer? + - if current_account&.user_wants_larger_drawer? :css .drawer { min-width: 400px !important } - - if current_account.user_hides_filtered_gap? + - if current_account&.user_hides_filtered_gap? :css .status__wrapper--filtered { display: none !important; } - - if current_account.user_hides_mascot? + - if current_account&.user_hides_mascot? :css .drawer__inner__mastodon>img { display: none !important } |