decidim-consultations 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930e1b6588758c21dd94b66d50c41f617f8cf81dda92fb6db8d305a1f9c6b26e
-  data.tar.gz: 7ef43020414884c6ee312ffe963b9671e654e458faca8ec31c655e36fd21c7b7
+  metadata.gz: 36e83e1093f23673048618259e416d511410b51ff07ef504fff36b1011f4b732
+  data.tar.gz: c767572a5560e95927fd076f91250193f2fe82111286b56f11d24f09aff816fd
 SHA512:
-  metadata.gz: 82f2db42b45e3d6efad06492fd63953ac0bc0277b82b7028a364ca15068c38244f0ad7af62d1e94044ebaee9e195b076f05c90b46818aaf84417e46bb33003a6
-  data.tar.gz: 663d0de423cabe6db15d6fb4f894d06158b2a1abdc5e0c8cb619a94a1ab77e14a099378417c2282bfd68e9fe3aafdb2534a1f16daf0117e8ca818b8305c38390
+  metadata.gz: c66328041708960eb979b00304fcd17d067491d9b9065472b3695821f06706ca833ac32e15eedec50addbd74bfed9f57a39464c92b4b895a42d0e12e857a1edd
+  data.tar.gz: 58b20e8996a0f024aada27e4fd0b3dac570b3947d85c519147ae7090374ef1cce7b890c124f51f9fe32cca60ed73b773451531ae7b3377beabdf8a916950e779

data/app/controllers/concerns/decidim/consultations/needs_consultation.rb

@@ -38,7 +38,7 @@ module Decidim
 
         def detect_consultation
           request.env["current_consultation"] ||
-            organization_consultations.find_by(slug: params[:consultation_slug] || params[:slug])
+            organization_consultations.find_by!(slug: params[:consultation_slug] || params[:slug])
         end
 
         def organization_consultations

data/app/controllers/concerns/decidim/consultations/needs_question.rb

@@ -82,8 +82,10 @@ module Decidim
         private
 
         def detect_question
+          return unless request.env["current_question"] || params[:question_slug] || params[:slug]
+
           request.env["current_question"] ||
-            OrganizationQuestions.for(current_organization).find_by(slug: params[:question_slug] || params[:slug])
+            OrganizationQuestions.for(current_organization).find_by!(slug: params[:question_slug] || params[:slug])
         end
 
         def detect_consultation

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

@@ -1,36 +1,21 @@
-<div class="row column">
-  <div class="process-nav consultations-nav">
-    <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
-      <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
-      <span class="process-nav__link">
-        <% if self.try(:current_component) %>
-          <%= component_icon(current_component) %>
-          <%= translated_attribute(current_component.name) %>
-        <% else %>
-          <%= external_icon "media/images/decidim_pages.svg", role: "img", "aria-hidden": true %>
-          <%= t ".question_menu_item" %>
-        <% end %>
-      </span>
-    </button>
+<div class="row column consultations-nav">
+  <%
+    components = question.components.published.or(Decidim::Component.where(id: self.try(:current_component)))
+  %>
 
-    <%
-      components = question.components.published.or(Decidim::Component.where(id: self.try(:current_component)))
-    %>
-
-    <%=
-      extended_navigation_bar([
-        {
-          name: t(".question_menu_item"),
-          url: decidim_consultations.question_path(question),
-          active: is_active_link?(decidim_consultations.question_path(question), :exclusive)
-        }
-      ] + components.map do |component|
-        {
-          name: translated_attribute(component.name),
-          url: main_component_path(component),
-          active: is_active_link?(main_component_path(component), :inclusive)
-        }
-      end)
-    %>
-  </div>
+  <%=
+    extended_navigation_bar([
+      {
+        name: t(".question_menu_item"),
+        url: decidim_consultations.question_path(question),
+        active: is_active_link?(decidim_consultations.question_path(question), :exclusive)
+      }
+    ] + components.map do |component|
+      {
+        name: translated_attribute(component.name),
+        url: main_component_path(component),
+        active: is_active_link?(main_component_path(component), :inclusive)
+      }
+    end)
+  %>
 </div>

data/config/locales/ar.yml

@@ -37,6 +37,11 @@ ar:
       response:
         decidim_consultations_response_group_id: الفريق
     errors:
