decidim-initiatives 0.32.0.rc3 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b91c1ea5c8aa8c4019545d1b9a9da758d14a48ec7d4d004f36058a49878b04fa
-  data.tar.gz: 35b07d6fa1fe95b9c6526824e65ffe6217b6f1efe094ea87171d86ac056998a2
+  metadata.gz: 7f5816a24eff405004468eae43413529b42b134378e51c9c403521dec583dbf9
+  data.tar.gz: c17b92b77713892747d6b7d70526c8f6bbb96e2996ba5df1e18fce053fe56c89
 SHA512:
-  metadata.gz: c656480f5b64c23997e10a64ed7a11c193d8b86f82ae7cab1c4fb0a988a02e5a212c12b4aae7ba40c48bd6d0e715d39943ec950fca8870c210c67de54e294777
-  data.tar.gz: c867af6b672a41a2a4bd03eea44a2b581badb887aab564172bd758f78173a00bbc069b93462d835c9a9eadbd8f7ab3c19edee512bfbeef72f0e3956ce385df42
+  metadata.gz: a51a5fb5006f2952cfe295c10b318fc4de92eb655a618de073cc326d447b37cc225c425deb31f10f6591c78032ebd83f1040372cf75e13881de12f8be9de44f3
+  data.tar.gz: 6aed9d53ddcf754e1822b598cca76aaffc2850ea9f0e16f550846ac8aa2edfc28911fa73614272c0836b35873581c5b78d83bb231f7a78daa591368d319ecbc0

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -8,7 +8,6 @@ module Decidim
     class CreateInitiative < Decidim::Command
       include CurrentLocale
       include ::Decidim::MultipleAttachmentsMethods
-      include ::Decidim::GalleryMethods
 
       delegate :current_user, to: :form
       # Public: Initializes the command.
@@ -32,11 +31,6 @@ module Decidim
           return broadcast(:invalid) if attachments_invalid?
         end
 
-        if process_gallery?
-          build_gallery
-          return broadcast(:invalid) if gallery_invalid?
-        end
-
         initiative = create_initiative
 
         if initiative.persisted?
@@ -60,7 +54,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :attachment, :initiative
+      attr_reader :form, :attachments, :initiative
 
       # Creates the initiative and all default components
       def create_initiative
@@ -72,7 +66,6 @@ module Decidim
 
           @attached_to = initiative
           create_attachments if process_attachments?
-          create_gallery if process_gallery?
 
           create_components_for(initiative)
           send_notification(initiative)

data/app/commands/decidim/initiatives/update_initiative.rb

@@ -6,7 +6,6 @@ module Decidim
     # existing initiative.
     class UpdateInitiative < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
-      include ::Decidim::GalleryMethods
       include CurrentLocale
 
       delegate :current_user, to: :form
@@ -35,11 +34,6 @@ module Decidim
           return broadcast(:invalid) if attachments_invalid?
         end
 
-        if process_gallery?
-          build_gallery
-          return broadcast(:invalid) if gallery_invalid?
-        end
-
         with_events(with_transaction: true) do
           @initiative = Decidim.traceability.update!(
             initiative,
@@ -47,10 +41,8 @@ module Decidim
             attributes
           )
 
-          photo_cleanup!
-          document_cleanup!
+          attachment_cleanup!
           create_attachments if process_attachments?
-          create_gallery if process_gallery?
         end
 
         broadcast(:ok, initiative)
