decidim-consultations 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bf024aaab20c665fcead026483e730e44d01f7a5d46b715c2607334e77820d
-  data.tar.gz: 8dcb157b10148f0d5db8a54c4b2b45f1d1e9efc9dc43e4a8f73b6d7da148d6c1
+  metadata.gz: ac6cbb884a436f3a7dae1afc0ecaf4ad669d8017d7e828ff906055d9fe569eb7
+  data.tar.gz: e2dd3b3cd944c643306ae53cd65e9bddc504e7165203c03c2db565c7b78635cc
 SHA512:
-  metadata.gz: 8e83652c0745e4022dca4e961035ddec03b2594bb3b0d6cd387fb62e5eeae097c654bed67741737ee0eca513858a5646fa27b4871a2244e3fecabfa470a11264
-  data.tar.gz: c816dc01c88b3094f4af1f42996aa896749c389eca66f4299a3bff2ca39b32fdd3de528d58a9f72235259c5008b6acf0f94ed58fa392232ccaf8880df57964ed
+  metadata.gz: 62a07bd3bf9559e042f343ac8a8ba5ca851d37eb78844f2ef69b9c832fede0ead52773b083eacbe121ee229634c177c7cf29164a2289a6fae2e3f51561df64e7
+  data.tar.gz: 0121a8c152378ae724b8ca813717f7f83db1f061e364fd45ae3b58a6f677cb89ba88da2dbe7fe467459cb306f7d05316524dcab412ddb1163b21a787b9b22c40

data/app/commands/decidim/consultations/admin/update_consultation.rb

@@ -50,15 +50,20 @@ module Decidim
             subtitle: form.subtitle,
             description: form.description,
             slug: form.slug,
-            banner_image: form.banner_image,
-            remove_banner_image: form.remove_banner_image,
             highlighted_scope: form.highlighted_scope,
             introductory_video_url: form.introductory_video_url,
             start_voting_date: form.start_voting_date,
-            end_voting_date: form.end_voting_date,
+            end_voting_date: form.end_voting_date
+          }.merge(uploader_attributes)
+        end
+
+        def uploader_attributes
+          {
+            banner_image: form.banner_image,
+            remove_banner_image: form.remove_banner_image,
             introductory_image: form.introductory_image,
             remove_introductory_image: form.remove_introductory_image
-          }
+          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
         end
       end
     end

data/app/forms/decidim/consultations/admin/consultation_form.rb

@@ -6,6 +6,7 @@ module Decidim
       # A form object used to create consultations from the admin dashboard.
       class ConsultationForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         mimic :consultation
 
@@ -29,12 +30,10 @@ module Decidim
         validates :end_voting_date, presence: true, date: { after_or_equal_to: :start_voting_date }
         validate :slug_uniqueness
 
-        validates :banner_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :introductory_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :banner_image, passthru: { to: Decidim::Consultation }
+        validates :introductory_image, passthru: { to: Decidim::Consultation }
+
+        alias organization current_organization
 
         def highlighted_scope
           @highlighted_scope ||= current_organization.scopes.find_by(id: decidim_highlighted_scope_id)

data/app/forms/decidim/consultations/admin/question_form.rb

@@ -6,6 +6,7 @@ module Decidim
       # A form object used to create questions for a consultation from the admin dashboard.
       class QuestionForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         mimic :question
 
@@ -32,17 +33,15 @@ module Decidim
         validates :slug, presence: true, format: { with: Decidim::Consultations::Question.slug_format }
         validates :title, :promoter_group, :participatory_scope, :subtitle, :what_is_decided, translatable_presence: true
         validates :decidim_scope_id, presence: true
-        validates :hero_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :banner_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :hero_image, passthru: { to: Decidim::Consultations::Question }
+        validates :banner_image, passthru: { to: Decidim::Consultations::Question }
         validate :slug_uniqueness
         validates :origin_scope, :origin_title, translatable_presence: true, if: :has_origin_data?
         validates :i_frame_url, presence: true, if: :external_voting
         validates :order, numericality: { only_integer: true, allow_nil: true, allow_blank: true }
 