+      models:
+        question:
+          attributes:
+            max_votes:
+              lower_than_min: يجب أن يكون الحد الأقصى لعدد الأصوات أعلى أو يساوي الحد الأدنى.
       vote:
         decidim_consultations_response_id:
           not_found: الرد غير موجود.
@@ -85,6 +90,7 @@ ar:
         new_response: استجابة جديدة
         new_response_group: فريق جديد
         publish_results: نشر النتائج
+        response_groups: إدارة مجموعات الاستجابة
         unpublish_results: نتائج غير منشورة
       consultation_publications:
         create:
@@ -248,6 +254,8 @@ ar:
           label: 'ترتيب المشاورات حسب:'
           random: عشوائية
           recent: الأحدث
+        show:
+          dates: التواريخ
       content_blocks:
         highlighted_consultations:
           name: مشاورات أبرزت
@@ -359,24 +367,28 @@ ar:
         verification_required: تحقق من حسابك قبل التصويت
         vote: تصويت
       vote_modal:
+        close_modal: اغلاق النموذج
         contextual_help: من فضلك ، حدد خيار.
         title: 'التشاور: التصويت السؤال'
       vote_modal_confirm:
         change: يتغيرون
+        close_modal: اغلاق النموذج
         confirm: تؤكد
         contextual_help: يرجى تأكيد الخيار المحدد.
         title: 'التشاور: تأكيد التصويت'
     resources:
       consultations:
         actions:
+          comment: تعليق
           vote: صوِّت
+    statistics:
+      votes_count: الأصوات
   layouts:
     decidim:
       consultation_voting_data:
         start_voting_date: يبدأ التصويت
       question_components:
         question_menu_item: السؤال
-        unfold: كشف
       question_header:
         back_to_consultation: انظر جميع المشاورات
         back_to_question: العودة إلى السؤال

data/config/locales/ca.yml

@@ -370,7 +370,6 @@ ca:
         start_voting_date: Comença la votació
       question_components:
         question_menu_item: La pregunta
-        unfold: Desplegar
       question_header:
         back_to_consultation: Veure totes les consultes
         back_to_question: Tornar a la pregunta

data/config/locales/cs.yml

@@ -390,7 +390,6 @@ cs:
         start_voting_date: Hlasování začíná
       question_components:
         question_menu_item: Otázka
-        unfold: Rozvinout
       question_header:
         back_to_consultation: Podívejte se na všechny konzultace
         back_to_question: Zpět k otázce

data/config/locales/de.yml

@@ -359,6 +359,7 @@ de:
     resources:
       consultations:
         actions:
+          comment: Kommentar
           vote: Abstimmung
     statistics:
       consultations_count: Beratungen
@@ -369,7 +370,6 @@ de:
         start_voting_date: Die Abstimmung beginnt
       question_components:
         question_menu_item: Die Frage
-        unfold: Entfalten
       question_header:
         back_to_consultation: Sehen Sie alle Konsultationen
         back_to_question: Zurück zur Frage

data/config/locales/el.yml

@@ -363,7 +363,6 @@ el:
         start_voting_date: Η ψηφοφορία αρχίζει
       question_components:
         question_menu_item: Η ερώτηση
-        unfold: Αποκάλυψη
       question_header:
         back_to_consultation: Δείτε όλες τις διαβουλεύσεις
         back_to_question: Επιστροφή στην ερώτηση

data/config/locales/en.yml

@@ -371,7 +371,6 @@ en:
         start_voting_date: Voting begins
       question_components:
         question_menu_item: The question
-        unfold: Unfold
       question_header:
         back_to_consultation: See all consultations
         back_to_question: Back to the question

data/config/locales/es-MX.yml

@@ -370,7 +370,6 @@ es-MX:
         start_voting_date: Empieza la votación
       question_components:
         question_menu_item: La pregunta
-        unfold: Desplegar
       question_header:
         back_to_consultation: Ver todas las consultas
         back_to_question: Volver a la pregunta

data/config/locales/es-PY.yml

@@ -370,7 +370,6 @@ es-PY:
         start_voting_date: Empieza la votación
       question_components:
         question_menu_item: La pregunta
