decidim-initiatives 0.29.2 → 0.30.0.rc2

data/config/locales/sv.yml

@@ -92,7 +92,7 @@ sv:
               accepted: Tillräckligt många underskrifter
               created: Skapad
               discarded: Avvisad
-              published: Publicerad
+              open: Öppna
               rejected: För få underskrifter
               validating: Teknisk validering
           type_id_eq:
@@ -101,7 +101,7 @@ sv:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Sök %{collection} med titel, beskrivning, ID eller författarnamn.
       initiatives_settings:
         update:
-          error: Ett fel har inträffat.
+          error: Det gick inte att uppdatera inställningarna för initiativ.
           success: Initiativets inställningar har uppdaterats.
       menu:
         attachments: Bilagor
@@ -146,9 +146,8 @@ sv:
             initiative_start_date: Startdatum
             initiative_title: Initiativets titel
             name_and_surname: Namn och efternamn
+            nickname: Användarnamn
             postal_code: Postnummer
-            scope: Indelning
-            time_and_date: Tid och datum
             timestamp: Tidsstämpel
       titles:
         initiatives: Initiativ
@@ -191,8 +190,8 @@ sv:
       badges:
         initiatives:
           conditions:
-            - Gå till deltagarutrymmet för initiativ
-            - Följ stegen för att skapa ett nytt initiativ
+          - Gå till deltagarutrymmet för initiativ
+          - Följ stegen för att skapa ett nytt initiativ
           description: Detta märke beviljas när du startar nya initiativ och samarbetar med andra för att genomföra dem.
           description_another: Användaren har publicerat %{score} initiativ.
           description_own: Du har publicerat %{score} initiativ.
@@ -266,7 +265,7 @@ sv:
             new: Ny
             photos: Foton
           update:
-            error: Ett fel har inträffat.
+            error: Det gick inte att uppdatera initiativet.
             success: Initiativet har uppdaterats.
         initiatives_settings:
           edit:
@@ -280,7 +279,7 @@ sv:
             title: Inställningar för initiativ
         initiatives_type_scopes:
           create:
-            error: Ett fel har inträffat.
+            error: Det gick inte att skapa ett nytt utrymme för initiativet.
             success: En ny indelning har skapats för initiativtypen.
           destroy:
             success: Indelningen har tagit borts.
@@ -291,11 +290,11 @@ sv:
             create: Skapa
             title: Skapa indelning till initiativtyp
           update:
-            error: Ett fel har inträffat.
+            error: Det gick inte att uppdatera indelningen.
             success: Indelningen har uppdaterats.
         initiatives_types:
           create:
-            error: Ett fel har inträffat.
+            error: Det gick inte att skapa initiativtypen.
             success: En ny initiativtyp har skapats. Du måste ange minst ett utrymme för denna initiativtyp för att den ska användas.
           destroy:
             success: Initiativtypen har tagits bort.
@@ -312,7 +311,7 @@ sv:
             create: Skapa
             title: Ny initiativtyp
           update:
-            error: Ett fel har inträffat.
+            error: Det gick inte att skapa initiativtypen.
             success: Initiativtypen har uppdaterats.
       admin_log:
         initiative:
@@ -330,7 +329,7 @@ sv:
         accepted: Tillräckligt många underskrifter
         created: Skapad
         discarded: Bortagna
-        published: Publicerade
+        open: Öppna
         rejected: För få underskrifter
         validating: Teknisk validering
       application_helper:
@@ -428,10 +427,7 @@ sv:
           email_subject: "%{applicant_nickname} vill gå med i ditt initiativ"
           notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> ansökte om att gå med i kampanjgruppen för ditt initiativ <a href="%{resource_url}">%{resource_title}</a>. För att acceptera eller avvisa klickar du <a href="%{resource_url}/edit">här</a>.
       form:
-        add_documents: Lägg till dokument
         add_image: Lägg till bild
-        attachment_legend: "(Valfritt) Lägg till en bilaga"
-        edit_documents: Redigera dokument
         edit_image: Redigera bild
         image_legend: "(Valfritt) Lägg till en bild"
       index:
@@ -520,9 +516,7 @@ sv:
           phone_number: Telefonnummer
           place_date: Plats, datum
           postal_code: Postnummer
-          print: Skriv ut
           province: Region/Land
-          section: 'Om det begärs av organisationen, skriv ut och fyll i detta formulär för att skicka där det anges:'
           signature: Underskrift
         result:
           answer_title: Initiativet har besvarats.
@@ -544,7 +538,6 @@ sv:
           other: " underskrifter"
         vote_cabin:
           already_voted: Redan undertecknad
-          verification_required: Verifiera ditt konto för att skriva under initiativet
           vote: Signera
           votes_blocked: Underskrifter är avaktiverade
         votes_count:
@@ -579,7 +572,7 @@ sv:
           accepted: Tillräckligt många underskrifter
           created: Skapad
           discarded: Bortagen
-          published: Publicerad
+          open: Öppna
           rejected: För få underskrifter
           validating: Teknisk validering
       states:
@@ -587,7 +580,7 @@ sv:
         expired: Utgångna
       unavailable_scope: Ej tillgänglig indelning
       update:
-        error: Ett fel har inträffat.
+        error: Det gick inte att uppdatera initiativet.
         success: Initiativet har uppdaterats.
     menu:
       initiatives: Initiativ
@@ -597,7 +590,6 @@ sv:
           comment: Kommentera
       initiatives_type:
         actions:
-          create: Skapa
           title: Åtgärder
           vote: Underteckna
   layouts:

data/config/locales/tr-TR.yml

@@ -75,7 +75,6 @@ tr:
               accepted: Yeterince imza
               created: Oluşturuldu
               discarded: Yok sayıldı
-              published: Yayınlandı
               rejected: Yeterince imza yok
               validating: Teknik doğrulama
           type_id_eq:
@@ -117,8 +116,6 @@ tr:
             initiative_title: Girişim başlığı
             name_and_surname: Ad ve soyadı
             postal_code: Posta kodu
-            scope: Kapsam
-            time_and_date: Saat ve tarih
             timestamp: Zaman Damgası
       titles:
         initiatives: Girişimler
@@ -158,8 +155,8 @@ tr:
       badges:
         initiatives:
           conditions:
-            - Intiatives'in katılım alanına git
-            - Yeni bir girişim oluşturmak için adımları izleyin
+          - Intiatives'in katılım alanına git
+          - Yeni bir girişim oluşturmak için adımları izleyin
           description: Bu rozet, yeni girişimler başlattığınızda, bunları gerçekleştirmek için başkalarıyla ortaklık kurduğunuzda verilir.
           description_another: Bu katılımcı, yayınlanan %{score} girişimi aldı.
           name: Yayınlanmış girişimler
@@ -247,7 +244,6 @@ tr:
         accepted: Yeterince imza
         created: Oluşturuldu
         discarded: Yok sayıldı
-        published: Yayınlandı
         rejected: Yeterince imza yok
         validating: Teknik doğrulama
       application_helper:
@@ -394,9 +390,7 @@ tr:
           phone_number: Telefon numarası
           place_date: Yer, Tarih
           postal_code: Posta Kodu
-          print: baskı
           province: İlçe / İl
-          section: 'Kuruluş tarafından istenirse, lütfen belirtilen yerlerde göndermek için bu formu yazdırın ve doldurun:'
           signature: İmza
         result:
           initiative_rejected_reason: Bu girişim, imza eksikliği nedeniyle reddedildi.
@@ -411,7 +405,6 @@ tr:
           other: " imzalar"
         vote_cabin:
           already_voted: Zaten imzalanmış
-          verification_required: Girişimi imzalamak için hesabınızı doğrulayın
           vote: İmza
           votes_blocked: İmzalama devre dışı
         votes_count:
@@ -439,7 +432,6 @@ tr:
           accepted: Yeterince imza
           created: Oluşturuldu
           discarded: Yok sayıldı
