decidim-proposals 0.16.0 → 0.16.1

data/config/locales/id-ID.yml

@@ -284,13 +284,16 @@ id:
             name: Usul
         participatory_texts:
           bulk-actions:
+            are_you_sure: Apakah Anda yakin akan membuang seluruh konsep teks partisipatif?
             import_doc: Impor dokumen
+            discard_all: Buang semua
           import:
             invalid: Formulirnya tidak valid!
             success: Selamat, bagian berikut telah diuraikan dari dokumen yang diimpor, mereka telah dikonversi menjadi proposal. Sekarang Anda dapat meninjau dan menyesuaikan apa pun yang Anda perlukan sebelum memublikasikan.
           index:
             info_1: Bagian berikut telah diurai dari dokumen yang diimpor, mereka telah dikonversi menjadi proposal. Sekarang Anda dapat meninjau dan menyesuaikan apa pun yang Anda perlukan sebelum memublikasikan.
             publish_document: Publikasikan dokumen
+            save_draft: Menyimpan konsep
             title: TEKNIK PREVIEW TEKNIKAL
           new_import:
             bottom_hint: "(Anda akan dapat melihat dan menyortir bagian dokumen)"
@@ -300,10 +303,14 @@ id:
           publish:
             invalid: Tidak dapat memublikasikan proposal
             success: Semua proposal telah dipublikasikan
+          discard:
+            success: Semua konsep teks Partisipatif telah dibuang.
           sections:
             article: "<em>Pasal</em>"
             section: "<em>Bagian:</em> <strong>%{title}</strong>"
             sub-section: "<em>Sub-bagian:</em> %{title}"
+          update:
+            success: Teks partisipatif berhasil diperbarui.
         proposal_answers:
           edit:
             accepted: Diterima

data/config/locales/it.yml

@@ -261,7 +261,7 @@ it:
       votes:
         description: Numero di voti generati nelle proposte degli utenti
         object: voti
-        title: voti
+        title: Voti
     participatory_processes:
       participatory_process_groups:
         highlighted_proposals:
@@ -289,13 +289,16 @@ it:
             name: Proposta
         participatory_texts:
           bulk-actions:
+            are_you_sure: Sei sicuro di scartare l'intera bozza del testo partecipativo?
             import_doc: Importa il documento
+            discard_all: Scarta tutto
           import:
             invalid: Il modulo non è valido!
             success: Complimenti, le seguenti sezioni sono state analizzate dal documento importato, sono state convertite in proposte. Ora puoi rivedere e regolare qualsiasi cosa tu abbia bisogno prima di pubblicare.
           index:
             info_1: Le seguenti sezioni sono state analizzate dal documento importato, sono state convertite in proposte. Ora puoi rivedere e regolare qualsiasi cosa tu abbia bisogno prima di pubblicare.
             publish_document: Pubblica un documento
+            save_draft: Salva la bozza
             title: ANTEPRIMA DEL TESTO PARTECIPATIVO
           new_import:
             bottom_hint: "(Sarai in grado di visualizzare in anteprima e ordinare le sezioni del documento)"
@@ -305,10 +308,14 @@ it:
           publish:
             invalid: Impossibile pubblicare proposte
             success: Tutte le proposte sono state pubblicate
+          discard:
+            success: Tutte le bozze di testo partecipativo sono state scartate.
           sections:
             article: "<em>Articolo</em>"
             section: "<em>Sezione:</em> <strong>%{title}</strong>"
             sub-section: "<em>Sottosezione:</em> %{title}"
+          update:
+            success: Testo partecipativo aggiornato correttamente.
         proposal_answers:
           edit:
             accepted: Accettata

data/config/locales/nl.yml

@@ -261,7 +261,7 @@ nl:
       votes:
         description: Aantal stemmen dat is gegenereerd in voorstellen van gebruikers
         object: stemmen
-        title: stemmen
+        title: Stemmen
     participatory_processes:
       participatory_process_groups:
         highlighted_proposals:
@@ -289,13 +289,16 @@ nl:
             name: Voorstel
         participatory_texts:
           bulk-actions:
+            are_you_sure: Weet je zeker dat je de hele deelnemende tekstopmaak wilt verwijderen?
             import_doc: Document importeren
