decidim-core 0.28.0 → 0.28.1

data/config/locales/sv.yml

@@ -73,9 +73,7 @@ sv:
     'true': 'Ja'
   carrierwave:
     errors:
-      file_resolution_too_large: Filupplösningen är för stor
       file_size_too_large: Filen är för stor
-      not_inside_organization: Den här filen är inte bifogad till någon organisation
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -427,8 +425,6 @@ sv:
         name: Sidfot sub hero banner
       global_menu:
         name: Global meny
-      hero:
-        name: Hjältebild
       hero_settings_form:
         background_image: Bakgrundsbild
         welcome_text: Välkomsttext
@@ -1051,6 +1047,7 @@ sv:
           headline: Aktuellt läge för %{organization}
         sub_hero:
           register: Registrera
+          register_title: Skapa ett konto
       index:
         standalone_pages: Sidor
         subheading: Navigera genom hjälpsidorna för %{name}
@@ -1432,7 +1429,6 @@ sv:
       activities: Aktiviteter
       custom: Anpassad
       flags: Flaggor
-      food-drink: Mat & Dryck
       objects: Objekt
       people-body: Personer & kropp
       recents: Nyligen använd
@@ -1474,35 +1470,57 @@ sv:
       data_consent:
         details:
           columns:
+            description: Beskrivning
             name: Namn
             service: Tjänst
             type: Typ
           items:
             _session_id:
+              description: Tillåter webbplatser att komma ihåg användare på en webbplats när de flyttar mellan webbsidor.
               service: Denna webbplats
             decidim-consent:
+              description: Lagrar information om de cookies som tillåts av användaren på denna webbplats.
               service: Denna webbplats
             pwaInstallPromptSeen:
+              description: Lagrar status om den progressiva webbapplikationen (PWA) installationsmeddelandet har redan setts av användaren.
               service: Denna webbplats
           types:
             cookie: Cookie
             local_storage: Lokal lagring
         dialog:
           accept_all: Acceptera alla
+          accept_only_essential: Acceptera endast nödvändig
+          description: Vi använder cookies på vår webbplats för att förbättra webbplatsens prestanda och innehåll. Med hjälp av cookies kan vi erbjuda en mer individuell användarupplevelse och sociala mediekanaler.
           settings: Inställningar
+          title: Information om de cookies som används på webbplatsen
         modal:
           accept_all: Acceptera alla
+          accept_only_essential: Acceptera endast nödvändig
+          analytics:
+            description: Dessa cookies används för att mäta och analysera webbplatsens publik för att förbättra webbplatsen.
+            title: Analys och statistik
+          description: Vi använder cookies för att säkerställa grundläggande funktioner på webbplatsen och för att förbättra din upplevelse online. Du kan när som helst konfigurera och acceptera användningen av cookies och ändra dina samtyckesalternativ.
           essential:
+            description: Dessa cookies möjliggör viktiga funktioner på webbplatsen och hjälper till att hålla sina användare säkrade. De sparas automatiskt i webbläsaren och kan inte inaktiveras.
             title: Nödvändigt
           marketing:
+            description: Dessa cookies samlar in information om hur du använder webbplatsen och de kan användas för att ge dig mer personlig marknadsföring på de olika webbplatser du använder.
             title: Marknadsföring
+          preferences:
+            description: Dessa cookies gör det möjligt för webbplatsen att komma ihåg de val du gjort tidigare på denna webbplats för att ge en mer personlig upplevelse för webbplatsens användare.
+            title: Preferenser
           save_settings: Spara inställningar
+          title: Cookie-inställningar
+          toggle: Växla %{consent_category}
         warning:
+          all_categories: alla cookies
+          change_settings: Ändra cookie-inställningar
           consent_required: Du måste aktivera %{categories} för att kunna se innehållet.
       edit_link:
         edit: Redigera
       footer:
         cc_by_license: Creative Commons licens
+        data_consent_settings: Cookie-inställningar
         decidim_logo: Decidim logotyp
         decidim_title: Decidim
         download_open_data: Hämta öppna datafiler