-          published: Yayınlandı
           rejected: Yeterince imza yok
           validating: Teknik doğrulama
       states:
@@ -451,7 +443,6 @@ tr:
     resources:
       initiatives_type:
         actions:
-          create: Oluştur
           title: Eylemler
           vote: İmza
   layouts:

data/config/locales/uk.yml

@@ -62,9 +62,6 @@ uk:
             created_at: 'Створено:'
             title: Різновиди починів
           name: Різновид почину
-        initiatives_votes:
-          fields:
-            scope: Обсяг
       titles:
         initiatives: Почини
         initiatives_types: Різновиди починів
@@ -132,7 +129,6 @@ uk:
       admin_states:
         created: Створені
         discarded: Відкинуті
-        published: Оприлюднено
         validating: Технічна перевірка
       application_helper:
         filter_state_values:
@@ -210,7 +206,6 @@ uk:
           recent: Найновіші
         print:
           city: Місто
-          print: Друк
         result:
           initiative_rejected_reason: Цей почин був відхилений через недостатню підтримку.
         signatures_count:
@@ -244,10 +239,6 @@ uk:
         expired: Строк дії яких закінчився
     menu:
       initiatives: Почини
-    resources:
-      initiatives_type:
-        actions:
-          create: Створити
   layouts:
     decidim:
       initiative_creation_header:

data/config/locales/zh-CN.yml

@@ -72,7 +72,6 @@ zh-CN:
               accepted: 足够的签名
               created: 已创建
               discarded: 丢弃的
-              published: 已发布
               rejected: 签名不足
               validating: 技术验证
           type_id_eq:
@@ -114,8 +113,6 @@ zh-CN:
             initiative_title: 倡议标题
             name_and_surname: 姓名：
             postal_code: 邮政编码
-            scope: 范围
-            time_and_date: 时间和日期
             timestamp: 时间戳
       titles:
         initiatives: 倡议
@@ -150,8 +147,8 @@ zh-CN:
       badges:
         initiatives:
           conditions:
-            - 转到Intiatives的参与空间
-            - 跟随步骤创建新的倡议
+          - 转到Intiatives的参与空间
+          - 跟随步骤创建新的倡议
           description: 当你发起新的倡议，与其他人合作执行这些倡议时，将颁发这个徽章。
           description_another: 此参与者已经发布了 %{score} 项倡议。
           name: 已发布的活动
@@ -238,7 +235,6 @@ zh-CN:
         accepted: 足够的签名
         created: 已创建
         discarded: 丢弃的
-        published: 已发布
         rejected: 签名不足
         validating: 技术验证
       application_helper:
@@ -344,14 +340,12 @@ zh-CN:
           recently_published: 最近发布的
         print:
           city: 城市
-          print: 打印
         result:
           initiative_rejected_reason: 这项倡议由于没有签字而被拒绝。
         signatures_count:
           other: " 签名"
         vote_cabin:
           already_voted: 已签名
-          verification_required: 验证您的帐户以签署倡议
           vote: 签名
           votes_blocked: 签名已禁用
         votes_count:
@@ -378,7 +372,6 @@ zh-CN:
           accepted: 足够的签名
           created: 已创建
           discarded: 丢弃的
-          published: 已发布
           rejected: 签名不足
           validating: 技术验证
       states:
@@ -390,7 +383,6 @@ zh-CN:
     resources:
       initiatives_type:
         actions:
-          create: 创建
           title: 行动
           vote: 签名
   layouts:

data/config/locales/zh-TW.yml

@@ -88,7 +88,6 @@ zh-TW:
               accepted: 足夠的簽署數
               created: 已建立
               discarded: 已捨棄
-              published: 已發佈
               rejected: 不足夠的簽署數
               validating: 技術驗證
           type_id_eq:
@@ -97,7 +96,6 @@ zh-TW:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: 透過標題、描述、ID 或作者姓名搜尋 %{collection}
       initiatives_settings:
         update:
-          error: 出現了一個錯誤.
           success: 倡議設定已成功更新.
       menu:
         attachments: 附件