+            discard_all: Gooi alles weg
           import:
             invalid: Het formulier is ongeldig!
             success: Gefeliciteerd, de volgende secties zijn geparseerd uit het geïmporteerde document, ze zijn geconverteerd naar voorstellen. Nu kunt u alles bekijken en aanpassen wat u nodig heeft voordat u publiceert.
           index:
             info_1: De volgende secties zijn geparseerd uit het geïmporteerde document, ze zijn geconverteerd naar voorstellen. Nu kunt u alles bekijken en aanpassen wat u nodig heeft voordat u publiceert.
             publish_document: Publiceer document
+            save_draft: Concept opslaan
             title: VOORBEELD PARTICIPATIEVE TEKST BEKIJKEN
           new_import:
             bottom_hint: "(U kunt documentsecties vooraf bekijken en sorteren)"
@@ -305,10 +308,14 @@ nl:
           publish:
             invalid: Kan voorstellen niet publiceren
             success: Alle voorstellen zijn gepubliceerd
+          discard:
+            success: Alle participatieve tekstconcepten zijn genegeerd.
           sections:
             article: "<em>Artikel</em>"
             section: "<em>Sectie:</em> <strong>%{title}</strong>"
             sub-section: "<em>Onderafdeling:</em> %{title}"
+          update:
+            success: Participatieve tekst succesvol bijgewerkt.
         proposal_answers:
           edit:
             accepted: Aanvaard
@@ -461,7 +468,7 @@ nl:
           published: Gepubliceerd
           related_to: Gerelateerd aan
           search: Zoeken
-          state: Staat
+          state: Status
           withdrawn: teruggetrokken
         filters_small_view:
           close_modal: Modal sluiten
@@ -551,7 +558,7 @@ nl:
             official_proposal: Officieel voorstel
             published_at: Gepubliceerd op
             scope: Scope
-            state: Staat
+            state: Status
             title: Titel
             votes: Stemmen
       new:

data/config/locales/pl.yml

@@ -271,7 +271,7 @@ pl:
       votes:
         description: Liczba głosów uzyskanych w propozycjach przez użytkowników
         object: głosów
-        title: Głosy
+        title: Głosowania
     participatory_processes:
       participatory_process_groups:
         highlighted_proposals:
@@ -299,13 +299,16 @@ pl:
             name: Wniosek
         participatory_texts:
           bulk-actions:
+            are_you_sure: Czy na pewno chcesz odrzucić cały szkic tekstu dla uczestników?
             import_doc: Zaimportuj dokument
+            discard_all: Odrzuć wszystko
           import:
             invalid: Formularz jest nieprawidłowy!
             success: Gratulacje, z importowanego dokumentu zostały przeanalizowane następujące sekcje, które zostały przekształcone w propozycje. Teraz możesz przejrzeć i dostosować, co potrzebujesz przed publikacją.
           index:
             info_1: Z importowanego dokumentu przeanalizowano następujące sekcje, które zostały przekształcone w propozycje. Teraz możesz przejrzeć i dostosować, co potrzebujesz przed publikacją.
             publish_document: Opublikuj dokument
+            save_draft: Zapisz Projekt
             title: PREVIEW TEKST UCZESTNIKA
           new_import:
             bottom_hint: "(Będziesz mógł przeglądać i sortować sekcje dokumentów)"
@@ -315,10 +318,14 @@ pl:
           publish:
             invalid: Nie można publikować propozycji
             success: Wszystkie wnioski zostały opublikowane
+          discard:
+            success: Wszystkie projekty tekstowe z uczestnictwem zostały odrzucone.
           sections:
             article: "<em>Artykuł</em>"
             section: "<em>Sekcja:</em> <strong>%{title}</strong>"
             sub-section: "<em>Podsekcja:</em> %{title}"
+          update:
+            success: Tekst uczestnictwa został zaktualizowany pomyślnie.
         proposal_answers:
           edit:
             accepted: Przyjęty

data/config/locales/pt-BR.yml

@@ -289,13 +289,16 @@ pt-BR:
             name: Proposta
         participatory_texts:
           bulk-actions:
+            are_you_sure: Tem certeza de descartar todo o rascunho do texto participativo?
             import_doc: Importar documento