+        alias organization current_organization
+
         private
 
         def slug_uniqueness

data/app/models/decidim/consultation.rb

@@ -12,6 +12,10 @@ module Decidim
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::Randomable
     include Decidim::Searchable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :subtitle, :description
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -27,10 +31,15 @@ module Decidim
              inverse_of: :consultation,
              dependent: :destroy
 
+    alias component_ids question_ids
+
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Consultation.slug_format }
 
+    validates_upload :banner_image
     mount_uploader :banner_image, Decidim::BannerImageUploader
+
+    validates_upload :introductory_image
     mount_uploader :introductory_image, Decidim::BannerImageUploader
 
     scope :upcoming, -> { published.where("start_voting_date > ?", Time.now.utc) }

data/app/models/decidim/consultations/question.rb

@@ -7,7 +7,7 @@ module Decidim
       include Decidim::HasResourcePermission
       include Decidim::Participable
       include Decidim::Publicable
-      include Decidim::Scopable
+      include Decidim::ScopableParticipatorySpace
       include Decidim::Comments::Commentable
       include Decidim::Followable
       include Decidim::HasAttachments
@@ -16,6 +16,10 @@ module Decidim
       include Decidim::Loggable
       include Decidim::ParticipatorySpaceResourceable
       include Decidim::Randomable
+      include Decidim::HasUploadValidations
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :subtitle, :what_is_decided, :promoter_group, :participatory_scope, :question_context, :origin_scope, :origin_title, :instructions
 
       belongs_to :consultation,
                  foreign_key: "decidim_consultation_id",
@@ -51,7 +55,10 @@ module Decidim
                dependent: :destroy,
                as: :participatory_space
 
+      validates_upload :hero_image
       mount_uploader :hero_image, Decidim::HeroImageUploader
+
+      validates_upload :banner_image
       mount_uploader :banner_image, Decidim::BannerImageUploader
 
       default_scope { order(order: :asc) }
@@ -193,6 +200,10 @@ module Decidim
       def allow_resource_permissions?
         true
       end
+
+      def attachment_context
+        :admin
+      end
     end
   end
 end

data/app/models/decidim/consultations/response.rb

@@ -3,6 +3,10 @@
 module Decidim
   module Consultations
     class Response < ApplicationRecord
+      include Decidim::TranslatableResource
+
+      translatable_fields :title
+
       belongs_to :question,
                  foreign_key: "decidim_consultations_questions_id",
                  class_name: "Decidim::Consultations::Question",

data/app/models/decidim/consultations/response_group.rb

@@ -3,6 +3,10 @@
 module Decidim
   module Consultations
     class ResponseGroup < ApplicationRecord
+      include Decidim::TranslatableResource
+
+      translatable_fields :title
+
       belongs_to :question,
                  foreign_key: "decidim_consultations_questions_id",
                  class_name: "Decidim::Consultations::Question",

data/app/presenters/decidim/consultations/question_stats_presenter.rb

@@ -15,7 +15,7 @@ module Decidim
           "question/#{question.id}/comments_count",
           expires_in: Decidim::Consultations.stats_cache_expiration_time
         ) do
-          Decidim::Comments::Comment.where(root_commentable: question).count
+          question.comments_count
         end
       end
 

data/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb

@@ -3,7 +3,7 @@
     <h3 class="reveal__title">
       <%= t "questions.vote_modal_confirm.title", scope: "decidim" %>
     </h3>
-    <button class="close-button" data-close aria-label="<%= t("questions.vote_modal_confirm.close_modal", scope: "decidim") %>%" type="button">
+    <button class="close-button" data-close aria-label="<%= t("questions.vote_modal_confirm.close_modal", scope: "decidim") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>

data/app/views/decidim/consultations/questions/show.html.erb

