decidim-core 0.28.1 → 0.28.2

data/config/locales/sv.yml

@@ -283,7 +283,6 @@ sv:
           '1': Skapa ändringsförslag
           '2': Jämför ändringsförslag
           '3': Slutför ändringsförslaget
-          '4': Publicera ändringsförslaget
     anonymous_user: Anonym
     application:
       document:
@@ -488,6 +487,7 @@ sv:
       registrations:
         new:
           already_have_an_account?: Har du redan ett konto?
+          log_in: Logga in
           newsletter: Få enstaka nyhetsbrev med relevant information
           newsletter_title: Kontakttillstånd
           sign_up: Registrera dig
@@ -756,6 +756,7 @@ sv:
           filename: Filnamn
           remove: Ta bort
           replace: Ersätt
+          save: Spara
           title: Titel
           title_required: Titel krävs!
           uploaded: Uppladdad
@@ -1369,10 +1370,14 @@ sv:
       signed_up_but_unconfirmed: Ett meddelande med en bekräftelselänk har skickats till din e-postadress. Aktivera kontot genom att följa länken.
       update_needs_confirmation: Kontot har uppdaterats, men vi måste verifiera din nya e-postadress. Kontrollera din e-post och följ länken som bekräftar din nya e-postadress.
       updated: Ditt konto har uppdaterats.
+    sessions:
+      new:
+        log_in: Logga in
     shared:
       links:
         back: Tillbaka
         forgot_your_password: Glömt ditt lösenord?
+        log_in: Logga in
         sign_up: Registrera dig
       minimum_password_length:
         one: "(minst %{count} tecken)"
@@ -1524,10 +1529,12 @@ sv:
         decidim_logo: Decidim logotyp
         decidim_title: Decidim
         download_open_data: Hämta öppna datafiler
+        log_in: Logga in
         made_with_open_source: Webbplats skapad med <a target="_blank" href="https://github.com/decidim/decidim">fri programvara</a>.
         resources: Resurser
         sign_up: Registrera
       header:
+        log_in: Logga in
         main_menu: Huvudmeny
         user_menu: Användarmeny
       impersonation_warning:

data/config/locales/tr-TR.yml

@@ -71,6 +71,7 @@ tr:
     accessibility:
       external_link: Dış bağlantı
       logo: "%{organization} resmi logosu"
+      opens_in_new_tab: Yeni Seçmede Aç
       skip_button: Ana içeriğe geç
     account:
       delete:
@@ -416,6 +417,7 @@ tr:
           hide_password: Şifrenizi Gizleyin
           show_password: Şifreyi Göster
           shown_password: Şifreniz Gösteriliyor
+        placeholder_email: selam@example.org
     doorkeeper:
       authorizations:
         new:
@@ -746,6 +748,7 @@ tr:
           admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
           greeting: Merhaba, %{recipient}!
           intro: "%{manager}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: "%{manager}, %{group} olarak yeni bir görüşme başlattı"
         comanagers_new_message:
           admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
@@ -755,20 +758,24 @@ tr:
         new_conversation:
           greeting: Merhaba %{recipient}!
           intro: "%{sender} sizinle yeni bir sohbet başlattı. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: "%{sender} sizinle bir konuşma başlattı"
         new_group_conversation:
           admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
           greeting: Merhaba, %{recipient}!
           intro: "%{sender}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: "%{sender}, %{group} olarak yeni bir görüşme başlattı"
         new_group_message:
           admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
           greeting: Merhaba, %{recipient}!
           intro: "%{sender}, %{group} grubuyla bir görüşmede yeni mesajlar yayınladı. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: "%{group}, %{sender} adlı kişiden yeni mesajlar aldı"
         new_message:
           greeting: Merhaba %{recipient}!
           intro: "%{sender}, konuşmanıza yeni mesajlar gönderdi. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: '%{sender}, size yeni mesaj gönderdi'
       conversations:
         add_conversation_users:
@@ -844,6 +851,8 @@ tr:
         subject: '%{organization_name} ile ilgili bilgileri almaya devam etmek istiyor musunuz?'
     notifications:
       no_notifications: Henüz bildirim yok.
+      show:
+        moderated: İçerik Denetlendi
     notifications_settings:
       show:
         direct_messages: Herkesten doğrudan mesaj alın
@@ -1019,6 +1028,7 @@ tr:
         filters:
           areas: alanlar
           select_an_area: Bir bölge seçin
+      progress: "Süreç\nİlerleme"
       reference:
         reference: 'Referans: %{reference}'
       represent_user_group:
@@ -1182,13 +1192,13 @@ tr:
     sessions:
       already_signed_out: Başarıyla Çıkış Yapıldı
       new:
-        log_in: Giriş Yapın
+        log_in: "Giriş \nGiriş Yapın "
       signed_out:
     shared:
       links:
         back: Geri
         forgot_your_password: Parolanızı mı unuttunuz?
-        log_in: Giriş Yapın
+        log_in: "Giriş \nGiriş Yapın "
         log_in_with_provider: '%{provider} ile giriş yapın'
         sign_up: kaydol
       minimum_password_length:
@@ -1229,6 +1239,8 @@ tr:
     timestamp_error_message: Üzgünüm, bu çok hızlıydı! Lütfen yeniden gönderin.
   layouts:
     decidim:
+      announcements:
+        view_less: Daha Az Göster
       data_consent:
         details:
           columns:
@@ -1239,11 +1251,11 @@ tr:
         cc_by_license: Kar Amaçsız Lisanslama (Creative Commons License)
         decidim_logo: Decidim Logo
         download_open_data: Açık Veri dosyalarını indir
-        log_in: Giriş Yapın
+        log_in: "Giriş \nGiriş Yapın "
         made_with_open_source: Web sitesi <a target="_blank" href="https://github.com/decidim/decidim">ücretsiz yazılımla yapılmıştır</a>.
         sign_up: Kaydol
       header:
-        log_in: Giriş Yapın
+        log_in: "Giriş \nGiriş Yapın "
       impersonation_warning:
         close_session: Oturumu kapat
         description_html: Kullanıcının kimliğine bürünüyorsunuz <b>%{user_name}</b>.
@@ -1253,6 +1265,9 @@ tr:
       notifications_dashboard:
         mark_all_as_read: Tümünü okundu olarak işaretle
         mark_as_read: Okundu olarak işaretle
+      shared:
+        layout_item:
+          prev: Önceki
       social_media_links:
         facebook: "Facebook'ta %{organization}"
         github: "GitHub'da %{organization}"
@@ -1332,6 +1347,7 @@ tr:
       long_dashed: "%Y-%m-%d %H:%M:%S"
       short: "%d/%m/%Y %H:%M"
       time_of_day: "%H:%M"
+      tooltip: "%d-%m-%Y %H:%M %p %Z (GMT %:z)\n%Gün-%Ay-%Yıl %Saat:%Dakika %p %Zone (GMT %:z)"
   versions:
     directions:
       left: Silme
@@ -1343,6 +1359,7 @@ tr:
       option_split: Yan yana
       option_unescaped: Yakalandı
       option_unified: Birleşik
+      toggle: Görünümü değiştir
   views:
     pagination:
       next_title: Sonraki sayfaya git

data/config/locales/uk.yml

@@ -201,6 +201,7 @@ uk:
       registrations:
         new:
           already_have_an_account?: Вже маєте обліковий запис?
+          log_in: Увійти
           newsletter: Отримувати іноді розсилання зі свіжими новинами
           newsletter_title: Дозвіл на зв'язок
           sign_up: Зареєструватися
@@ -476,6 +477,12 @@ uk:
     passwords:
       edit:
         new_password: Пароль
+    sessions:
+      new:
+        log_in: Увійти
+    shared:
+      links:
+        log_in: Увійти
   doorkeeper:
     scopes:
       public: Оприлюднені відомості про вас.