@@ -72,7 +64,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :initiative
+      attr_reader :form, :initiative, :attachments
 
       def attributes
         attrs = {

data/app/forms/decidim/initiatives/initiative_form.rb

@@ -20,7 +20,7 @@ module Decidim
       attribute :scope_id, Integer
 
       attachments_attribute :photos
-      attachments_attribute :documents
+      attachments_attribute :attachments
 
       validates :title, :description, presence: true
       validates :title, length: { maximum: 150 }

data/app/models/decidim/initiative.rb

@@ -380,6 +380,7 @@ module Decidim
     #
     # Returns a Boolean.
     def has_authorship?(user)
+      return false unless user
       return true if author.id == user.id
 
       committee_members.approved.where(decidim_users_id: user.id).any?

data/app/views/decidim/initiatives/create_initiative/fill_data.html.erb

@@ -41,7 +41,7 @@
     <% end %>
 
     <% if initiative_type.attachments_enabled? %>
-      <%= f.attachment :documents,
+      <%= f.attachment :attachments,
                        multiple: true,
                        label: t("decidim.initiatives.form.add_attachments"),
                        button_label: t("decidim.initiatives.form.add_attachments"),

data/app/views/decidim/initiatives/initiatives/_form.html.erb

@@ -47,7 +47,7 @@
 <% end %>
 
 <% if current_initiative.type.attachments_enabled? %>
-  <%= form.attachment :documents,
+  <%= form.attachment :attachments,
                       multiple: true,
                       label: t("decidim.initiatives.form.add_attachments"),
                       button_label: t("decidim.initiatives.form.add_attachments"),

data/config/locales/ca-IT.yml

@@ -71,9 +71,6 @@ ca-IT:
       decidim/initiative_comittee:
         one: Comitè
         other: Comitès
-      decidim/initiative_vote:
-        one: Signatura
-        other: Signatures
   decidim:
     admin:
       actions:
@@ -587,9 +584,6 @@ ca-IT:
           signature_collection: Signatures recollides
           state: Estat
           type: Tipus
-        signatures_count:
-          one: " signatura"
-          other: " signatures"
         vote_cabin:
           already_voted: Ja has signat
           vote: Signar

data/config/locales/cs.yml

@@ -444,7 +444,10 @@ cs:
         update: Aktualizovat
       events:
         approve_membership_request:
+          email_intro: "%{author_name} přijal vaši žádost, abyste se stal součástí propagačního výboru pro iniciativu %{resource_title}."
           email_outro: 'Obdrželi jste toto oznámení, protože jste podali žádost o tuto iniciativu: %{resource_title}'
+        create_initiative_event:
+          email_subject: Nová iniciativa od %{author_name}
         revoke_membership_request:
           email_outro: 'Obdrželi jste toto oznámení, protože jste podali žádost o tuto iniciativu: %{resource_title}.'
         spawn_committee_request_event:

data/config/locales/eu.yml

@@ -438,11 +438,25 @@ eu:
         update: Eguneratu
       events:
         approve_membership_request:
+          email_intro: "%{author_name} parte-hartzaileak onartu du zure eskaera %{resource_title} ekimenaren batzorde bultzatzailean parte hartzeko."
           email_outro: 'Jakinarazpen hau jaso duzu %{resource_title} ekimenarekin bat egitea eskatu duzulako'
+          email_subject: "%{author_name} parte-hartzaileak onartu du zure eskaera batzorde bultzatzailean parte hartzeko"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> parte-hartzaileak onartu du zure eskaera <a href="%{resource_url}">%{resource_title}</a> ekimenaren batzorde bultzatzailean parte hartzeko.
+        create_initiative_event:
+          email_intro: "%{author_name} parte-hartzaileak, jarraitzen ari zarenak, beste ekimen bat sortu du, egiaztatu eta lagundu:"
+          email_outro: Jakinarazpen hau jaso duzu %{author_name} jarraitzen ari zarelako. Aurreko estekan jarraitzeari utzi ahal diozu.
+          email_subject: '%{author_name} parte-hartzailearen bete ekimen bat'
+          notification_title: '<a href="%{resource_path}">%{resource_title}</a> eztabaida sortu da hemen: <a href="%{author_path}">%{author_name}</a>.'
         revoke_membership_request:
+          email_intro: "%{author_name} parte-hartzaileak ukatu egin du zure eskaera %{resource_title} ekimenaren batzorde bultzatzailean parte hartzeko."
           email_outro: 'Jakinarazpen hau jaso duzu eskatu duzulako parte hartzea %{resource_title} ekimenean.'
+          email_subject: "%{author_name} parte-hartzaileak ukatu egin du zure eskaera batzorde bultzatzailean parte hartzeko"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> parte-hartzaileak ukatu du zure eskaera <a href="%{resource_url}">%{resource_title}</a> ekimenaren batzorde bultzatzailean parte hartzeko.
         spawn_committee_request_event:
+          email_intro: "%{applicant_name} parte-hartzaileak eskatu du %{resource_title} zure ekimenaren batzorde bultzatzailean parte hartzeko. Eskaera onartzeko edo ukatzeko, zoaz zure ekimenaren edizio-galdetegira."
           email_outro: 'Jakinarazpen hau jaso duzu %{resource_title} ekimenaren egilea zarelako'
+          email_subject: "%{applicant_name} parte-hartzaileak zure ekimenarekin bat egin nahi du"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> parte-hartzaileak eskatu du <a href="%{resource_url}">%{resource_title}</a> zure ekimenaren batzorde bultzatzailearekin bat egitea. Eskaera onartzeko edo ukatzeko, egin klik hemen <a href="%{resource_url}/edit">aquí</a>.
       form:
         add_attachments: Eranskinak gehitu
         add_image: Irudia gehitu

data/config/locales/ja.yml

@@ -435,11 +435,25 @@ ja:
         update: 更新する
       events:
         approve_membership_request:
+          email_intro: "%{author_name} は、イニシアチブ %{resource_title} の推進委員会メンバーとなるためのあなたの申請を承認しました。"
           email_outro: 'この通知を受け取ったのは、イニシアチブ %{resource_title} に応募したためです。'
+          email_subject: "%{author_name} が推進委員会へのあなたの申請を承認しました"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> は、以下のイニシアチブ <a href="%{resource_url}">%{resource_title}</a> の推進委員会のメンバーとなるためのあなたの申請を承認しました。
+        create_initiative_event:
+          email_intro: "フォロー中の %{author_name} が新しいイニシアチブを作成しました。ぜひ内容を確認し、ご協力ください："
+          email_outro: '%{author_name} をフォローしているため、この通知が届きました。前のリンクからフォローを解除することで、通知の受信を停止できます。'
+          email_subject: '%{author_name} による新しいイニシアチブ'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> イニシアチブは <a href="%{author_path}">%{author_name}</a> によって作成されました。
         revoke_membership_request:
+          email_intro: "%{author_name} により、以下のイニシアチブ %{resource_title} の推進委員会メンバーとなるための申請が却下されました。"
           email_outro: 'この通知を受け取ったのは、イニシアチブ %{resource_title} に応募したためです。'
+          email_subject: "%{author_name} があなたからの推進委員会への申請を却下しました"
+          notification_title: <a href="%{author_profile_url}">%{author_name}</a> は、以下のイニシアチブ <a href="%{resource_url}">%{resource_title}</a> の推進委員会メンバーとしての申請を却下しました。
         spawn_committee_request_event:
+          email_intro: "%{applicant_name} がイニシアチブ %{resource_title} の推進委員会に応募しました。承認または却下するには、イニシアチブの編集フォームにアクセスしてください。"
           email_outro: 'この通知を受け取ったのは、イニシアチブ %{resource_title} の作成者だからです。'
+          email_subject: "%{applicant_name} はあなたのイニシアチブへの参加を希望しています"
+          notification_title: <a href="%{applicant_profile_url}">%{applicant_name}</a> がイニシアチブ <a href="%{resource_url}">%{resource_title}</a> の推進委員会に応募しました。承認または拒否するには、<a href="%{resource_url}/edit">こちらをクリック</a>してください。
       form:
         add_attachments: 添付ファイルを追加
         add_image: 画像を追加

data/decidim-initiatives.gemspec

@@ -3,7 +3,7 @@
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
 Gem::Specification.new do |s|
-  version = "0.32.0.rc3"
+  version = "0.32.0"
   s.version = version
   s.authors = ["Juan Salvador Perez Garcia"]
   s.email = ["jsperezg@gmail.com"]

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.32.0.rc3"
+      "0.32.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.32.0.rc3
+  version: 0.32.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
@@ -15,84 +15,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 description: Participants initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com