@@ -1620,6 +1638,7 @@ sv:
       option_split: Sida vid sida
       option_unescaped: Orymt
       option_unified: Sammanslagen
+      toggle: Växla vy
   views:
     pagination:
       next: Nästa

data/config/locales/tr-TR.yml

@@ -60,9 +60,6 @@ tr:
   booleans:
     'false': 'Hayır'
     'true': 'Evet'
-  carrierwave:
-    errors:
-      not_inside_organization: Dosya herhangi bir kuruluşa eklenmemiş
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -349,8 +346,6 @@ tr:
         description: Açıklama
       footer_sub_hero:
         name: Dipnot alt afişi
-      hero:
-        name: Ana resim
       hero_settings_form:
         background_image: Arka plan resmi
         welcome_text: Hoşgeldin Mesajı
@@ -630,6 +625,7 @@ tr:
         file:
           explanation: 'Dosya kılavuzu:'
           message_1: Bir resim veya bir belge olmalı.
+          message_2: Resimler için tercihen yatay resimleri kullanın, bu servis resmi kırpar.
         image:
           explanation: 'Dosya kılavuzu:'
           message_1: Tercihen herhangi bir metin içermeyen yatay bir resim.
@@ -988,6 +984,8 @@ tr:
         close_modal: Pencereyi kapat
         ok: TAMAM
         title: Onayla
+      embed:
+        title: Gömülü video içeriği
       extended_navigation_bar:
         more: Daha
         unfold: açılmak

data/config/locales/uk.yml

@@ -157,6 +157,11 @@ uk:
           ok: Гаразд
           title: Недостатньо прав через відсутність підтвердження особи
     collapsible_list:
+      hidden_elements_count:
+        one: і ще %{count}
+        few: і ще %{count}
+        many: і ще %{count}
+        other: і ще %{count}
       see_less: "(читати менше)"
     components:
       dummy:
@@ -178,8 +183,6 @@ uk:
     content_blocks:
       footer_sub_hero:
         name: Нижній колонтитул під-багатирського банера
-      hero:
-        name: Багатирський банер
       highlighted_content_banner:
         name: Банер висвітленого вмісту
       how_to_participate:
@@ -332,6 +335,10 @@ uk:
           intro: "%{sender} написав нові повідомлення у вашій бесіді. Клацніть тут, щоб переглянути їх:"
           subject: Ви отримали нові повідомлення від %{sender}
       conversations:
+        index:
+          title: Бесіди
+        show:
+          title: Бесіда з %{usernames}
         start:
           send: Надіслати
     newsletter_mailer:
@@ -387,6 +394,7 @@ uk:
       deleted: Видалений учасник
     profiles:
       show:
+        conversations: Бесіди
         followers: Ті, хто стежить
         following: 'Стежить за:'
       user:
@@ -417,6 +425,8 @@ uk:
       results_found_for_term: '%{count} Висліди пошуку: "%{term}"'
       term_input_placeholder: Шукати
     searches:
+      filters:
+        search: Шукати
       filters_small_view:
         filter: Відібрати
         filter_by: 'Відібрати за ознакою:'

data/config/locales/zh-CN.yml

@@ -56,9 +56,6 @@ zh-CN:
   booleans:
     'false': '否'
     'true': '否'
-  carrierwave:
-    errors:
-      not_inside_organization: 该文件没有附加到任何组织
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -308,8 +305,6 @@ zh-CN:
     content_blocks:
       footer_sub_hero:
         name: 页脚子英雄横幅：
-      hero:
-        name: 英雄图像
       hero_settings_form:
         background_image: 背景图像
         welcome_text: 欢迎文本

data/config/locales/zh-TW.yml

@@ -74,10 +74,7 @@ zh-TW:
     'true': '是'
   carrierwave:
     errors:
-      file_cannot_be_processed: 無法處理檔案
-      file_resolution_too_large: 檔案解析度過大
       file_size_too_large: 檔案太大。