@@ -36,7 +36,7 @@
 <%= content_for :question_header_details do %>
   <div id="question-header-details" class="row consultations-home-intro">
     <div class="columns medium-5">
-      <%= image_tag current_question.hero_image&.url, alt: t("question.hero_image", scope: "activemodel.attributes") %>
+      <%= image_tag current_question.hero_image&.url, alt: t("question.hero_image", scope: "activemodel.attributes") if current_question.hero_image&.url %>
     </div>
 
     <div class="columns medium-5">

data/app/views/layouts/decidim/consultation.html.erb

@@ -1,6 +1,7 @@
 <%= render "layouts/decidim/application" do %>
   <div class="wrapper">
     <%= render partial: "layouts/decidim/consultation_header" %>
+    <%= cell "decidim/translation_bar", current_organization %>
     <%= yield %>
   </div>
   <% if content_for? :expanded %>

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/bg.yml

@@ -0,0 +1 @@
+bg:

data/config/locales/cs.yml

@@ -3,7 +3,7 @@ cs:
     attributes:
       consultation:
         banner_image: Obrázek banneru
-        decidim_highlighted_scope_id: Zvýrazněný rozsah
+        decidim_highlighted_scope_id: Zvýrazněná oblast působnosti
         description: Popis
         end_voting_date: Hlasování končí
         introductory_image: Úvodní obrázek
@@ -22,7 +22,7 @@ cs:
         instructions: Další pokyny pro hlasování
         max_votes: Maximální počet hlasů
         min_votes: Minimální počet hlasů
-        origin_scope: Rozsah
+        origin_scope: Oblast působnosti
         origin_title: Původ
         origin_url: Původní URL
         participatory_scope: Rozsah účastníků

data/config/locales/da.yml

@@ -0,0 +1 @@
+da:

data/config/locales/eo.yml

@@ -0,0 +1 @@
+eo:

data/config/locales/et.yml

@@ -0,0 +1 @@
+et:

data/config/locales/fr.yml

@@ -348,12 +348,12 @@ fr:
         verification_required: Vérifier votre compte pour voter
         vote: Voter
       vote_modal:
-        close_modal: Fermer la fenêtre modale
+        close_modal: Fermer la fenêtre de dialogue
         contextual_help: Veuillez sélectionner une option.
         title: 'Votation : soutien aux questions'
       vote_modal_confirm:
         change: Modifier
-        close_modal: Fermer la fenêtre modale
+        close_modal: Fermer la fenêtre de dialogue
         confirm: Confirmer
         contextual_help: Veuillez confirmer l'option sélectionnée.
         title: 'Consultation : confirmer le soutien'

data/config/locales/hr.yml

@@ -0,0 +1 @@
+hr:

data/config/locales/is.yml