+            discard_all: Descartar tudo
           import:
             invalid: O formato é inválido!
             success: Parabéns, as seções a seguir foram analisadas do documento importado, elas foram convertidas em propostas. Agora você pode revisar e ajustar o que precisar antes de publicar.
           index:
             info_1: As seções a seguir foram analisadas a partir do documento importado, elas foram convertidas em propostas. Agora você pode revisar e ajustar o que precisar antes de publicar.
             publish_document: Publicar documento
+            save_draft: Salvar rascunho
             title: Visualizar texto participativo
           new_import:
             bottom_hint: "(Você será capaz de visualizar e classificar as seções do documento)"
@@ -305,10 +308,14 @@ pt-BR:
           publish:
             invalid: Não foi possível publicar propostas
             success: Todas as propostas foram publicadas
+          discard:
+            success: Todos os rascunhos de texto participativos foram descartados.
           sections:
             article: "<em>Artigo</em>"
             section: "<em>Seção:</em> <strong>%{title}</strong>"
             sub-section: "<em>Subsecção:</em> %{title}"
+          update:
+            success: Texto participativo atualizado com sucesso.
         proposal_answers:
           edit:
             accepted: Aceitaram

data/config/locales/pt.yml

@@ -289,13 +289,16 @@ pt:
             name: Proposta
         participatory_texts:
           bulk-actions:
+            are_you_sure: Tem certeza de descartar todo o rascunho do texto participativo?
             import_doc: Documento de importação
+            discard_all: Descartar tudo
           import:
             invalid: O formulário é inválido!
             success: Parabéns, as seções a seguir foram analisadas do documento importado, elas foram convertidas em propostas. Agora você pode revisar e ajustar o que precisar antes de publicar.
           index:
             info_1: As seções a seguir foram analisadas a partir do documento importado, elas foram convertidas em propostas. Agora você pode revisar e ajustar o que precisar antes de publicar.
             publish_document: Publicar documento
+            save_draft: Salvar rascunho
             title: PREVIEW TEXTO PARTICIPATIVO
           new_import:
             bottom_hint: "(Você será capaz de visualizar e classificar as seções do documento)"
@@ -305,10 +308,14 @@ pt:
           publish:
             invalid: Não foi possível publicar propostas
             success: Todas as propostas foram publicadas
+          discard:
+            success: Todos os rascunhos de texto participativos foram descartados.
           sections:
             article: "<em>Artigo</em>"
             section: "<em>Seção:</em> <strong>%{title}</strong>"
             sub-section: "<em>Subsecção:</em> %{title}"
+          update:
+            success: Texto participativo atualizado com sucesso.
         proposal_answers:
           edit:
             accepted: Aceitaram

data/config/locales/ru.yml

@@ -149,6 +149,9 @@ ru:
           email_outro: Вы получили это уведомление, потому что вы следите за «%{participatory_space_title}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
           email_subject: В %{participatory_space_title} началось голосование по предложениям
           notification_title: Теперь в <a href="%{participatory_space_url}">%{participatory_space_title}</a> появилась возможность <a href="%{resource_path}">голосовать по предложениям</a>
+    metrics:
+      votes:
+        title: Голоса
     participatory_processes:
       participatory_process_groups:
         highlighted_proposals:
@@ -243,6 +246,9 @@ ru:
           official: Служебные
         filter_state_values:
           except_rejected: Все, кроме отклоненных
+      collaborative_drafts:
+        filters:
+          state: Cостояние
       create:
         error: При попытке сохранить это предложение произошли ошибки.
         success: Предложение успешно создано. Сохранено как черновик.

data/config/locales/sv.yml

@@ -289,13 +289,16 @@ sv:
             name: Förslag
         participatory_texts:
           bulk-actions:
+            are_you_sure: Är du säker på att kassera hela deltagande textförslaget?
             import_doc: Importera dokument
+            discard_all: Kassera allt
           import:
             invalid: Blanketten är ogiltig!
             success: Grattis, följande avsnitt har analyserats från det importerade dokumentet, de har konverterats till förslag. Nu kan du granska och justera vad du behöver innan du publicerar.
           index:
             info_1: Följande avsnitt har analyserats från det importerade dokumentet, de har konverterats till förslag. Nu kan du granska och justera vad du behöver innan du publicerar.
             publish_document: Publicera dokument
+            save_draft: Spara utkast
             title: PREVIEW PARTICIPERY TEXT
           new_import:
             bottom_hint: "(Du kommer att kunna förhandsgranska och sortera dokumentavsnitt)"