-      not_inside_organization: 該文件未附加到任何組織
   date:
     formats:
       decidim_short: "%d/%m/%Y"
@@ -464,8 +461,6 @@ zh-TW:
         description: 說明
       footer_sub_hero:
         name: 頁尾子英雄橫幅
-      hero:
-        name: 英雄圖像
       hero_settings_form:
         background_image: 背景圖片
         welcome_text: 歡迎文字
@@ -1106,7 +1101,6 @@ zh-TW:
         token_error: 該連結已過期。
         unsubscribe: 取消訂閱
     newsletters_opt_in:
-      unathorized: 抱歉，此連結已不再可用。
       update:
         error: 儲存通訊設定時出現問題。
         success: 成功更新電子報設定.
@@ -1168,7 +1162,6 @@ zh-TW:
         success: 您的通知設定已成功更新。
     offline:
       show:
-        message: 看起來您目前處於離線狀態，請稍後再試。
         retry: 重試
     open_data:
       not_available_yet: 開放數據檔案尚未可用，請稍後再試。
@@ -1192,11 +1185,13 @@ zh-TW:
           register: 註冊
         hero:
           participate: 參與
+          participate_title: 參與平台的流程
           welcome: 歡迎來到 %{organization}！
         statistics:
           headline: '%{organization} 的目前狀態'
         sub_hero:
           register: 註冊
+          register_title: 註冊以創建帳戶
       index:
         standalone_pages: 頁
         subheading: 瀏覽 %{name} 的幫助頁面
@@ -1591,16 +1586,13 @@ zh-TW:
     button: 新增Emoji
     categories:
       activities: 活躍狀態
-      animals-nature: 動物與自然
       custom: 自訂
       flags: 旗幟
-      food-drink: 食物 & 飲料
       objects: 目標
       people-body: 人與身體
       recents: 最近使用的
       smileys-emotion: 表情符號和情感
       symbols: 符號
-      travel-places: 旅遊與地點
     error:
       load: 無法載入表情符號
     recents:

