decidim-proposals 0.16.1 → 0.17.0

data/config/locales/uk.yml

@@ -149,9 +149,6 @@ 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:
@@ -246,9 +243,6 @@ uk:
           official: Службове
         filter_state_values:
           except_rejected: Усі, окрім відхилених
-      collaborative_drafts:
-        filters:
-          state: Стан
       create:
         error: При спробі збереження цієї пропозиції сталися помилки.
         success: Пропозицію успішно створено. Збережено як чернетку.
@@ -288,7 +282,6 @@ uk:
           error: При голосуванні щодо пропозиції сталися помилки.
       proposals:
         compare:
-          mine_is_different: Моя пропозиція інша
           no_similars_found: Гарна робота! Не знайдено схожий пропозицій
           title: Подібні пропозиції
         complete:

data/lib/decidim/content_renderers/proposal_renderer.rb

@@ -19,13 +19,11 @@ module Decidim
       # @return [String] the content ready to display (contains HTML)
       def render
         content.gsub(GLOBAL_ID_REGEX) do |proposal_gid|
-          begin
-            proposal = GlobalID::Locator.locate(proposal_gid)
-            Decidim::Proposals::ProposalPresenter.new(proposal).display_mention
-          rescue ActiveRecord::RecordNotFound
-            proposal_id = proposal_gid.split("/").last
-            "~#{proposal_id}"
-          end
+          proposal = GlobalID::Locator.locate(proposal_gid)
+          Decidim::Proposals::ProposalPresenter.new(proposal).display_mention
+        rescue ActiveRecord::RecordNotFound
+          proposal_id = proposal_gid.split("/").last
+          "~#{proposal_id}"
         end
       end
     end

data/lib/decidim/proposals/admin_engine.rb

@@ -20,15 +20,14 @@ module Decidim
           resources :proposal_answers, only: [:edit, :update]
           resources :proposal_notes, only: [:index, :create]
         end
-        scope "/proposal_components/:component_id" do
-          resources :participatory_texts, only: [:index] do
-            collection do
-              get :new_import
-              post :import
-              patch :import
-              post :update
-              post :discard
-            end
+
+        resources :participatory_texts, only: [:index] do
+          collection do
+            get :new_import
+            post :import
+            patch :import
+            post :update
+            post :discard
           end
         end
 

data/lib/decidim/proposals/doc_to_markdown.rb

@@ -14,9 +14,19 @@ module Decidim
     #
     class DocToMarkdown
       MARKDOWN_MIME_TYPE = "text/markdown"
+      # sometimes markdown documents are classified as text/plain
+      TEXT_PLAIN_MIME_TYPE = "text/plain"
       ODT_MIME_TYPE = "application/vnd.oasis.opendocument.text"
       DOCX_MIME_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
 
+      # Accepted mime types
+      # keys: are used for dynamic help text on admin form.
+      # values: are used to validate the file format of imported document.
+      ACCEPTED_MIME_TYPES = {
+        md: MARKDOWN_MIME_TYPE,
+        odt: ODT_MIME_TYPE
+      }.freeze
+
       # Public: Initializes the serializer with a proposal.
       def initialize(doc, mime_type)
         @doc = doc

data/lib/decidim/proposals/markdown_to_proposals.rb

@@ -27,7 +27,9 @@ module Decidim
         extensions = {
           # no lax_spacing so that it is easier to group paragraphs in articles.
           lax_spacing: false,
-          fenced_code_blocks: true
+          fenced_code_blocks: true,
+          autolink: true,
+          underline: true
         }
         parser = ::Redcarpet::Markdown.new(renderer, extensions)
         parser.render(document)
@@ -110,6 +112,18 @@ module Decidim
         "<img #{attrs}/>"
       end
 
+      def emphasis(text)
+        "<em>#{text}</em>"
+      end
+
+      def double_emphasis(text)
+        "<strong>#{text}</strong>"
+      end
+
+      def underline(text)
+        "<u>#{text}</u>"
+      end
+
       private
 
       def create_proposal(title, body, participatory_text_level)

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.16.1"
+      "0.17.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -158,84 +158,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -250,6 +250,8 @@ files:
 - app/assets/config/admin/decidim_proposals_manifest.js
 - app/assets/config/decidim_proposals_manifest.css
 - app/assets/config/decidim_proposals_manifest.js
+- app/assets/documents/decidim/proposals/participatory_texts/participatory_text.md
+- app/assets/documents/decidim/proposals/participatory_texts/participatory_text.odt
 - app/assets/images/decidim/gamification/badges/accepted_proposals.svg
 - app/assets/images/decidim/gamification/badges/proposal_votes.svg
 - app/assets/images/decidim/gamification/badges/proposals.svg
@@ -448,6 +450,7 @@ files:
 - app/views/decidim/proposals/collaborative_drafts/_new_collaborative_draft_button.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_reject_request_access_form.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_request_access_form.html.erb
+- app/views/decidim/proposals/collaborative_drafts/_wizard_aside.html.erb
 - app/views/decidim/proposals/collaborative_drafts/compare.html.erb
 - app/views/decidim/proposals/collaborative_drafts/complete.html.erb
 - app/views/decidim/proposals/collaborative_drafts/edit.html.erb
@@ -500,6 +503,7 @@ files:
 - config/locales/ar-SA.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
+- config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es-MX.yml
@@ -507,6 +511,7 @@ files:
 - config/locales/es.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
+- config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/gl.yml
@@ -588,7 +593,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="