@@ -493,8 +500,11 @@ uk:
       edit_link:
         edit: Редагувати
       footer:
+        log_in: Увійти
         made_with_open_source: Цей веб-сайт створено за допомогою <a target="_blank" href="https://github.com/decidim/decidim">безкоштовного програмного забезпечення</a>.
         sign_up: Зареєструватися
+      header:
+        log_in: Увійти
       impersonation_warning:
         close_session: Завершити сеанс
         description_html: Ви виступаєте в ролі учасника <b>%{user_name}</b>.

data/config/locales/zh-CN.yml

@@ -192,7 +192,6 @@ zh-CN:
           '1': 创建您的修改
           '2': 比较您的修改
           '3': 完成您的修改
-          '4': 发布您的修改
     anonymous_user: 匿名的
     application:
       document:

data/config/locales/zh-TW.yml

@@ -315,7 +315,6 @@ zh-TW:
           '1': 創建您的修正案
           '2': 比較您的修正案
           '3': 完成您的修正案
-          '4': 發佈您的修正案
     anonymous_user: 匿名
     application:
       document:
@@ -514,6 +513,7 @@ zh-TW:
       registrations:
         new:
           already_have_an_account?: 已經有帳號了嗎？
+          log_in: 登入
           newsletter: 偶爾收到包含相關信息的時事通訊。
           newsletter_title: 聯絡人權限
           sign_up: 註冊登記
@@ -819,6 +819,7 @@ zh-TW:
           filename: 檔案名稱
           remove: 移除
           replace: 替換
+          save: 儲存
           title: 標題
           title_required: 標題為必填欄位！
           uploaded: 已上傳
@@ -1565,12 +1566,16 @@ zh-TW:
       signed_up_but_unconfirmed: 確認信件已送至您的 Email 信箱，請點擊信件內連結以啓動您的帳號。
       update_needs_confirmation: 您已經成功的更新帳號資訊，但我們仍需確認您的電子信箱，請至新信箱收信並點擊連結以確認您的新電子郵件帳號。
       updated: 您的帳號已成功升級。
+    sessions:
+      new:
+        log_in: 登入
     shared:
       links:
         back: 返回
         didn_t_receive_confirmation_instructions: 沒有收到確認的說明嗎？
         didn_t_receive_unlock_instructions: 沒有收到解鎖說明？
         forgot_your_password: 忘記密碼了嗎？
+        log_in: 登入
         sign_up: 註冊登記
       minimum_password_length:
         other: "One\n(最少%{count} 個字符)\n\nOther\n(最少%{count} 個字符)"
@@ -1695,9 +1700,11 @@ zh-TW:
         data_consent_settings: Cookie 設定
         decidim_logo: Decidim 商標
         download_open_data: 下載開放數據檔案
+        log_in: 登入
         made_with_open_source: 使用<a target="_blank" href="https://github.com/decidim/decidim">自由軟體</a>建立的網站。
         sign_up: 註冊
       header:
+        log_in: 登入
         main_menu: 主選單
         user_menu: 使用者選單
       impersonation_warning:

data/lib/decidim/core/seeds.rb

@@ -209,7 +209,7 @@ module Decidim
 
         oauth_application.organization_logo.attach(io: File.open(File.join(seeds_root, "homepage_image.jpg")), filename: "organization_logo.jpg", content_type: "image/jpeg")
 
-        Decidim::System::CreateDefaultContentBlocks.call(organization)
+        Decidim::ContentBlocksCreator.new(organization).create_default!
 
         hero_content_block = Decidim::ContentBlock.find_by(organization:, manifest_name: :hero, scope_name: :homepage)
         hero_content_block.images_container.background_image = create_blob!(seeds_file: "homepage_image.jpg", filename: "homepage_image.jpg", content_type: "image/jpeg")

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -54,7 +54,7 @@ shared_examples "comments" do
       expect(page).to have_css(".comment", minimum: 1)
 
       within("#accordion-#{single_comment.id}") do
