Skip to content

Commit

Permalink
Merge pull request #710 from kmycode/upstream-20240412
Browse files Browse the repository at this point in the history
Upstream 2024041
kmycode authored Apr 12, 2024
2 parents 207fff0 + b7f3cba commit eaa8d89
Showing 11 changed files with 24 additions and 29 deletions.
1 change: 0 additions & 1 deletion .haml-lint.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ inherits_from: .haml-lint_todo.yml

exclude:
- 'vendor/**/*'
- lib/templates/haml/scaffold/_form.html.haml

require:
- ./lib/linter/haml_middle_dot.rb
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -198,7 +198,7 @@ GEM
irb (~> 1.10)
reline (>= 0.3.8)
debug_inspector (1.2.0)
devise (4.9.3)
devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
@@ -456,7 +456,7 @@ GEM
net-smtp (0.4.0.1)
net-protocol
nio4r (2.7.1)
nokogiri (1.16.3)
nokogiri (1.16.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nsa (0.3.0)
@@ -607,7 +607,7 @@ GEM
redlock (1.3.2)
redis (>= 3.0.0, < 6.0)
regexp_parser (2.9.0)
reline (0.5.0)
reline (0.5.1)
io-console (~> 0.5)
request_store (1.5.1)
rack (>= 1.4)
6 changes: 2 additions & 4 deletions app/helpers/context_helper.rb
Original file line number Diff line number Diff line change
@@ -57,13 +57,11 @@ def full_context
end

def serialized_context(named_contexts_map, context_extensions_map)
context_array = []

named_contexts = named_contexts_map.keys
context_extensions = context_extensions_map.keys

named_contexts.each do |key|
context_array << NAMED_CONTEXT_MAP[key]
context_array = named_contexts.map do |key|
NAMED_CONTEXT_MAP[key]
end

extensions = context_extensions.each_with_object({}) do |key, h|
4 changes: 2 additions & 2 deletions app/javascript/mastodon/locales/ca.json
Original file line number Diff line number Diff line change
@@ -705,7 +705,7 @@
"status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
"status.embed": "Incrusta",
"status.favourite": "Favorit",
"status.favourites": "{count, plural, one {# favorit} other {# favorits}}",
"status.favourites": "{count, plural, one {favorit} other {favorits}}",
"status.filter": "Filtra aquest tut",
"status.filtered": "Filtrada",
"status.hide": "Amaga el tut",
@@ -726,7 +726,7 @@
"status.reblog": "Impulsa",
"status.reblog_private": "Impulsa amb la visibilitat original",
"status.reblogged_by": "impulsat per {name}",
"status.reblogs": "{count, plural, one {# impuls} other {# impulsos}}",
"status.reblogs": "{count, plural, one {impuls} other {impulsos}}",
"status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
"status.redraft": "Esborra i reescriu",
"status.remove_bookmark": "Elimina el marcador",
2 changes: 1 addition & 1 deletion app/javascript/mastodon/locales/it.json
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@
"admin.impact_report.instance_follows": "I seguaci che i loro utenti perderebbero",
"admin.impact_report.title": "Riepilogo dell'impatto",
"alert.rate_limited.message": "Sei pregato di riprovare dopo le {retry_time, time, medium}.",
"alert.rate_limited.title": "Tasso limitato",
"alert.rate_limited.title": "Limitazione per eccesso di richieste",
"alert.unexpected.message": "Si è verificato un errore imprevisto.",
"alert.unexpected.title": "Oops!",
"announcement.announcement": "Annuncio",
6 changes: 3 additions & 3 deletions app/javascript/mastodon/locales/tt.json
Original file line number Diff line number Diff line change
@@ -449,9 +449,9 @@
"time_remaining.seconds": "{number, plural, one {# секунд} other {# секунд}} калды",
"timeline_hint.resources.statuses": "Older toots",
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
"units.short.billion": "{count}Млрд",
"units.short.million": "{count}Млн",
"units.short.thousand": "{count}М",
"units.short.billion": "{count} млрд",
"units.short.million": "{count} млн",
"units.short.thousand": "{count} мең",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
"upload_form.edit": "Үзгәртү",
18 changes: 9 additions & 9 deletions config/locales/tt.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ tt:
accounts:
follow: Языл
followers:
other: Язылучы
other: язылучы
following: Язылгансыз
posts:
other: Язма
@@ -137,14 +137,14 @@ tt:
new_users: яңа кулланучылар
software: Программа тәэминаты
title: Идарә аслыгы
website: Вебсайт
website: Веб-сайт
domain_allows:
export: Экспортлау
import: Импортлау
export: Экспорт
import: Импорт
domain_blocks:
domain: Домен
export: Экспортлау
import: Импортлау
export: Экспорт
import: Импорт
new:
severity:
noop: Бернинди дә
@@ -438,8 +438,8 @@ tt:
decimal_units:
format: "%n %u"
units:
billion: Млрд
million: Млн
billion: млрд
million: млн
quadrillion: Квадрлн
thousand: Мең
trillion: Трлн
@@ -455,7 +455,7 @@ tt:
preferences:
other: Башка
privacy_policy:
title: Хосусыйлык Сәясәте
title: Хосусыйлык сәясәте
relationships:
dormant: Актив түгел
followers: Язылучылар
6 changes: 2 additions & 4 deletions lib/mastodon/cli/progress_helper.rb
Original file line number Diff line number Diff line change
@@ -35,10 +35,8 @@ def parallelize_with_progress(scope)
aggregate = Concurrent::AtomicFixnum.new(0)

scope.reorder(nil).find_in_batches do |items|
futures = []

items.each do |item|
futures << Concurrent::Future.execute(executor: pool) do
futures = items.map do |item|
Concurrent::Future.execute(executor: pool) do
if !progress.total.nil? && progress.progress + 1 > progress.total
# The number of items has changed between start and now,
# since there is no good way to predict the final count from
File renamed without changes.
2 changes: 1 addition & 1 deletion spec/fabricators/preview_card_provider_fabricator.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

Fabricator(:preview_card_provider) do
domain { Faker::Internet.domain_name }
domain { sequence(:domain) { |i| "#{i}#{Faker::Internet.domain_name}" } }
end
2 changes: 1 addition & 1 deletion spec/fabricators/unavailable_domain_fabricator.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

Fabricator(:unavailable_domain) do
domain { Faker::Internet.domain_name }
domain { sequence(:domain) { |i| "#{i}#{Faker::Internet.domain_name}" } }
end

0 comments on commit eaa8d89

Please sign in to comment.