data/decidim-core.gemspec

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/core/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name = "decidim-core"
+  s.version = Decidim::Core.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.homepage = "https://decidim.org"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
+    "documentation_uri" => "https://docs.decidim.org/",
+    "funding_uri" => "https://opencollective.com/decidim",
+    "homepage_uri" => "https://decidim.org",
+    "source_code_uri" => "https://github.com/decidim/decidim"
+  }
+  s.summary = "The core of the Decidim framework."
+  s.description = "Adds core features so other engines can hook into the framework."
+  s.license = "AGPL-3.0"
+  s.required_ruby_version = "~> 3.1.0"
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "active_link_to", "~> 1.0"
+  s.add_dependency "acts_as_list", "~> 1.0"
+  s.add_dependency "batch-loader", "~> 1.2"
+  s.add_dependency "browser", "~> 2.7"
+  s.add_dependency "carrierwave", "~> 2.2.5", ">= 2.2.5"
+  s.add_dependency "cells-erb", "~> 0.1.0"
+  s.add_dependency "cells-rails", "~> 0.1.3"
+  s.add_dependency "charlock_holmes", "~> 0.7"
+  s.add_dependency "date_validator", "~> 0.12.0"
+  s.add_dependency "devise", "~> 4.7"
+  s.add_dependency "devise-i18n", "~> 1.2", "< 1.11.1"
+  s.add_dependency "diffy", "~> 3.3"
+  s.add_dependency "doorkeeper", "~> 5.6", ">= 5.6.6"
+  s.add_dependency "doorkeeper-i18n", "~> 4.0"
+  s.add_dependency "file_validators", "~> 3.0"
+  s.add_dependency "fog-local", "~> 0.6"
+  s.add_dependency "foundation_rails_helper", "~> 4.0"
+  s.add_dependency "geocoder", "~> 1.8"
+  s.add_dependency "hashdiff", ">= 0.4.0", "< 2.0.0"
+  s.add_dependency "invisible_captcha", "~> 0.12"
+  s.add_dependency "kaminari", "~> 1.2", ">= 1.2.1"
+  s.add_dependency "loofah", "~> 2.19", ">= 2.19.1"
+  s.add_dependency "mime-types", ">= 1.16", "< 4.0"
+  s.add_dependency "mini_magick", "~> 4.9"
+  s.add_dependency "net-smtp", "~> 0.3.1"
+  s.add_dependency "omniauth", "~> 2.0"
+  s.add_dependency "omniauth-facebook", "~> 5.0"
+  s.add_dependency "omniauth-google-oauth2", "~> 1.0"
+  s.add_dependency "omniauth-rails_csrf_protection", "~> 1.0"
+  s.add_dependency "omniauth-twitter", "~> 1.4"
+  s.add_dependency "paper_trail", "~> 12.0"
+  s.add_dependency "pg", "~> 1.4.0", "< 2"
+  s.add_dependency "pg_search", "~> 2.2"
+  s.add_dependency "premailer-rails", "~> 1.10"
+  # We need psych 4+ in order to use the `aliases: true` option,
+  # see https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias
+  # Also note that we need Rails 6.1.5+,
+  # see https://gist.github.com/yahonda/2776d8d7b6ea7045359f38c10449937b
+  s.add_dependency "psych", "~> 4.0"
+  s.add_dependency "rack", "~> 2.2", ">= 2.2.6.4"
+  s.add_dependency "rack-attack", "~> 6.0"
+  s.add_dependency "rails", "~> 6.1.7", ">=6.1.7.4"
+  s.add_dependency "rails-i18n", "~> 6.0"
+  s.add_dependency "ransack", "~> 3.2.1"
+  s.add_dependency "redis", "~> 4.1"
+  s.add_dependency "request_store", "~> 1.5.0"
+  s.add_dependency "rubyXL", "~> 3.4"
+  s.add_dependency "rubyzip", "~> 2.0"
+  s.add_dependency "seven_zip_ruby", "~> 1.3"
+  s.add_dependency "shakapacker", "~> 7.1.0"
+  s.add_dependency "valid_email2", "~> 4.0"
+  s.add_dependency "web-push", "~> 3.0"
+  s.add_dependency "wisper", "~> 2.0"
+
+  s.add_development_dependency "decidim-api", Decidim::Core.version
+  s.add_development_dependency "decidim-dev", Decidim::Core.version
+end

data/lib/decidim/asset_router/storage.rb

@@ -22,6 +22,8 @@ module Decidim
       def url(**options)
         if asset.is_a? ActiveStorage::Attached
           routes.rails_blob_url(asset.blob, **default_options.merge(options))
+        elsif asset.is_a? ActiveStorage::Blob
+          routes.rails_blob_url(asset, **default_options.merge(options))
         else
           representation_url(**options)
         end

data/lib/decidim/attribute_encryptor.rb

@@ -19,10 +19,12 @@ module Decidim
     end
 
     def self.cryptor
-      key = ActiveSupport::KeyGenerator.new("attribute").generate_key(
-        Rails.application.secrets.secret_key_base, ActiveSupport::MessageEncryptor.key_len
-      )
-      ActiveSupport::MessageEncryptor.new(key)
+      @cryptor ||= begin
+        key = ActiveSupport::KeyGenerator.new("attribute").generate_key(
+          Rails.application.secrets.secret_key_base, ActiveSupport::MessageEncryptor.key_len
+        )
+        ActiveSupport::MessageEncryptor.new(key)
+      end
     end
   end
 end

data/lib/decidim/attributes/time_with_zone.rb

@@ -19,7 +19,7 @@ module Decidim
         fallback = super
         return fallback unless fallback.is_a?(Time)
 
-        ActiveSupport::TimeWithZone.new(fallback, Time.zone)
+        Time.zone.parse(fallback.strftime("%F %T"))
       end
     end
   end

data/lib/decidim/core/engine.rb

@@ -379,16 +379,17 @@ module Decidim
 
       initializer "decidim_core.menu" do
         Decidim::Core::Menu.register_menu!