-        expect(page).to have_content "Hide replies"
+        expect(page).to have_content "Hide reply"
       end
     end
 
@@ -70,7 +70,7 @@ shared_examples "comments" do
         expect(page).to have_css(".comment", minimum: 1)
 
         within("#accordion-#{single_comment.id}") do
-          expect(page).not_to have_content "Hide replies"
+          expect(page).not_to have_content "Hide reply"
         end
       end
     end
@@ -117,7 +117,8 @@ shared_examples "comments" do
   context "when not authenticated" do
     it "does not show form to add comments to user" do
       visit resource_path
-      expect(page).not_to have_selector(".add-comment form")
+      expect(page).not_to have_css(".add-comment form")
+      expect(page).to have_css(".comment-thread")
     end
   end
 
@@ -131,6 +132,32 @@ shared_examples "comments" do
       expect(page).to have_selector(".add-comment form")
     end
 
+    context "when user is not authorized to comment" do
+      let(:permissions) do
+        {
+          comment: {
+            authorization_handlers: {
+              "dummy_authorization_handler" => { "options" => {} }
+            }
+          }
+        }
+      end
+
+      before do
+        organization.available_authorizations = ["dummy_authorization_handler"]
+        organization.save!
+        commentable.create_resource_permission(permissions:)
+        allow(commentable).to receive(:user_allowed_to_comment?).with(user).and_return(false)
+        allow(commentable).to receive(:user_authorized_to_comment?).with(user).and_return(true)
+      end
+
+      it "shows a message indicating that comments are restricted" do
+        visit resource_path
+        expect(page).not_to have_content("Comments are disabled at this time")
+        expect(page).to have_content("You need to be verified to comment at this moment")
+      end
+    end
+
     describe "when using emojis" do
       before do
         within_language_menu do
@@ -520,7 +547,7 @@ shared_examples "comments" do
         it "displays the hide button" do
           visit current_path
           within "#comment_#{thread.id}" do
-            expect(page).to have_content("Hide replies")
+            expect(page).to have_content("Hide reply")
             expect(page).to have_content(new_reply_body)
           end
         end
@@ -528,7 +555,7 @@ shared_examples "comments" do
         it "displays the show button" do
           visit current_path
           within "#comment_#{thread.id}" do
-            click_button "Hide replies"
+            click_button "Hide reply"
             expect(page).to have_content("Show reply")
             expect(page).not_to have_content(new_reply_body)
           end
@@ -540,7 +567,7 @@ shared_examples "comments" do
           it "displays the show button" do
             visit current_path
             within "#comment_#{thread.id}" do
-              click_button "Hide replies"
+              click_button "Hide 3 replies"
               expect(page).to have_content("Show 3 replies")
               expect(page).not_to have_content(new_reply_body)
             end
@@ -969,3 +996,46 @@ shared_examples "comments" do
     end
   end
 end
+
+shared_examples "comments blocked" do
+  context "when not authenticated" do
+    context "when comments are blocked" do
+      let(:active_step_id) { component.participatory_space.active_step.id }
+
+      before do
+        component.update!(step_settings: { active_step_id => { comments_blocked: true } })
+      end
+
+      it "shows a message indicating that comments are disabled" do
+        visit resource_path
+        expect(page).to have_content("Comments are disabled at this time")
+        expect(page).not_to have_content("You need to be verified to comment at this moment")
+      end
+    end
+  end
+
+  context "when authenticated" do
+    let!(:organization) { create(:organization) }
+    let!(:user) { create(:user, :confirmed, organization:) }
+    let!(:comments) { create_list(:comment, 3, commentable:) }
+
+    before do
+      login_as user, scope: :user
+      visit resource_path
+    end
+
+    context "when comments are blocked" do
+      let(:active_step_id) { component.participatory_space.active_step.id }
+
+      before do
+        component.update!(step_settings: { active_step_id => { comments_blocked: true } })
+      end
+
+      it "shows a message indicating that comments are disabled" do
+        visit resource_path
+        expect(page).to have_content("Comments are disabled at this time")
+        expect(page).not_to have_content("You need to be verified to comment at this moment")
+      end
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/logo_email.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 shared_examples "email with logo" do
   context "when organization has a logo" do
     let(:organization_logo) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
