decidim-consultations 0.25.0.rc4 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aa524deefdaef9be5dc1c2f64beadc017ad0ef763b0567437b82e93f38573cd
-  data.tar.gz: 302a087db8e132962bb79cd124977b75a91b64848794ff743590fe27dfe2fac0
+  metadata.gz: 222606360dacc46d61332e54b86163818942b6d2951b8939686506306abd5813
+  data.tar.gz: d2240f2a437e76d0616872ae908273991428603ffe251c6a98c13e8a7821f93e
 SHA512:
-  metadata.gz: 6cbbd8a681bdfa90b2896138e8ceba1b9c5d8bee88daf63ef88e8473cd7eceb26c8da32f250143c321d0121bda16d6fba7d19bedc86b9fe2b56080064d9f159b
-  data.tar.gz: c38c6f123b0e88754238caf18c265549f2d153618aff871c5ab67e136dd4789cb0cfb87bdf418c4e86654953b9833c276ab05c596a87a5e95404189631c00ef1
+  metadata.gz: 43b18cc9ddd8a30a01fa9e532d0408c0c0d970e83d2efd6acaa2fca9f95453bea28280b8b340f9afcb9d75a47a254b6ff6c1f488251d81001ec827e0aaeedbc1
+  data.tar.gz: 01ce50dc1050ff14842a9268ebbf9f1f69ae24b03d3765ceb516058fe25141104f2a399e8f0c751ac0ac6026e726badc6630405b7eb28b5b0b7e17ce09ebfe43

data/app/cells/decidim/consultations/consultation_m_cell.rb

@@ -35,7 +35,7 @@ module Decidim
       # makes the layout look good.
       def description
         text = super
-        text.gsub!(/^<p>/, "<p>#{render :badge}")
+        text.sub!(/<p>/, "<p>#{render :badge}")
         html_truncate(text, length: 100)
       end
 

data/app/services/decidim/consultations/consultation_search.rb

@@ -18,12 +18,12 @@ module Decidim
       # Handle the search_text filter
       def search_search_text
         query
