From 4948a063d20c94cf9eb6dc60c2c30898cb05f4c1 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 10 Apr 2024 05:20:21 -0400 Subject: [PATCH 1/8] Use `tt` extension for form scaffold template (#29676) --- .haml-lint.yml | 1 - .../haml/scaffold/{_form.html.haml => _form.html.haml.tt} | 0 2 files changed, 1 deletion(-) rename lib/templates/haml/scaffold/{_form.html.haml => _form.html.haml.tt} (100%) diff --git a/.haml-lint.yml b/.haml-lint.yml index e493afb85f..74d243a3ad 100644 --- a/.haml-lint.yml +++ b/.haml-lint.yml @@ -1,6 +1,5 @@ exclude: - 'vendor/**/*' - - lib/templates/haml/scaffold/_form.html.haml require: - ./lib/linter/haml_middle_dot.rb diff --git a/lib/templates/haml/scaffold/_form.html.haml b/lib/templates/haml/scaffold/_form.html.haml.tt similarity index 100% rename from lib/templates/haml/scaffold/_form.html.haml rename to lib/templates/haml/scaffold/_form.html.haml.tt From b57ee5cf5ba312b6e5f5df9208be8e2b02e13242 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 10 Apr 2024 08:46:39 -0400 Subject: [PATCH 2/8] Fix `Style/MapIntoArray` cop in context helper (#29885) --- app/helpers/context_helper.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb index 2d7a4f98fd..cbefe0fe53 100644 --- a/app/helpers/context_helper.rb +++ b/app/helpers/context_helper.rb @@ -48,13 +48,11 @@ module ContextHelper 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| From 45650156159ad2e71ac5cf04c8b780455ca90deb Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 10 Apr 2024 08:46:43 -0400 Subject: [PATCH 3/8] Fix `Style/MapIntoArray` cop in cli progress helper (#29884) --- lib/mastodon/cli/progress_helper.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/mastodon/cli/progress_helper.rb b/lib/mastodon/cli/progress_helper.rb index 4fcc47a7f7..f22492afcf 100644 --- a/lib/mastodon/cli/progress_helper.rb +++ b/lib/mastodon/cli/progress_helper.rb @@ -35,10 +35,8 @@ module Mastodon::CLI 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 From db5a5636d97aa754ac7cc1fb4cd974ff9d953335 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:03:40 +0200 Subject: [PATCH 4/8] New Crowdin Translations (automated) (#29888) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/ca.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 37990cdb2e..6f0dd93760 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -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", From 96bdeeed0eeaed2c06c9e5c59049a35171ff798a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:50:34 +0200 Subject: [PATCH 5/8] Update dependency nokogiri to v1.16.4 (#29900) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3508ad8d54..af80af306d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) From 576554b19bea0f95d110be0df779bf220d9f5b0b Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 11 Apr 2024 04:59:01 -0400 Subject: [PATCH 6/8] Use fabrication sequence in domain values (#29895) --- spec/fabricators/preview_card_provider_fabricator.rb | 2 +- spec/fabricators/unavailable_domain_fabricator.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/fabricators/preview_card_provider_fabricator.rb b/spec/fabricators/preview_card_provider_fabricator.rb index 78db710003..3a027623f7 100644 --- a/spec/fabricators/preview_card_provider_fabricator.rb +++ b/spec/fabricators/preview_card_provider_fabricator.rb @@ -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 diff --git a/spec/fabricators/unavailable_domain_fabricator.rb b/spec/fabricators/unavailable_domain_fabricator.rb index cb9707020a..88e605c36e 100644 --- a/spec/fabricators/unavailable_domain_fabricator.rb +++ b/spec/fabricators/unavailable_domain_fabricator.rb @@ -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 From 4826c1da8ab2ede258ec0e5913fd7523eec7a607 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:00:15 +0200 Subject: [PATCH 7/8] Update dependency devise to v4.9.4 (#29890) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index af80af306d..3de5ab5c7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) From 20b1e55f24a87868d661fc7b033bbbbd48b1a918 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 12:30:31 +0200 Subject: [PATCH 8/8] New Crowdin Translations (automated) (#29903) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/it.json | 2 +- app/javascript/mastodon/locales/tt.json | 6 +++--- config/locales/tt.yml | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index fd12ee298b..4679d83410 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -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", diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json index 82d45205c2..9a402472d9 100644 --- a/app/javascript/mastodon/locales/tt.json +++ b/app/javascript/mastodon/locales/tt.json @@ -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": "Үзгәртү", diff --git a/config/locales/tt.yml b/config/locales/tt.yml index c1a22a4ca8..82bb18c9ae 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -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: Язылучылар