-    let(:organization) { create(:organization, logo: organization_logo) }
+    let(:organization) { create(:organization, name: "O'Higgins", logo: organization_logo) }
     let(:mail) { described_class.event_received(event, event_class_name, resource, user, :follower, extra) }
     let(:logo_path) { Rails.application.routes.url_helpers.rails_representation_path(organization.logo.variant(resize_to_fit: [600, 160]), only_path: true) }
 
@@ -14,7 +14,7 @@ shared_examples "email with logo" do
     end
 
     it "includes organization logo with full link" do
-      expect(mail.body).to include("alt=\"#{organization.name}\"")
+      expect(mail.body).to include("alt=\"#{decidim_escape_translated(organization.name)}\"")
       expect(mail.body).to match(%r{https{0,1}://#{organization.host}:#{Capybara.server_port}#{logo_path}})
     end
   end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.28.1"
+      "0.28.2"
     end
   end
 end

data/lib/decidim/core.rb

@@ -191,8 +191,13 @@ module Decidim
       resource_type.constantize.find_each do |resource|
         # exclude the users that already endorsed
         users = resource.endorsements.map(&:author)
-        rand(50).times do
+        remaining_count = Decidim::User.count - users.count
+        next if remaining_count < 1
+
+        rand([50, remaining_count].min).times do
           user = (Decidim::User.all - users).sample
+          next unless user
+
           Decidim::Endorsement.create!(resource:, author: user)
           users << user
         end

data/lib/decidim/events/base_event.rb

@@ -111,6 +111,10 @@ module Decidim
         Decidim::ContentProcessor.render_without_format(title, links: false).html_safe
       end
 
+      def hidden_resource?
+        resource.respond_to?(:hidden?) && resource.hidden?
+      end
+
       private
 
       def component

data/lib/decidim/organization_settings.rb

@@ -129,12 +129,20 @@ module Decidim
               )
             },
             "maximum_file_size" => {
-              "default" => 10.0,
-              "avatar" => 5.0
+              "default" => default_maximum_attachment_size,
+              "avatar" => default_maximum_avatar_size
             }
           }
         }
       end
+
+      def default_maximum_attachment_size
+        (Rails.application.secrets.decidim[:maximum_attachment_size].presence || 10).to_f
+      end
+
+      def default_maximum_avatar_size
+        (Rails.application.secrets.decidim[:maximum_avatar_size].presence || 5).to_f
+      end
     end
 
     def initialize(organization)

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -764,28 +764,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1023,6 +1023,7 @@ files:
 - app/cells/decidim/newsletter_templates/image_text_cta_cell.rb
 - app/cells/decidim/newsletter_templates/image_text_cta_settings_form/show.erb
 - app/cells/decidim/newsletter_templates/image_text_cta_settings_form_cell.rb
+- app/cells/decidim/notification/moderated.erb
 - app/cells/decidim/notification/show.erb
 - app/cells/decidim/notification_cell.rb
 - app/cells/decidim/notifications/show.erb
@@ -1538,6 +1539,7 @@ files:
 - app/packs/images/decidim/vendor/social-share-button/x.svg
 - app/packs/images/decidim/vendor/social-share-button/xing.svg
 - app/packs/src/decidim/a11y.js
+- app/packs/src/decidim/abide_form_validator_fixer.js
 - app/packs/src/decidim/account_form.js
 - app/packs/src/decidim/append_elements.js
 - app/packs/src/decidim/append_redirect_url_to_modals.js
@@ -2868,7 +2870,7 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -2883,8 +2885,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: The core of the Decidim framework.
 test_files: []