Correct a 6-in-the-morning breaking typos.

staging
multiple creatures 2019-05-10 05:58:37 -05:00
parent 47a251048c
commit 24a59d8f58
5 changed files with 11 additions and 11 deletions

View File

@ -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?

View File

@ -153,7 +153,7 @@ class Account < ApplicationRecord
:hides_filtered_gap?,
:hides_mascot?,
:hides_color_formatting?,
:hides_captions,
:hides_captions?,
to: :user,
prefix: true,

View File

@ -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

View File

@ -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

View File

@ -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 }