@@ -0,0 +1,185 @@
+is:
+  activemodel:
+    attributes:
+      consultation:
+        banner_image: Banner image
+        decidim_highlighted_scope_id: Hápunktur sviðsins
+        description: Lýsing
+        introductory_image: Inngangs mynd
+        introductory_video_url: Inngangur vídeó URL
+        slug: URL slug
+        subtitle: Texti
+        title: Titill
+      question:
+        banner_image: Banner image
+        decidim_scope_id: Borgarsvæði
+        hashtag: Kassamerki
+        hero_image: Heimsmynd
+        i_frame_url: Vefslóð fyrir utanaðkomandi atkvæðagreiðslur
+        origin_scope: Umfang
+        origin_title: Uppruni
+        origin_url: Uppruni vefslóð
+        participatory_scope: Þátttökuskilyrði
+        promoter_group: Framkvæmdarhópur
+        question_context: Samhengi
+        reference: Tilvísun
+        scope: Borgarsvæði
+        slug: URL slug
+        subtitle: Texti
+        vote: Ytri atkvæðakerfi
+        what_is_decided: Hvað er ákveðið
+    errors:
+      vote:
+        decidim_consultations_response_id:
+          not_found: Svar fannst ekki.
+  decidim:
+    admin:
+      actions:
+        publish_results: Birta niðurstöður
+        unpublish_results: Afritaðu niðurstöðurnar
+      consultations:
+        create:
+          success: Samráð hefur verið búið til.
+        edit:
+          update: Uppfæra
+        form:
+          slug_help: 'Vefslóðir eru notaðir til að búa til slóðir sem benda til þessa samráðs. Aðeins viðurkennir stafir, tölur og bindur og verður að byrja með stafi. Dæmi: %{url}'
+          title: Almennar upplýsingar
+        index:
+          not_published: Ekki birt
+          published: Published
+        new:
+          create: Búa til
+          title: Nýtt samráð
+        update:
+          success: Samráð uppfærður með góðum árangri.
+      menu:
+        consultations: Samráð
+        consultations_submenu:
+          info: Upplýsingar
+          questions: Spurningar
+        questions_submenu:
+          components: Hluti
+          consultation: Samráð
+          info: Upplýsingar
+          responses: Svör
+      models:
+        consultation:
+          fields:
+            created_at: Búið til á
+            published: Published
+            title: Titill
+          name:
+            one: Samráð
+            other: Samráð
+        question:
+          fields:
+            created_at: Búið til á
+            published: Published
+            title: Titill
+          name:
+            one: Spurning
+            other: Spurningar
+        response:
+          fields:
+            created_at: Búið til á
+            title: Titill
+          name:
+            one: Svar
+            other: Svör
+      questions:
+        create:
+          success: Spurning búin til.
+        edit:
+          update: Uppfæra
+        form:
+          title: Almennar upplýsingar
+        index:
+          not_published: Ekki birt
+          published: Published
+        new:
+          create: Búa til
+          title: Ný spurning
+      responses:
+        create:
+          success: Svar búin til.
+        edit:
+          update: Uppfæra
+        form:
+          title: Almennar upplýsingar
+        new:
+          create: Búa til
+          title: Nýtt svar
+      titles:
+        consultations: Samráð
+        questions: Spurningar
+        responses: Svör
+    consultations:
+      consultation:
+        view_results: Skoða niðurstöður
+      consultation_card:
+        view_results: Skoða niðurstöður
+      consultations:
+        orders:
+          label: 'Raða samráð með:'
+          random: Handahófi
+          recent: Síðast
+      count:
+        title:
+          one: "%{count} samráð"
+          other: "%{count} samráð"
+      filters:
+        active: Virkur
+        all: Allt
+        finished: Lokið
+        search: Leita
+        upcoming: Næstu
+      filters_small_view:
+        close_modal: Lokaðu glugga
+        filter: Sía
+        filter_by: Sía eftir
+        unfold: Fella út
+      index:
+        title: Samráð
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Virkt samráð
+      question:
+        take_part: Taka þátt
+        view_results: Skoða niðurstöður
+        votes_out_of:
+          one: kjósa út úr
+          other: atkvæði úr
+    menu:
+      consultations: Samráð
+    questions:
+      results:
+        title: Niðurstöður
+      show:
+        read_more: Lestu meira
+      statistics:
+        assistants_count_title: Aðstoðarmenn
+        comments_count_title: Athugasemdir
+        meetings_count_title: Fundir
+      technical_info:
+        technical_data: Tæknilegar upplýsingar
+      vote_button:
+        already_voted: Already kusu
+        starting_from: Byrjar frá %{date}
+        vote: Kjósa
+      vote_modal_confirm:
+        change: Breyta
+        confirm: Staðfesta
+        contextual_help: Vinsamlegast staðfestu valinn valkost.
+  layouts:
+    decidim:
+      admin:
+        question:
+          attachments: Viðhengi
+          categories: Flokkar
+      question_components:
+        question_menu_item: Spurningin
+        unfold: Fella út
+      question_header:
+        back_to_consultation: Sjá öll samráð