-        unfold: Desplegar
       question_header:
         back_to_consultation: Ver todas las consultas
         back_to_question: Volver a la pregunta

data/config/locales/es.yml

@@ -370,7 +370,6 @@ es:
         start_voting_date: Empieza la votación
       question_components:
         question_menu_item: La pregunta
-        unfold: Desplegar
       question_header:
         back_to_consultation: Ver todas las consultas
         back_to_question: Volver a la pregunta

data/config/locales/eu.yml

@@ -370,7 +370,6 @@ eu:
         start_voting_date: Botoa hasten da
       question_components:
         question_menu_item: Galdera
-        unfold: Zabaldu
       question_header:
         back_to_consultation: Ikusi kontsulta guztiak
         back_to_question: Itzuli galderara

data/config/locales/fi-plain.yml

@@ -370,7 +370,6 @@ fi-pl:
         start_voting_date: Äänestys alkaa
       question_components:
         question_menu_item: Kysymys
-        unfold: Avaa
       question_header:
         back_to_consultation: Näytä kaikki kuulemiset
         back_to_question: Takaisin kysymykseen

data/config/locales/fi.yml

@@ -370,7 +370,6 @@ fi:
         start_voting_date: Äänestys alkaa
       question_components:
         question_menu_item: Kysymys
-        unfold: Avaa
       question_header:
         back_to_consultation: Näytä kaikki kuulemiset
         back_to_question: Takaisin kysymykseen

data/config/locales/fr-CA.yml

@@ -370,7 +370,6 @@ fr-CA:
         start_voting_date: Le vote commence le
       question_components:
         question_menu_item: La question
-        unfold: Voir la suite
       question_header:
         back_to_consultation: Voir toutes les votations
         back_to_question: Retour à la question

data/config/locales/fr.yml

@@ -370,7 +370,6 @@ fr:
         start_voting_date: Le vote commence le
       question_components:
         question_menu_item: La question
-        unfold: Voir la suite
       question_header:
         back_to_consultation: Voir toutes les votations
         back_to_question: Retour à la question

data/config/locales/ga-IE.yml

@@ -131,7 +131,3 @@ ga:
           vote: Vótáil
     statistics:
       votes_count: Vótaí
-  layouts:
-    decidim:
-      question_components:
-        unfold: Oscail

data/config/locales/gl.yml

@@ -285,6 +285,5 @@ gl:
         start_voting_date: Comeza a votación
       question_components:
         question_menu_item: A pregunta
-        unfold: Despregar
       question_header:
         back_to_consultation: Ver todas as consultas

data/config/locales/hu.yml

@@ -359,7 +359,6 @@ hu:
         start_voting_date: Szavazás kezdése
       question_components:
         question_menu_item: A kérdés
-        unfold: Kibontás
       question_header:
         back_to_consultation: Összes konzultáció megtekintése
         back_to_question: Vissza a kérdéshez

data/config/locales/id-ID.yml

@@ -272,6 +272,5 @@ id:
         start_voting_date: Voting dimulai
       question_components:
         question_menu_item: Pertanyaan
-        unfold: Membuka
       question_header:
         back_to_consultation: Lihat semua konsultasi

data/config/locales/is-IS.yml

@@ -178,6 +178,5 @@ is-IS:
     decidim:
       question_components:
         question_menu_item: Spurningin
-        unfold: Fella út
       question_header:
         back_to_consultation: Sjá öll samráð

data/config/locales/it.yml

@@ -370,7 +370,6 @@ it:
         start_voting_date: Inizia la votazione
       question_components:
         question_menu_item: Il quesito
-        unfold: spiegare
       question_header:
         back_to_consultation: Vedi tutte le consultazioni
         back_to_question: Torna al quesito

data/config/locales/ja.yml

@@ -360,7 +360,6 @@ ja:
         start_voting_date: 投票が始まります
       question_components:
         question_menu_item: 質問
-        unfold: 展開する
       question_header:
         back_to_consultation: すべての議案を見る
         back_to_question: 質問に戻る

data/config/locales/lb.yml

@@ -285,7 +285,6 @@ lb:
         start_voting_date: Die Abstimmung beginnt
       question_components:
         question_menu_item: Die Frage