@@ -305,10 +308,14 @@ sv:
           publish:
             invalid: Kunde inte publicera förslag
             success: Alla förslag har publicerats
+          discard:
+            success: Alla deltagande textförslag har kasseras.
           sections:
             article: "<em>Artikel</em>"
             section: "<em>Avsnitt:</em> <strong>%{title}</strong>"
             sub-section: "<em>Underavsnitt:</em> %{title}"
+          update:
+            success: Deltagande text uppdaterad framgångsrikt.
         proposal_answers:
           edit:
             accepted: Accepterad

data/config/locales/tr-TR.yml

@@ -141,6 +141,7 @@ tr:
           email_intro: 'Şimdi %{participatory_space_title}yeni teklifler oluşturabilirsiniz! Bu sayfaya katılmaya başlayın:'
           email_outro: Bu bildirimi, %{participatory_space_title}izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
           email_subject: Şu anda %{participatory_space_title}teklif mevcut
+          notification_title: Artık ileri koyabilirsiniz <a href="%{resource_path}">yeni teklifler</a> içinde <a href="%{participatory_space_url}">%{participatory_space_title}</a>
         endorsing_enabled:
           email_intro: 'Teklifleri %{participatory_space_title}onaylayabilirsiniz! Bu sayfaya katılmaya başlayın:'
           email_outro: Bu bildirimi, %{participatory_space_title}izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
@@ -288,13 +289,16 @@ tr:
             name: öneri
         participatory_texts:
           bulk-actions:
+            are_you_sure: Katılımcı metin taslağının tamamını atadığınızdan emin misiniz?
             import_doc: Dokümanı içe aktar
+            discard_all: Hepsini at
           import:
             invalid: Form geçersiz!
             success: Tebrikler, aşağıdaki bölümler içe aktarılan belgeden ayrıştırılmış, tekliflere dönüştürülmüştür. Artık yayınlamadan önce ihtiyacınız olan şeyleri inceleyip ayarlayabilirsin.
           index:
             info_1: Aşağıdaki bölümler içe aktarılan belgeden ayrıştırılmış, tekliflere dönüştürülmüştür. Artık yayınlamadan önce ihtiyacınız olan şeyleri inceleyip ayarlayabilirsin.
             publish_document: Belge yayınla
+            save_draft: Taslağı kaydet
             title: ÖNEMLİ KATILIMCI METİN
           new_import:
             bottom_hint: "(Belge bölümlerini önizleyebilir ve sıralayabilirsiniz)"
@@ -304,10 +308,14 @@ tr:
           publish:
             invalid: Teklifler yayınlanamadı
             success: Tüm teklifler yayınlandı
+          discard:
+            success: Tüm Katılımcı metin taslakları atıldı.
           sections:
             article: "<em>Madde</em>"
             section: "<em>Bölüm:</em> <strong>%{title}</strong>"
             sub-section: "<em>Alt Bölüm:</em> %{title}"
+          update:
+            success: Katılımcı metin başarıyla güncellendi.
         proposal_answers:
           edit:
             accepted: Kabul edilmiş

data/config/locales/uk.yml

@@ -149,6 +149,9 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
           email_subject: У %{participatory_space_title} почалось голосування щодо пропозицій
           notification_title: Тепер в <a href="%{participatory_space_url}">%{participatory_space_title}</a> відкрилась можливість <a href="%{resource_path}">голосувати щодо пропозицій</a>
+    metrics:
+      votes:
+        title: Голоси
     participatory_processes:
       participatory_process_groups:
         highlighted_proposals:
@@ -243,6 +246,9 @@ uk:
           official: Службове
         filter_state_values:
           except_rejected: Усі, окрім відхилених
+      collaborative_drafts:
+        filters:
+          state: Стан
       create:
         error: При спробі збереження цієї пропозиції сталися помилки.
         success: Пропозицію успішно створено. Збережено як чернетку.