@@ -138,8 +136,6 @@ zh-TW:
             initiative_title: 倡議標題
             name_and_surname: 名字與姓氏
             postal_code: 郵政編碼
-            scope: 範圍
-            time_and_date: 時間與日期
             timestamp: 時間戳記
       titles:
         initiatives: 倡議
@@ -182,8 +178,8 @@ zh-TW:
       badges:
         initiatives:
           conditions:
-            - 前往倡議參與空間
-            - '"按照以下步驟創建新的倡議'
+          - 前往倡議參與空間
+          - '"按照以下步驟創建新的倡議'
           description: 此徽章是當你發起新的倡議，與他人合作進行時所授予的。
           description_another: 該參與者已成功發佈 %{score} 項倡議。
           description_own: 你已經發佈了 %{score} 項倡議。
@@ -253,7 +249,6 @@ zh-TW:
             new: 新的
             photos: 圖片
           update:
-            error: 出現了一個錯誤.
             success: 倡議已成功更新.
         initiatives_settings:
           edit:
@@ -267,7 +262,6 @@ zh-TW:
             title: 倡議設定
         initiatives_type_scopes:
           create:
-            error: 出現了一個錯誤.
             success: 已為給定的倡議類型建立新範圍.
           destroy:
             success: 範圍已成功刪除.
@@ -278,11 +272,8 @@ zh-TW:
             create: 建立
             title: 建立倡議類型範圍
           update:
-            error: 出現了一個錯誤.
             success: 範圍已成功更新.
         initiatives_types:
-          create:
-            error: 出現了一個錯誤.
           destroy:
             success: 該倡議類型已成功刪除.
           edit:
@@ -296,7 +287,6 @@ zh-TW:
             create: 建立
             title: 新的倡議類型
           update:
-            error: 出現了一個錯誤.
             success: 該倡議類型已成功更新.
       admin_log:
         initiative:
@@ -314,7 +304,6 @@ zh-TW:
         accepted: 足夠的簽署數
         created: 已建立
         discarded: 已捨棄
-        published: 已發佈
         rejected: 不足夠的簽署數
         validating: 技術驗證
       application_helper:
@@ -410,8 +399,6 @@ zh-TW:
           email_outro: '你收到這個通知是因為你是該倡議 %{resource_title} 的作者。'
           email_subject: "%{applicant_nickname} 想加入你的倡議"
           notification_title: <a href="%{applicant_profile_url}">%{applicant_nickname}</a> 申請加入你的倡議 <a href="%{resource_url}">%{resource_title}</a> 的推動委員會。點擊<a href="%{resource_url}/edit">這裡</a>接受或拒絕申請。
-      form:
-        attachment_legend: "(可選) 新增附件"
       index:
         uninitialized: 尚未由管理員設置倡議。
       initiative_signatures:
@@ -492,9 +479,7 @@ zh-TW:
           phone_number: 電話號碼
           place_date: 地點、日期
           postal_code: 郵遞區號/郵政編碼
-          print: 列印
           province: 省份/州
-          section: '如果組織要求，請打印並填寫此表格，並按指示提交：'
           signature: 簽名
         result:
           answer_title: 這個倡議已經有回應了。
@@ -507,7 +492,6 @@ zh-TW:
           other: " 簽名"
         vote_cabin:
           already_voted: 已簽署
-          verification_required: 驗證您的帳戶以簽署該倡議
           vote: 簽署
           votes_blocked: 簽署已禁用
         votes_count:
@@ -536,7 +520,6 @@ zh-TW:
           accepted: 足夠的簽署數
           created: 已建立
           discarded: 已捨棄
-          published: 已發佈
           rejected: 簽署數不足
           validating: 技術驗證
       states:
@@ -544,7 +527,6 @@ zh-TW:
         expired: 已過期
       unavailable_scope: 不可用的範圍
       update:
-        error: 出現了一個錯誤.
         success: 倡議已成功更新.
     menu:
       initiatives: 倡議
@@ -554,7 +536,6 @@ zh-TW:
           comment: 評論
       initiatives_type:
         actions:
-          create: 建立
           title: 操作
           vote: 簽署
   layouts:

data/db/migrate/20241127104718_add_taxonomy_to_initiatives_type_scope.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTaxonomyToInitiativesTypeScope < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :decidim_initiatives_type_scopes, :decidim_taxonomy, index: true
+  end
+end

data/decidim-initiatives.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-initiatives"
   s.summary = "Decidim initiatives module"
@@ -34,8 +34,6 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-comments", Decidim::Initiatives.version
   s.add_dependency "decidim-core", Decidim::Initiatives.version
   s.add_dependency "decidim-verifications", Decidim::Initiatives.version
-  s.add_dependency "hexapdf", "~> 0.32.0"
-  s.add_dependency "wicked_pdf", "~> 2.1"
 
   s.add_development_dependency "decidim-dev", Decidim::Initiatives.version
   s.add_development_dependency "decidim-meetings", Decidim::Initiatives.version

data/lib/decidim/api/initiative_api_type.rb

@@ -3,24 +3,23 @@
 module Decidim
   module Initiatives
     class InitiativeApiType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::TimestampsInterface
+
       graphql_name "InitiativeType"
       description "An initiative type"
 
-      field :id, GraphQL::Types::ID, "The internal ID for this initiative type", null: false
-      field :title, Decidim::Core::TranslatedFieldType, "Initiative type name", null: true
-      field :description, Decidim::Core::TranslatedFieldType, "This is the initiative type description", null: true
-      field :created_at, Decidim::Core::DateTimeType, "The date this initiative type was created", null: true
-      field :updated_at, Decidim::Core::DateTimeType, "The date this initiative type was updated", null: true
       field :banner_image, GraphQL::Types::String, "Banner image", null: true
       field :collect_user_extra_fields, GraphQL::Types::Boolean, "Collect participant personal data on signature", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "This is the initiative type description", null: true
       field :extra_fields_legal_information, GraphQL::Types::String, "Legal information about the collection of personal data", null: true
+      field :id, GraphQL::Types::ID, "The internal ID for this initiative type", null: false
+      field :initiatives, [Decidim::Initiatives::InitiativeType, { null: true }], "The initiatives that have this type", null: false
       field :minimum_committee_members, GraphQL::Types::Int, "Minimum of committee members", null: true
-      field :validate_sms_code_on_votes, GraphQL::Types::Boolean, "Add SMS code validation step to signature process", null: true
-      field :undo_online_signatures_enabled, GraphQL::Types::Boolean, "Enable participants to undo their online signatures", null: true
-      field :promoting_committee_enabled, GraphQL::Types::Boolean, "If promoting committee is enabled", method: :promoting_committee_enabled, null: true
+      field :promoting_committee_enabled, GraphQL::Types::Boolean, "If promoting committee is enabled", null: true
       field :signature_type, GraphQL::Types::String, "Signature type of the initiative", null: true
-
-      field :initiatives, [Decidim::Initiatives::InitiativeType, { null: true }], "The initiatives that have this type", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "Initiative type name", null: true
+      field :undo_online_signatures_enabled, GraphQL::Types::Boolean, "Enable participants to undo their online signatures", null: true
+      field :validate_sms_code_on_votes, GraphQL::Types::Boolean, "Add SMS code validation step to signature process", null: true
 
       def banner_image
         object.attached_uploader(:banner_image).url

data/lib/decidim/api/initiative_committee_member_type.rb

@@ -4,15 +4,14 @@ module Decidim
   module Initiatives
     # This type represents an initiative committee member.
     class InitiativeCommitteeMemberType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::TimestampsInterface
+
       graphql_name "InitiativeCommitteeMemberType"
       description "An initiative committee member"
 
       field :id, GraphQL::Types::ID, "Internal ID for this member of the committee", null: false
-      field :user, Decidim::Core::UserType, "The decidim user for this initiative committee member", null: true
-
       field :state, GraphQL::Types::String, "Type of the committee member", null: true