-        unfold: Entfalten
       question_header:
         back_to_consultation: Sehen Sie alle Konsultationen
         back_to_question: Zurück zur Frage

data/config/locales/lv.yml

@@ -369,7 +369,6 @@ lv:
         start_voting_date: Balsojums sākas
       question_components:
         question_menu_item: Jautājums
-        unfold: Atritināt
       question_header:
         back_to_consultation: Skatīt visas konsultācijas
         back_to_question: Atpakaļ pie jautājuma

data/config/locales/nl.yml

@@ -368,7 +368,6 @@ nl:
         start_voting_date: Stemmen begint
       question_components:
         question_menu_item: De vraag
-        unfold: Uitklappen
       question_header:
         back_to_consultation: Bekijk alle burgerinspraken
         back_to_question: Terug naar de vraag

data/config/locales/no.yml

@@ -370,7 +370,6 @@
         start_voting_date: Stemming begynner
       question_components:
         question_menu_item: Spørsmålet
-        unfold: Åpne
       question_header:
         back_to_consultation: Se alle konsultasjonene
         back_to_question: Tilbake til spørsmålet

data/config/locales/pl.yml

@@ -390,7 +390,6 @@ pl:
         start_voting_date: Głosowanie rozpoczyna się
       question_components:
         question_menu_item: Pytanie
-        unfold: Rozwiń
       question_header:
         back_to_consultation: Zobacz wszystkie konsultacje
         back_to_question: Wróć do pytania

data/config/locales/pt-BR.yml

@@ -369,7 +369,6 @@ pt-BR:
         start_voting_date: A votação começa
       question_components:
         question_menu_item: A questão
-        unfold: Desdobrar
       question_header:
         back_to_consultation: Veja todas as consultas
         back_to_question: Voltar à pergunta

data/config/locales/pt.yml

@@ -370,7 +370,6 @@ pt:
         start_voting_date: A votação começa
       question_components:
         question_menu_item: A questão
-        unfold: Desdobrar
       question_header:
         back_to_consultation: Ver todas as consultas
         back_to_question: Retroceder à pergunta

data/config/locales/ro-RO.yml

@@ -380,7 +380,6 @@ ro:
         start_voting_date: Votarea începe
       question_components:
         question_menu_item: Întrebarea
-        unfold: Desfășurat
       question_header:
         back_to_consultation: Vezi toate consultările
         back_to_question: Înapoi la întrebare

data/config/locales/ru.yml

@@ -276,6 +276,5 @@ ru:
         start_voting_date: Голосование начинается
       question_components:
         question_menu_item: Вопрос
-        unfold: Развернуть
       question_header:
         back_to_consultation: Просмотреть все консультации

data/config/locales/sk.yml

@@ -379,7 +379,6 @@ sk:
         start_voting_date: Hlasovanie začína
       question_components:
         question_menu_item: Otázka
-        unfold: Rozbaliť
       question_header:
         back_to_consultation: Zobraziť všetky konzultácie
         back_to_question: Späť na otázku

data/config/locales/sv.yml

@@ -370,7 +370,6 @@ sv:
         start_voting_date: Omröstningen börjar
       question_components:
         question_menu_item: Frågan
-        unfold: Veckla ut
       question_header:
         back_to_consultation: Visa alla samråd
         back_to_question: Tillbaka till frågan

data/config/locales/tr-TR.yml

@@ -365,7 +365,6 @@ tr:
         start_voting_date: Oylama başlıyor
       question_components:
         question_menu_item: Soru
-        unfold: açılmak
       question_header:
         back_to_consultation: Tüm istişarelere bakın
         back_to_question: Soruya geri dön

data/config/locales/uk.yml

@@ -276,6 +276,5 @@ uk:
         start_voting_date: Голосування починається
       question_components:
         question_menu_item: Питання
-        unfold: Розгорнути
       question_header:
         back_to_consultation: Переглянути всі консультації

data/config/locales/zh-CN.yml

@@ -353,7 +353,6 @@ zh-CN:
         start_voting_date: 投票开始
       question_components:
         question_menu_item: 问题
-        unfold: 展开...
       question_header:
         back_to_consultation: 查看所有协商
         back_to_question: 回到问题

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.26.1"
+      "0.26.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com