Merge branch 'asonix/changes' into asonix/downstream
This commit is contained in:
commit
7e70435c1e
|
@ -50,7 +50,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
|
|||
resource.registration_form_time = session[:registration_form_time]
|
||||
resource.sign_up_ip = request.remote_ip
|
||||
|
||||
resource.current_sign_in_ip = request.remote_ip if resource.current_sign_in_ip.nil?
|
||||
resource.build_account if resource.account.nil?
|
||||
end
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
module LanguagesHelper
|
||||
ISO_639_1 = {
|
||||
squeak: ["Squeak", "Squeak"].freeze,
|
||||
dog: ["Dog", "Dog"].freeze,
|
||||
lion: ["Lion", "Lion"].freeze,
|
||||
aa: ['Afar', 'Afaraf'].freeze,
|
||||
ab: ['Abkhaz', 'аҧсуа бызшәа'].freeze,
|
||||
ae: ['Avestan', 'avesta'].freeze,
|
||||
|
@ -38,6 +35,7 @@ module LanguagesHelper
|
|||
cy: ['Welsh', 'Cymraeg'].freeze,
|
||||
da: ['Danish', 'dansk'].freeze,
|
||||
de: ['German', 'Deutsch'].freeze,
|
||||
dog: ["Dog", "Dog"].freeze,
|
||||
dv: ['Divehi', 'Dhivehi'].freeze,
|
||||
dz: ['Dzongkha', 'རྫོང་ཁ'].freeze,
|
||||
ee: ['Ewe', 'Eʋegbe'].freeze,
|
||||
|
@ -99,6 +97,7 @@ module LanguagesHelper
|
|||
lb: ['Luxembourgish', 'Lëtzebuergesch'].freeze,
|
||||
lg: ['Ganda', 'Luganda'].freeze,
|
||||
li: ['Limburgish', 'Limburgs'].freeze,
|
||||
lion: ["Lion", "Lion"].freeze,
|
||||
ln: ['Lingala', 'Lingála'].freeze,
|
||||
lo: ['Lao', 'ພາສາ'].freeze,
|
||||
lt: ['Lithuanian', 'lietuvių kalba'].freeze,
|
||||
|
@ -152,6 +151,7 @@ module LanguagesHelper
|
|||
sn: ['Shona', 'chiShona'].freeze,
|
||||
so: ['Somali', 'Soomaaliga'].freeze,
|
||||
sq: ['Albanian', 'Shqip'].freeze,
|
||||
squeak: ["Squeak", "Squeak"].freeze,
|
||||
sr: ['Serbian', 'српски језик'].freeze,
|
||||
ss: ['Swati', 'SiSwati'].freeze,
|
||||
st: ['Southern Sotho', 'Sesotho'].freeze,
|
||||
|
|
|
@ -65,14 +65,6 @@ module StatusesHelper
|
|||
embedded_view? ? '_blank' : nil
|
||||
end
|
||||
|
||||
def acct(account)
|
||||
if account.local?
|
||||
"@#{account.acct}@#{Rails.configuration.x.local_domain}"
|
||||
else
|
||||
"@#{account.acct}"
|
||||
end
|
||||
end
|
||||
|
||||
def text_formatting_classes
|
||||
case current_user&.setting_strip_formatting
|
||||
when 'none', nil
|
||||
|
|
|
@ -103,16 +103,6 @@ class SearchResults extends ImmutablePureComponent {
|
|||
<div className='search-results__section'>
|
||||
<h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
|
||||
|
||||
<div className='search-results__info'>
|
||||
<FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching toots by their content is not enabled on this Mastodon server.' />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
} else if(results.get('statuses') && results.get('statuses').size === 0 && !searchEnabled && !(searchTerm.startsWith('@') || searchTerm.startsWith('#') || searchTerm.includes(' '))) {
|
||||
statuses = (
|
||||
<div className='search-results__section'>
|
||||
<h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
|
||||
|
||||
<div className='search-results__info'>
|
||||
<FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching toots by their content is not enabled on this Mastodon server.' />
|
||||
</div>
|
||||
|
|
|
@ -16,8 +16,6 @@ class ActivityPub::ProcessAccountService < BaseService
|
|||
@domain = domain
|
||||
@collections = {}
|
||||
|
||||
return if auto_suspend?
|
||||
|
||||
RedisLock.acquire(lock_options) do |lock|
|
||||
if lock.acquired?
|
||||
@account = Account.remote.find_by(uri: @uri) if @options[:only_key]
|
||||
|
|
|
@ -70,10 +70,6 @@ module Mastodon
|
|||
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
|
||||
config.i18n.available_locales = [
|
||||
:af,
|
||||
:dog,
|
||||
:lion,
|
||||
:squeak,
|
||||
:en,
|
||||
:ar,
|
||||
:ast,
|
||||
:bg,
|
||||
|
@ -86,6 +82,7 @@ module Mastodon
|
|||
:cy,
|
||||
:da,
|
||||
:de,
|
||||
:dog,
|
||||
:el,
|
||||
:en,
|
||||
:eo,
|
||||
|
@ -116,6 +113,7 @@ module Mastodon
|
|||
:kn,
|
||||
:ko,
|
||||
:ku,
|
||||
:lion,
|
||||
:lt,
|
||||
:lv,
|
||||
:mk,
|
||||
|
@ -137,6 +135,7 @@ module Mastodon
|
|||
:sk,
|
||||
:sl,
|
||||
:sq,
|
||||
:squeak,
|
||||
:sr,
|
||||
:'sr-Latn',
|
||||
:sv,
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
module Mastodon
|
||||
module Version
|
||||
module_function
|
||||
def source_base_url
|
||||
'https://git.asonix.dog/asonix/mastodon'
|
||||
end
|
||||
end
|
||||
end
|
|
@ -1277,11 +1277,11 @@ dog:
|
|||
decimal_units:
|
||||
format: "%n%u"
|
||||
units:
|
||||
bildog: B
|
||||
mildog: M
|
||||
quadrildog: Q
|
||||
billion: B
|
||||
million: M
|
||||
quadrillion: Q
|
||||
thousand: K
|
||||
trildog: T
|
||||
trillion: T
|
||||
unit: ''
|
||||
otp_authentication:
|
||||
code_hint: Enter the code generated by your authenticator app to confirm
|
||||
|
|
Loading…
Reference in a new issue