-      end
-
-      initializer "decidim_core.user_menu" do
         Decidim::Core::Menu.register_user_menu!
       end
 
       initializer "decidim_core.notifications" do
-        config.to_prepare do
-          Decidim::EventsManager.subscribe(/^decidim\.events\./) do |event_name, data|
-            EventPublisherJob.perform_later(event_name, data)
+        if Rails.autoloaders.zeitwerk_enabled?
+          config.after_initialize do
+            Decidim::EventsManager.subscribe_events!
+          end
+        else
+          config.to_prepare do
+            Decidim::EventsManager.subscribe_events!
           end
         end
       end

data/lib/decidim/core/seeds.rb

@@ -25,11 +25,11 @@ module Decidim
         smtp_email = ENV.fetch("SMTP_FROM_EMAIL", ::Faker::Internet.email)
 
         primary_color, secondary_color, tertiary_color = [
-          ["#e02d2d", "#155abf", "#ebc34b"],
-          ["#4caf50", "#a0309e", "#a8753e"],
-          ["#e91e63", "#1ee9a5", "#e9b61e"],
-          ["#009688", "#d12c26", "#b4a110"],
-          ["#ff9800", "#00bcd4", "#ea0094"]
+          ["#bf4044", "#09780e", "#3584e4"],
+          ["#09780e", "#4448bb", "#da565b"],
+          ["#bf4086", "#487511", "#5384ac"],
+          ["#086263", "#811380", "#abac53"],
+          ["#5340bf", "#a82c2c", "#40bf53"]
         ].sample
 
         colors = {
@@ -77,34 +77,12 @@ module Decidim
         )
 
         if organization.top_scopes.none?
-          province = Decidim::ScopeType.create!(
-            name: Decidim::Faker::Localized.literal("province"),
-            plural: Decidim::Faker::Localized.literal("provinces"),
-            organization:
-          )
-
-          municipality = Decidim::ScopeType.create!(
-            name: Decidim::Faker::Localized.literal("municipality"),
-            plural: Decidim::Faker::Localized.literal("municipalities"),
-            organization:
-          )
-
-          3.times do |time|
-            parent = Decidim::Scope.create!(
-              name: Decidim::Faker::Localized.literal(::Faker::Address.unique.state),
-              code: "#{::Faker::Address.country_code}_#{time}",
-              scope_type: province,
-              organization:
-            )
-
+          province = create_scope_type!(name: "province", plural: "provinces")
+          municipality = create_scope_type!(name: "municipality", plural: "municipalities")
+          3.times do
+            parent = create_scope!(scope_type: province, parent: nil)
             5.times do
-              Decidim::Scope.create!(
-                name: Decidim::Faker::Localized.literal(::Faker::Address.unique.city),
-                code: "#{parent.code}-#{::Faker::Address.unique.state_abbr}",
-                scope_type: municipality,
-                organization:,
-                parent:
-              )
+              create_scope!(scope_type: municipality, parent:)
             end
           end
         end
@@ -242,6 +220,32 @@ module Decidim
         hero_content_block.save!
       end
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Rails/Output
+
+      private
+
+      def create_scope_type!(name:, plural:)
+        Decidim::ScopeType.create!(
+          name: Decidim::Faker::Localized.literal(name),
+          plural: Decidim::Faker::Localized.literal(plural),
+          organization:
+        )
+      end
+
+      def create_scope!(scope_type:, parent:)
+        n = rand(99_999)
+        code = parent.nil? ? "#{::Faker::Address.country_code}_#{n}" : "#{parent.code}-#{::Faker::Address.postcode}_#{n}"
+        name = [::Faker::Address.state, ::Faker::Address.city].sample
+
+        Decidim::Scope.create!(
+          name: Decidim::Faker::Localized.literal(name),
+          code:,
+          scope_type:,
+          organization:,
+          parent:
+        )
+      rescue ActiveRecord::RecordInvalid
+        retry
+      end
     end
   end
 end