-          .where("title->>'#{current_locale}' ILIKE ?", "%#{search_text}%")
+          .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
           .or(
-            query.where("description->>'#{current_locale}' ILIKE ?", "%#{search_text}%")
+            query.where(Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
           )
           .or(
-            query.where("subtitle->>'#{current_locale}' ILIKE ?", "%#{search_text}%")
+            query.where(Arel.sql("subtitle->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
           )
       end
 

data/app/views/decidim/consultations/consultations/_consultation_details.html.erb

@@ -1,6 +1,6 @@
 <div class="row section" id="consultation-details">
   <div class="columns medium-6 large-5 large-push-1">
-    <p class="lead"><%= decidim_sanitize translated_attribute(consultation.description) %></p>
+    <p class="lead"><%= decidim_sanitize_editor translated_attribute(consultation.description) %></p>
   </div>
   <div class="columns medium-6 large-5 large-pull-1">
     <% if consultation.introductory_video_url.blank? %>

data/app/views/decidim/consultations/consultations/_filters_small_view.html.erb

@@ -1,5 +1,5 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t "consultations.filters_small_view.filter", scope: "decidim" %>
     <%= icon "caret-bottom",
              class: "icon--small float-right",
@@ -8,9 +8,9 @@
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t "consultations.filters_small_view.filter_by", scope: "decidim" %>:</h3>
+    <h3 id="filter-box-label" class="reveal__title"><%= t "consultations.filters_small_view.filter_by", scope: "decidim" %>:</h3>
     <button class="close-button" data-close
             aria-label="<%= t("consultations.filters_small_view.close_modal", scope: "decidim") %>"
             type="button">

data/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb

@@ -8,7 +8,7 @@
           <li><%= t(".minimum_votes_per_user.description", votes: question.min_votes) %></li>
         </ul>
         <% if question.instructions %>
-          <%= decidim_sanitize translated_attribute question.instructions %>
+          <%= decidim_sanitize_editor translated_attribute question.instructions %>
         <% end %>
       </div>
       <div class="columns medium-4 large-3">

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

@@ -1,2 +1,2 @@
 <% content_for(:title, translated_attribute(model.title)) %>
-<%= decidim_sanitize html_truncate(translated_attribute(model.question_context), length: 100, separator: "...") %>
+<%= decidim_sanitize_editor html_truncate(translated_attribute(model.question_context), length: 100, separator: "...") %>

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

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
-        <%= decidim_sanitize translated_attribute current_question.question_context %>
+        <%= decidim_sanitize_editor translated_attribute current_question.question_context %>
 
         <div class="show-more">
           <button class="button hollow small"><%= t "read_more", scope: "decidim.questions.show" %></button>
@@ -13,12 +13,12 @@
 
           <div class="section">
             <h2 class=section-heading><%= t "question.what_is_decided", scope: "activemodel.attributes" %></h2>
-            <p><%= decidim_sanitize translated_attribute(current_question.what_is_decided), strip_tags: true %></p>
+            <p><%= decidim_sanitize_editor translated_attribute(current_question.what_is_decided), strip_tags: true %></p>
           </div>
 
           <div class="section">
             <h2 class=section-heading><%= t "question.question_context", scope: "activemodel.attributes" %></h2>
-            <p><%= decidim_sanitize translated_attribute(current_question.question_context), strip_tags: true %></p>
+            <p><%= decidim_sanitize_editor translated_attribute(current_question.question_context), strip_tags: true %></p>
           </div>
         </div>
       </div>

data/config/locales/ca.yml

@@ -359,6 +359,7 @@ ca:
     resources:
       consultations:
         actions:
+          comment: Comentar
           vote: Vota
     statistics:
       consultations_count: Consultes

data/config/locales/cs.yml

@@ -379,6 +379,7 @@ cs:
     resources:
       consultations:
         actions:
+          comment: Komentář
           vote: Hlasovat
     statistics:
       consultations_count: Konzultace

data/config/locales/es-MX.yml

@@ -359,6 +359,7 @@ es-MX:
     resources:
       consultations:
         actions:
+          comment: Comentar
           vote: Votar
     statistics:
       consultations_count: Consultas

data/config/locales/es-PY.yml

@@ -359,6 +359,7 @@ es-PY:
     resources:
       consultations:
         actions:
+          comment: Comentar
           vote: Votar
     statistics:
       consultations_count: Consultas

data/config/locales/es.yml

@@ -359,6 +359,7 @@ es:
     resources:
       consultations:
         actions:
+          comment: Comentar
           vote: Votar
     statistics:
       consultations_count: Consultas

data/config/locales/eu.yml

@@ -19,6 +19,9 @@ eu:
         hashtag: hashtag
         hero_image: Hasiera irudia
         i_frame_url: Kanpoko boto-sistemaren URLa
+        instructions: Jarraibide osagarriak botoa emateko
+        max_votes: Gehieneko boto kopurua
+        min_votes: Gutxieneko boto kopurua
         origin_scope: esparrua
         origin_title: Origin
         origin_url: Jatorria URLa
@@ -31,11 +34,24 @@ eu:
         subtitle: azpititulua
         vote: Kanpoko boto sistema
         what_is_decided: Zer erabaki
+      response:
+        decidim_consultations_response_group_id: Taldea
     errors:
+      models:
+        question:
+          attributes:
+            max_votes:
+              lower_than_min: Gehieneko boto kopurua gutxienekoa baino handiagoa edo berdina izan behar da.
       vote:
         decidim_consultations_response_id:
           not_found: Erantzuna ez da aurkitu.
   activerecord:
+    errors:
+      models:
+        decidim/consultations/vote:
+          attributes:
+            question:
+              invalid_num_votes: Boto kopurua ez da baliozkoa
     models:
       decidim/consultation:
         one: Consulta
@@ -52,10 +68,13 @@ eu:
   decidim:
     admin:
       actions:
+        back_to_responses: Itzuli erantzunetara
         new_consultation: Kontsulta berria
         new_question: Galdera berria
         new_response: Erantzun berria
+        new_response_group: Talde berri bat
         publish_results: Argitaratu emaitzak
+        response_groups: Kudeatu erantzun-multzoak
         unpublish_results: Argitaratu emaitzak
       consultation_publications:
         create:
@@ -75,6 +94,7 @@ eu:
         create:
           error: Errore bat gertatu da kontsulta berri bat sortzean.
           success: Kontsulta sortu da.
+        deprecation_warning: Kontsulten modulua laster zaharkituta egongo da. Lantzen ari gara kriptografikoki segurua izango den hurrengo bertsioa, Bozketak izenekoa.
         edit:
           update: eguneratzearen
         form:
@@ -86,6 +106,10 @@ eu:
         new:
           create: Sortu
           title: Kontsulta berria
+        results:
+          not_visible: Emaitzak eskuragai egongo dira inkesta ixten denean
+          participants: "%{count} parte-hartzaile"
+          total_votes: 'Guztira: %{count} boto'
         update:
           error: Errore bat gertatu da kontsulta hau eguneratzean.
           success: Kontsultak eguneratu egin du.
@@ -94,10 +118,12 @@ eu:
         consultations_submenu:
           info: informazioa
           questions: Galderak
+          results: Emaitzak
         questions_submenu:
           attachments: eranskinak
           categories: Kategoriak
           components: Osagaiak
+          configuration: Konfigurazioa
           consultation: Consulta
           info: informazioa
           responses: Erantzunak
@@ -121,10 +147,16 @@ eu:
         response:
           fields:
             created_at: Sortutako at
+            response_group: Taldea
             title: Izenburua
           name:
             one: Erantzun
             other: Erantzunak
+      question_configuration:
+        disable_external_voting: Mesedez, desaktibatu kanpoko bozketa konfigurazio aurreratuetarako
+        form:
+          help: Erantzun anitzeko aukerak dituzten galderak konfiguratzen ditu, parte-hartzaile batek aukera ditzakeen erantzun kopurua handituz. Aurrez zehaztutako gehieneko balioa 1 da, eta horrek esan nahi du erantzun bakarra aukera daitekeela.
+          title: Konfigurazio aurreratua
       question_publications:
         create:
           error: Errore bat gertatu da galdera hau argitaratzean.
@@ -151,6 +183,24 @@ eu:
         update:
           error: Errore bat gertatu da galdera hau eguneratzean.
           success: Galdera ondo eguneratu da.
+      response_groups:
+        create:
+          error: Errore bat gertatu da erantzun-multzo berri bat sortzean.
+          success: Erantzun-multzoa zuzen sortu da.
+        destroy:
+          error: Arazo bat gertatu da erantzun-multzoa ezabatzean. Egiaztatu ez dagoela erantzunik horren menpe.
+          success: Erantzun-multzoa zuzen ezabatu da.
+        edit:
+          update: Eguneratu
+        form:
+          title: Informazio orokorra
+        help: Erabili multzoak aukera anitzeko galderak paketetan antolatzeko.
+        new:
+          create: Sortu
+          title: Erantzun-multzo berria
+        update:
+          error: Arazoa gertatu da erantzun hau eguneratzean.
+          success: Erantzuna zuzen eguneratu da.
       responses:
         create:
           error: Errore bat gertatu da erantzun berri bat sortzean.
@@ -171,6 +221,7 @@ eu:
       titles:
         consultations: kontsultak
         questions: Galderak
+        response_groups: Erantzun-multzoak
         responses: Erantzunak
     consultations:
       admin:
@@ -187,6 +238,8 @@ eu:
           label: 'Ordenatu kontsultak honela:'
           random: Random
           recent: Berrienak
+        show:
+          dates: Datak
       content_blocks:
         highlighted_consultations:
           name: Nabarmendutako kontsultak
@@ -228,9 +281,28 @@ eu:
         votes_out_of:
           one: bozkatu
           other: botoetatik kanpo
+      question_multiple_votes:
+        results_rules:
+          minimum_votes_per_user:
+            description: Parte-hartzaileek gutxienez %{votes} banatu ahal dituzte hainbat aukeraren artean.
+          title: Galdera honetan, aukera anitzeko erantzunak egon daitezke
+          total_participants: Kontsultan, guztira %{count} pertsonak hartu dute parte.
+          vote_limit:
+            description: Parte-hartzaileek gehienez %{limit} aukera bozkatu ahal dituzte.
+        voting_rules:
+          minimum_votes_per_user:
+            description: Gutxienez %{votes} boto banatu behar dituzu proposamen desberdinen artean.
+          title: 'Bozketa indarrean dagoen araudiaren araberakoa da:'
+          vote_limit:
+            description: Gehienez, %{limit} aukera bozkatu ahal duzu.
+            left: Gainontzekoak
+            votes: Botoak
       question_votes:
         create:
           error: Arazoak izan dira galdera hautapenean
+          success: Kontsultaren amaiera arte alda dezakezu. Azken botoa baino ez da onartuko.
+          title_error: Boto-akatsa!
+          title_success: Botoa zuzen erregistratu da
       regular_questions:
         title: Kontsulta honi buruzko galderak
       show:
@@ -252,6 +324,8 @@ eu:
     menu:
       consultations: kontsultak
     questions:
+      next_button: Hurrengo galdera
+      previous_button: Aurreko galdera
       results:
         title: Emaitzak
       show:
@@ -267,15 +341,26 @@ eu:
         already_voted: Bozkatu
         already_voted_hover: Ezeztatu laguntza
         starting_from: '%{date}tik hasita'
+        verification_required: Egiaztatu zure kontua bozkatzeko
         vote: Bozkatu
       vote_modal:
+        close_modal: Itxi leihoa
         contextual_help: Aukeratu aukera bat.
         title: 'Kontsulta: galdera-laguntza'
       vote_modal_confirm:
         change: Aldaketa
+        close_modal: Itxi leihoa
         confirm: Berretsi
         contextual_help: Berretsi hautatutako aukera.
         title: 'Kontsulta: berretsi laguntza'
+    resources:
+      consultations:
+        actions:
+          comment: Iruzkina
+          vote: Eman botoa
+    statistics:
+      consultations_count: Kontsultak
+      votes_count: Botoak
   layouts:
     decidim:
       consultation_voting_data:
@@ -285,3 +370,4 @@ eu:
         unfold: Zabaldu
       question_header:
         back_to_consultation: Ikusi kontsulta guztiak
+        back_to_question: Itzuli galderara

data/config/locales/fi-plain.yml

@@ -359,6 +359,7 @@ fi-pl:
     resources:
       consultations:
         actions:
+          comment: Kommentoi
           vote: Äänestä
     statistics:
       consultations_count: Kuulemista

data/config/locales/fi.yml

@@ -359,6 +359,7 @@ fi:
     resources:
       consultations:
         actions:
+          comment: Kommentoi
           vote: Äänestä
     statistics:
       consultations_count: Kuulemista

data/config/locales/fr-CA.yml

@@ -359,7 +359,11 @@ fr-CA:
     resources:
       consultations:
         actions:
+          comment: Commenter
           vote: Voter
+    statistics:
+      consultations_count: Consultations
+      votes_count: Votes
   layouts:
     decidim:
       consultation_voting_data:

data/config/locales/fr.yml

@@ -359,7 +359,11 @@ fr:
     resources:
       consultations:
         actions:
+          comment: Commenter
           vote: Voter
+    statistics:
+      consultations_count: Consultations
+      votes_count: Votes
   layouts:
     decidim:
       consultation_voting_data:

data/config/locales/ga-IE.yml

@@ -1 +1,137 @@
 ga:
+  activemodel:
+    attributes:
+      consultation:
+        questions: Ceisteanna
+        slug: Píosa URL
+        subtitle: Fotheideal
+        title: Teideal
+      question:
+        hashtag: Haischlib
+        origin_scope: Scóip
+        origin_title: Bunús
+        question_context: Comhthéacs
+        slug: Píosa URL
+        subtitle: Fotheideal
+      response:
+        decidim_consultations_response_group_id: Grúpa
+  activerecord:
+    models:
+      decidim/consultations/question:
+        one: Ceist
+        two: Ceisteanna
+        few: Ceisteanna
+        many: Ceisteanna
+        other: Ceisteanna
+      decidim/consultations/vote:
+        one: Vóta
+        two: Vótaí
+        few: Vótaí
+        many: Vótaí
+        other: Vótaí
+  decidim:
+    admin:
+      consultations:
+        edit:
+          update: Nuashonraigh
+        new:
+          create: Cruthaigh
+      menu:
+        consultations_submenu:
+          questions: Ceisteanna
+          results: Torthaí
+        questions_submenu:
+          attachments: Ceangaltáin
+          categories: Catagóirí
+      models:
+        consultation:
+          fields:
+            title: Teideal
+        question:
+          fields:
+            title: Teideal
+          name:
+            one: Ceist
+            two: Ceisteanna
+            few: Ceisteanna
+            many: Ceisteanna
+            other: Ceisteanna
+        response:
+          fields:
+            response_group: Grúpa
+            title: Teideal
+          name:
+            one: Freagra
+            two: Freagraí
+            few: Freagraí
+            many: Freagraí
+            other: Freagraí
+      questions:
+        edit:
+          update: Nuashonraigh
+        new:
+          create: Cruthaigh
+      response_groups:
+        edit:
+          update: Nuashonraigh
+        new:
+          create: Cruthaigh
+      responses:
+        edit:
+          update: Nuashonraigh
+        new:
+          create: Cruthaigh
+      titles:
+        questions: Ceisteanna
+        results: Torthaí
+    consultations:
+      consultations:
+        orders:
+          random: Randamach
+        show:
+          dates: Dátaí
+      filters:
+        active: Gníomhach
+        all: Uile
+        finished: Críochnaithe
+        search: Cuardaigh
+        state: Stádas
+        upcoming: Le teacht
+      filters_small_view:
+        filter: Scag
+        unfold: Oscail
+      question_multiple_votes:
+        voting_rules:
+          vote_limit:
+            votes: Vótaí
+      show:
+        badge_name:
+          finished: Críochnaithe
+          open: Oscail
+        footer_button_text:
+          debate: Díospóireacht
+          view: Amharc
+          vote: Vótáil
+    questions:
+      results:
+        title: Torthaí
+      statistics:
+        comments_count_title: Tráchtanna
+        meetings_count_title: Cruinnithe
+        supports_count_title: Vótaí
+      vote_button:
+        vote: Vótáil
+      vote_modal_confirm:
+        change: Athrú
+        confirm: Deimhnigh
+    resources:
+      consultations:
+        actions:
+          comment: Tabhair Trácht
+          vote: Vótáil
+    statistics:
+      votes_count: Vótaí
+  layouts:
+    decidim:
+      question_components:
+        unfold: Oscail

data/config/locales/it.yml

@@ -359,6 +359,7 @@ it:
     resources:
       consultations:
         actions:
+          comment: Commenta
           vote: Vota
     statistics:
       consultations_count: Consultazioni

data/config/locales/ja.yml

@@ -230,7 +230,7 @@ ja:
       consultations:
         orders:
           label: '議案の並び替え:'
-          random: Random
+          random: ランダム
           recent: 直近のもの
         show:
           dates: 日付
@@ -266,7 +266,7 @@ ja:
             see_all_consultations: すべての議案を見る
             voting_ends_in:
               other: 投票は <strong>%{count} 日</strong>で終了します
-            voting_ends_today: 投票は今日終了 <strong></strong>
+            voting_ends_today: <strong>本日</strong>投票終了
       question:
         take_part: 参加する
         view_results: 結果を表示
@@ -349,6 +349,7 @@ ja:
     resources:
       consultations:
         actions:
+          comment: コメント
           vote: 投票
     statistics:
       consultations_count: コンサルテーション