decidim-meetings 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c330c757c4af5ac77b71b800e9dfecaa43845fa0
-  data.tar.gz: 263f7b2fe5528e4fe6cbe72968d18708bb33c4db
+  metadata.gz: 1e1935c7a65315c1f203a18c337507e81c0ee419
+  data.tar.gz: c07d382cb3c15ff98a223774c4ce887def22ec91
 SHA512:
-  metadata.gz: '09b9f8e4321b70e5514c08721c926954e78a4595fd1b97a0924d73f8301e537ecf16fe978ecdc0fb5c8bf876e53509768d857388a6adce50eb7d976c9b98c337'
-  data.tar.gz: aaa89f269b13853e5fc697a509a3b77a4440ad5e3128d1e0827a89c21dd61ca1d54cdc44a863fdbf839084119f54e016dd84411c45b97f55b17e2febb22f1c16
+  metadata.gz: c1947fb5ba43a959f61b98b196967ed6942ea5fad7c143cbdf566262c8329ce79726409751551bb43f0e070fa0bc092bb86bde1e8f0dd82ca93da5f5497ba580
+  data.tar.gz: fa2cf0e98814662052e6c935a4177f9c6a5bf4e7d4618334084ff521f91ccd25ac659600a0be5811f5b98bae25dfb1d8d4929e8d7e147a69b901a18740ff00d2

data/app/helpers/decidim/meetings/application_helper.rb

@@ -8,6 +8,7 @@ module Decidim
       include PaginateHelper
       include Decidim::MapHelper
       include Decidim::Meetings::MapHelper
+      include Decidim::Meetings::MeetingsHelper
     end
   end
 end

data/app/helpers/decidim/meetings/meetings_helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # Custom helpers used in meetings views
+    module MeetingsHelper
+      include Decidim::ApplicationHelper
+      include Decidim::TranslationsHelper
+
+      # Public: truncates the meeting description
+      #
+      # meeting - a Decidim::Meeting instance
+      # max_length - a number to limit the length of the description
+      #
+      # Returns the meeting's description truncated.
+      def meeting_description(meeting, max_length = 120)
+        link = decidim_meetings.meeting_path(meeting, feature_id: meeting.feature, participatory_process_id: meeting.feature.participatory_process)
+        description = translated_attribute(meeting.description)
+        tail = "... #{link_to(t("read_more", scope: "decidim.meetings"), link)}".html_safe
+        CGI.unescapeHTML html_truncate(description, max_length: max_length, tail: tail)
+      end
+    end
+  end
+end

data/app/views/decidim/meetings/meetings/_meetings.html.erb

@@ -17,7 +17,7 @@
             <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
           <% end %>
           <%= render partial: "datetime", locals: { meeting: meeting } %>
-          <%== translated_attribute meeting.description %>
+          <%== meeting_description(meeting) %>
           <%= render partial: "tags", locals: { meeting: meeting } %>
           <div class="address card__extra">
             <div class="address__icon">

data/config/locales/ca.yml

@@ -90,6 +90,7 @@ ca:
             map: Mapa
             start_time: Data d'inici
             title: Títol
+      read_more: "(Llegeix més)"
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Resultats relacionats:'

data/config/locales/en.yml

@@ -51,7 +51,7 @@ en:
           index:
             title: Meetings
           new:
-            create: Create 
+            create: Create
             title: Create meeting
           update:
             invalid: There's been a problem updating this meeting
@@ -93,6 +93,7 @@ en:
             map: Map
             start_time: Start date
             title: Title
+      read_more: "(read more)"
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Related results:'

data/config/locales/es.yml

@@ -90,6 +90,7 @@ es:
             map: Mapa
             start_time: Fecha de inicio
             title: Título
+      read_more: "(leer más)"
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Resultados relacionados:'

data/config/locales/fr.yml

@@ -10,7 +10,7 @@ fr:
       meeting:
         address: Adresse
         decidim_category_id: Catégorie
-        decidim_scope_id: Domaine d'application
+        decidim_scope_id: Zone d'application
         description: Description
         end_time: Heure de fin
         location: Lieu
@@ -24,7 +24,7 @@ fr:
     meetings:
       actions:
         attachments: Documents liés
-        close: Fermer
+        close: Clore
         confirm_destroy: Êtes-vous sûr de vouloir supprimer cette rencontre?
         destroy: Supprimer
         edit: Modifier
@@ -34,7 +34,7 @@ fr:
       admin:
         meeting_closes:
           edit:
-            close: Fermer
+            close: Clore
             title: Clore la rencontre
         meetings:
           close:
@@ -64,7 +64,7 @@ fr:
           category_prompt: Sélectionner une catégorie
           date: Date
           past: Passées
-          scopes: Domaines d'application
+          scopes: Zone d'application
           search: Rechercher
           upcoming: À venir
         filters_small_view:
@@ -95,5 +95,5 @@ fr:
         meeting_results: 'Résultats associés :'
         result_meetings: 'Rencontres connexes :'
       proposals_from_meeting:
-        meeting_proposals: 'Propositions connexes :'
+        meeting_proposals: 'Propositions créées à cette rencontre :'
         proposal_meetings: 'Rencontre connexes :'

data/lib/decidim/meetings/feature.rb

@@ -24,7 +24,7 @@ Decidim.register_feature(:meetings) do |feature|
   end
 
   feature.seeds do
-    Decidim::ParticipatoryProcess.all.each do |process|
+    Decidim::ParticipatoryProcess.find_each do |process|
       next unless process.steps.any?
 
       feature = Decidim::Feature.create!(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -116,56 +116,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 description: A meetings component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -193,6 +193,7 @@ files:
 - app/helpers/decidim/meetings/admin/application_helper.rb
 - app/helpers/decidim/meetings/application_helper.rb
 - app/helpers/decidim/meetings/map_helper.rb
+- app/helpers/decidim/meetings/meetings_helper.rb
 - app/models/decidim/meetings/application_record.rb
 - app/models/decidim/meetings/meeting.rb
 - app/services/decidim/meetings/meeting_search.rb