data/db/migrate/20190215113158_use_md5_indexes.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class UseMd5Indexes < ActiveRecord::Migration[5.2]
+  def up
+    remove_index :decidim_proposals_proposals, name: "decidim_proposals_proposal_title_search"
+    remove_index :decidim_proposals_proposals, name: "decidim_proposals_proposal_body_search"
+    execute "CREATE INDEX decidim_proposals_proposal_title_search ON decidim_proposals_proposals(md5(title::text))"
+    execute "CREATE INDEX decidim_proposals_proposal_body_search ON decidim_proposals_proposals(md5(body::text))"
+  end
+
+  def down
+    remove_index :decidim_proposals_proposals, name: "decidim_proposals_proposal_title_search"
+    remove_index :decidim_proposals_proposals, name: "decidim_proposals_proposal_body_search"
+    add_index :decidim_proposals_proposals, :title, name: "decidim_proposals_proposal_title_search"
+    add_index :decidim_proposals_proposals, :body, name: "decidim_proposals_proposal_body_search"
+  end
+end

data/lib/decidim/content_parsers/proposal_parser.rb

@@ -22,8 +22,8 @@ module Decidim
       # Matches a URL
       URL_REGEX_SCHEME = '(?:http(s)?:\/\/)'
       URL_REGEX_CONTENT = '[\w.-]+[\w\-\._~:\/?#\[\]@!\$&\'\(\)\*\+,;=.]+'
-      URL_REGEX_END_CHAR = '[\w]'
-      URL_REGEX = /#{URL_REGEX_SCHEME}#{URL_REGEX_CONTENT}#{URL_REGEX_END_CHAR}/i
+      URL_REGEX_END_CHAR = '[\d]'
+      URL_REGEX = %r{#{URL_REGEX_SCHEME}#{URL_REGEX_CONTENT}/proposals/#{URL_REGEX_END_CHAR}+}i
       # Matches a mentioned Proposal ID (~(d)+ expression)
       ID_REGEX = /~(\d+)/
 

data/lib/decidim/proposals/admin_engine.rb

@@ -21,11 +21,13 @@ module Decidim
           resources :proposal_notes, only: [:index, :create]
         end
         scope "/proposal_components/:component_id" do
-          resources :participatory_texts, only: :index do
+          resources :participatory_texts, only: [:index] do
             collection do
               get :new_import
               post :import
-              post :publish
+              patch :import
+              post :update
+              post :discard
             end
           end
         end

data/lib/decidim/proposals/markdown_to_proposals.rb

@@ -19,11 +19,17 @@ module Decidim
         @current_user = current_user
         @last_position = 0
         @num_sections = 0
+        @list_items = []
       end
 
       def parse(document)
         renderer = self
-        parser = ::Redcarpet::Markdown.new(renderer)
+        extensions = {
+          # no lax_spacing so that it is easier to group paragraphs in articles.
+          lax_spacing: false,
+          fenced_code_blocks: true
+        }
+        parser = ::Redcarpet::Markdown.new(renderer, extensions)
         parser.render(document)
       end
 
@@ -31,6 +37,8 @@ module Decidim
       # Redcarpet callbacks
       ##########################################
 
+      # Block-level calls ######################
+
       # Recarpet callback to process headers.
       # Creates Paricipatory Text Proposals at Section and Subsection levels.
       def header(title, level)
@@ -60,9 +68,46 @@ module Decidim
         text
       end
 
-      # ignore images
-      def image(_link, _title, _alt_text)
-        ""
+      # Render the list as a whole
+      def list(_contents, list_type)
+        return if @list_items.empty?
+
+        body = case list_type
+               when :ordered
+                 @list_items.collect.with_index { |item, idx| "#{idx + 1}. #{item}\n" }.join
+               else
+                 @list_items.collect { |item| "- #{item}\n" }.join
+               end
+        # reset items for the next list
+        @list_items = []
+        create_proposal(
+          (@last_position + 1 - @num_sections).to_s,
+          body,
+          Decidim::Proposals::ParticipatoryTextSection::LEVELS[:article]
+        )
+
+        body
+      end
+
+      # do not render list items, save them for rendering with the whole list
+      def list_item(text, _list_type)
+        @list_items << text.strip
+        nil
+      end
+
+      # Span-level calls #######################
+
+      def link(link, title, content)
+        attrs = %(href="#{link}")
+        attrs += %( title="#{title}") if title.present?
+        "<a #{attrs}>#{content}</a>"
+      end
+
+      def image(link, title, alt_text)
+        attrs = %(src="#{link}")
+        attrs += %( alt="#{alt_text}") if alt_text.present?
+        attrs += %( title="#{title}") if title.present?
+        "<img #{attrs}/>"
       end
 
       private