-      field :created_at, Decidim::Core::DateTimeType, "The date this initiative committee member was created", null: true
-      field :updated_at, Decidim::Core::DateTimeType, "The date this initiative committee member was updated", null: true
+      field :user, Decidim::Core::UserType, "The decidim user for this initiative committee member", null: true
     end
   end
 end

data/lib/decidim/api/initiative_type.rb

@@ -12,38 +12,32 @@ module Decidim
 
       description "A initiative"
 
+      field :author, Decidim::Core::AuthorInterface, "The initiative author", null: false
+      field :committee_members, [Decidim::Initiatives::InitiativeCommitteeMemberType, { null: true }], "The committee members list", null: true
       field :description, Decidim::Core::TranslatedFieldType, "The description of this initiative.", null: true
-      field :slug, GraphQL::Types::String, null: false
       field :hashtag, GraphQL::Types::String, "The hashtag for this initiative", null: true
-      field :published_at, Decidim::Core::DateTimeType, "The time this initiative was published", null: false
-      field :reference, GraphQL::Types::String, "Reference prefix for this initiative", null: false
-      field :state, GraphQL::Types::String, "Current status of the initiative", null: true
-      field :signature_type, GraphQL::Types::String, "Signature type of the initiative", null: true
-      field :signature_start_date, Decidim::Core::DateType, "The signature start date", null: false
-      field :signature_end_date, Decidim::Core::DateType, "The signature end date", null: false
-      field :offline_votes, GraphQL::Types::Int, "The number of offline votes in this initiative", method: :offline_votes_count, null: true
-      field :online_votes, GraphQL::Types::Int, "The number of online votes in this initiative", method: :online_votes_count, null: true
-      field :initiative_votes_count, GraphQL::Types::Int,
-            description: "The number of votes in this initiative",
-            deprecation_reason: "initiativeVotesCount has been collapsed in onlineVotes parameter",
-            null: true
       field :initiative_supports_count, GraphQL::Types::Int,
             description: "The number of supports in this initiative",
             method: :online_votes_count,
             deprecation_reason: "initiativeSupportsCount has been collapsed in onlineVotes parameter",
             null: true
-
-      field :author, Decidim::Core::AuthorInterface, "The initiative author", null: false
-
-      def initiative_votes_count
-        object.online_votes_count
-      end
+      field :initiative_votes_count, GraphQL::Types::Int,
+            description: "The number of votes in this initiative",
+            deprecation_reason: "initiativeVotesCount has been collapsed in onlineVotes parameter",
+            null: true, method: :online_votes_count
+      field :offline_votes, GraphQL::Types::Int, "The number of offline votes in this initiative", method: :offline_votes_count, null: true
+      field :online_votes, GraphQL::Types::Int, "The number of online votes in this initiative", method: :online_votes_count, null: true
+      field :published_at, Decidim::Core::DateTimeType, "The time this initiative was published", null: false
+      field :reference, GraphQL::Types::String, "Reference prefix for this initiative", null: false
+      field :signature_end_date, Decidim::Core::DateType, "The signature end date", null: false
+      field :signature_start_date, Decidim::Core::DateType, "The signature start date", null: false
+      field :signature_type, GraphQL::Types::String, "Signature type of the initiative", null: true
+      field :slug, GraphQL::Types::String, "The slug of the initiative", null: false
+      field :state, GraphQL::Types::String, "Current status of the initiative", null: true
 
       def author
         object.user_group || object.author
       end
-
-      field :committee_members, [Decidim::Initiatives::InitiativeCommitteeMemberType, { null: true }], null: true
     end
   end
 end

data/lib/decidim/api/initiative_type_interface.rb

@@ -8,11 +8,7 @@ module Decidim
       include Decidim::Api::Types::BaseInterface
       description "An interface that can be used in Initiative objects."
 
-      field :initiative_type, Decidim::Initiatives::InitiativeApiType, "The object's initiative type", null: true
-
-      def initiative_type
-        object.type
-      end
+      field :initiative_type, Decidim::Initiatives::InitiativeApiType, "The object's initiative type", null: true, method: :type
     end
   end
 end