Merge branch 'main' into glitch-soc/merge-upstream

main
Claire 2 years ago
commit 4ceadc65b0

@ -30,7 +30,7 @@ jobs:
- name: Check locale file normalization
run: bundle exec i18n-tasks check-normalized
- name: Check for unused strings
run: bundle exec i18n-tasks unused -l en
run: bundle exec i18n-tasks unused
- name: Check for wrong string interpolations
run: bundle exec i18n-tasks check-consistent-interpolations
- name: Check that all required locale files exist

@ -54,7 +54,7 @@ class AccountSuggestions::SettingSource < AccountSuggestions::Source
next if username.blank?
[username, domain]
[username.downcase, domain&.downcase]
end.compact
end
@ -63,6 +63,6 @@ class AccountSuggestions::SettingSource < AccountSuggestions::Source
end
def to_ordered_list_key(account)
[account.username, account.domain]
[account.username.downcase, account.domain&.downcase]
end
end

@ -86,7 +86,7 @@ class Form::AdminSettings
validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks_rationale) }
validates :media_cache_retention_period, :content_cache_retention_period, :backups_retention_period, numericality: { only_integer: true }, allow_blank: true, if: -> { defined?(@media_cache_retention_period) || defined?(@content_cache_retention_period) || defined?(@backups_retention_period) }
validates :site_short_description, length: { maximum: 200 }, if: -> { defined?(@site_short_description) }
validates :status_page_url, url: true
validates :status_page_url, url: true, allow_blank: true
validate :validate_site_uploads
KEYS.each do |key|

@ -96,9 +96,7 @@ af:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
exports:
bookmarks: Boekmerke

@ -232,9 +232,7 @@ bn:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
verification:
verification: সত্যতা নির্ধারণ

@ -342,9 +342,7 @@ br:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:

@ -6,7 +6,5 @@ bs:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -6,7 +6,5 @@ csb:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -190,9 +190,7 @@ en-GB:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
sessions:
browsers:

@ -369,9 +369,7 @@ ga:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:
@ -437,6 +435,8 @@ ga:
prev: Ceann roimhe seo
preferences:
other: Eile
posting_defaults: Posting defaults
public_timelines: Public timelines
relationships:
follow_selected_followers: Lean leantóirí roghnaithe
followers: Leantóirí

@ -6,7 +6,5 @@ hi:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -81,9 +81,7 @@ hr:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:

@ -539,7 +539,6 @@ hy:
'404': Էջը, որը փնտրում ես գոյութիւն չունի։
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Չափազանց շատ հարցումներ
'500':
title: Էջը ճիշտ չէ

@ -6,7 +6,5 @@ ig:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -394,6 +394,8 @@ ka:
prev: წინა
preferences:
other: სხვა
posting_defaults: Posting defaults
public_timelines: Public timelines
remote_follow:
missing_resource: საჭირო გადამისამართების ურლ თქვენი ანგარიშისთვის ვერ მოიძებნა
sessions:

@ -508,7 +508,6 @@ kab:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
title: Asebter-ayi d arameγtu
@ -630,6 +629,8 @@ kab:
prev: Win iɛeddan
preferences:
other: Wiyaḍ
posting_defaults: Posting defaults
public_timelines: Public timelines
privacy_policy:
title: Tasertit tabaḍnit
relationships:

@ -6,7 +6,5 @@ kn:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -11,9 +11,7 @@ kw:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
settings:
account: Akont

@ -6,7 +6,5 @@ la:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -426,6 +426,8 @@ lt:
prev: Ankstesnis
preferences:
other: Kita
posting_defaults: Posting defaults
public_timelines: Public timelines
remote_follow:
missing_resource: Jūsų paskyros nukreipimo URL nerasta
scheduled_statuses:

@ -6,7 +6,5 @@ mk:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -87,9 +87,7 @@ ml:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
filters:
contexts:

@ -6,7 +6,5 @@ mr:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -827,7 +827,6 @@ ms:
'422':
title: Pengesahan keselamatan gagal
'429': Terlalu banyak permintaan
'500':
'503': Halaman tidak dapat disampaikan kerana kegagalan pelayan sementara.
exports:
archive_takeout:

@ -6,7 +6,5 @@ my:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -6,7 +6,5 @@ pa:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -6,7 +6,5 @@ sa:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -209,7 +209,6 @@ sr-Latn:
'404': Strana koju ste tražili ne postoji.
'406': This page is not available in the requested format.
'410': Strana koju ste tražili više ne postoji.
'422':
'429': Uspored
'500':
content: Izvinjavamo se, nešto je pošlo po zlu sa ove strane.
@ -289,6 +288,8 @@ sr-Latn:
prev: Prethodni
preferences:
other: Ostali
posting_defaults: Posting defaults
public_timelines: Public timelines
remote_follow:
missing_resource: Ne mogu da nađem zahtevanu adresu preusmeravanja za Vaš nalog
sessions:

@ -6,7 +6,5 @@ szl:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -203,9 +203,7 @@ ta:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
filters:
index:

@ -6,7 +6,5 @@ tai:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -76,7 +76,5 @@ te:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -136,9 +136,7 @@ tt:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:
@ -183,6 +181,8 @@ tt:
truncate: "&hellip;"
preferences:
other: Башка
posting_defaults: Posting defaults
public_timelines: Public timelines
relationships:
following: Язылгансыз
sessions:

@ -6,7 +6,5 @@ ug:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -6,7 +6,5 @@ ur:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -45,7 +45,5 @@ uz:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.

@ -89,9 +89,7 @@ zgh:
'404': The page you are looking for isn't here.
'406': This page is not available in the requested format.
'410': The page you were looking for doesn't exist here anymore.
'422':
'429': Too many requests
'500':
'503': The page could not be served due to a temporary server failure.
exports:
archive_takeout:

Loading…
Cancel
Save