decidim-meetings 0.14.4 → 0.15.0

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

@@ -6,8 +6,9 @@ module Decidim
     module MapHelper
       # Serialize a collection of geocoded meetings to be used by the dynamic map component
       #
-      # geocoded_meetings - A collection of geocoded meetings
-      def meetings_data_for_map(geocoded_meetings)
+      # meetings - A collection of meetings
+      def meetings_data_for_map(meetings)
+        geocoded_meetings = meetings.select(&:geocoded?)
         geocoded_meetings.map do |meeting|
           meeting.slice(:latitude, :longitude, :address).merge(title: translated_attribute(meeting.title),
                                                                description: translated_attribute(meeting.description),
@@ -18,7 +19,7 @@ module Decidim
                                                                icon: icon("meetings", width: 40, height: 70, remove_icon_class: true),
                                                                location: translated_attribute(meeting.location),
                                                                locationHints: translated_attribute(meeting.location_hints),
-                                                               link: meeting_path(meeting))
+                                                               link: resource_locator(meeting).path)
         end
       end
     end

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

@@ -9,7 +9,6 @@ module Decidim
       include Decidim::Meetings::MeetingsHelper
       include Decidim::SanitizeHelper
       include Decidim::Meetings::Engine.routes.url_helpers
-
       def description
         decidim_sanitize meeting_description(model)
       end

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

@@ -16,7 +16,7 @@ module Decidim
       # Returns the meeting's description truncated.
       def meeting_description(meeting, max_length = 120)
         link = resource_locator(meeting).path
-        description = translated_attribute(meeting.description)
+        description = present(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

data/app/mailers/decidim/meetings/admin/invite_join_meeting_mailer.rb

@@ -8,9 +8,11 @@ module Decidim
       class InviteJoinMeetingMailer < Decidim::ApplicationMailer
         include Decidim::TranslationsHelper
         include Decidim::SanitizeHelper
+        include Decidim::ApplicationHelper
 
         helper Decidim::ResourceHelper
         helper Decidim::TranslationsHelper
+        helper Decidim::ApplicationHelper
 
         helper_method :routes
 

data/app/mailers/decidim/meetings/registration_mailer.rb

@@ -7,9 +7,11 @@ module Decidim
     class RegistrationMailer < Decidim::ApplicationMailer
       include Decidim::TranslationsHelper
       include ActionView::Helpers::SanitizeHelper
+      include Decidim::ApplicationHelper
 
       helper Decidim::ResourceHelper
       helper Decidim::TranslationsHelper
+      helper Decidim::ApplicationHelper
 
       def confirmation(user, meeting, registration)
         with_user(user) do
@@ -33,8 +35,8 @@ module Decidim
         calendar.event do |event|
           event.dtstart = Icalendar::Values::DateTime.new(@meeting.start_time)
           event.dtend = Icalendar::Values::DateTime.new(@meeting.end_time)
-          event.summary = translated_attribute @meeting.title
-          event.description = strip_tags(translated_attribute(@meeting.description))
+          event.summary = present(@meeting).title
+          event.description = strip_tags(present(@meeting).description)
           event.location = @meeting.address
           event.geo = [@meeting.latitude, @meeting.longitude]
           event.url = @locator.url

data/app/models/decidim/meetings/meeting.rb

@@ -17,6 +17,7 @@ module Decidim
       include Decidim::Searchable
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::Hashtaggable
 
       belongs_to :organizer, foreign_key: "organizer_id", class_name: "Decidim::User", optional: true
       has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
@@ -41,6 +42,8 @@ module Decidim
                                     or private_meeting = ? or (private_meeting = ? and transparent = ?)", true, user, false, true, true).distinct
                                   }
 
+      scope :visible, -> { where("decidim_meetings_meetings.private_meeting != ? OR decidim_meetings_meetings.transparent = ?", true, true) }
+
       searchable_fields({
                           scope_id: :decidim_scope_id,
                           participatory_space: { component: :participatory_space },

data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb

@@ -15,6 +15,10 @@ module Decidim
       class MeetingPresenter < Decidim::Log::BasePresenter
         private
 
+        def resource_presenter
+          @resource_presenter ||= Decidim::Meetings::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
+        end
+
         def diff_fields_mapping
           {
             address: :string,
@@ -22,12 +26,12 @@ module Decidim
             attending_organizations: :string,
             closed_at: :date,
             closing_report: :i18n,
-            description: :i18n,
+            description: "Decidim::Meetings::AdminLog::ValueTypes::MeetingTitleDescriptionPresenter",
             end_date: :date,
             location: :i18n,
             location_hints: :i18n,
             start_date: :date,
-            title: :i18n,
+            title: "Decidim::Meetings::AdminLog::ValueTypes::MeetingTitleDescriptionPresenter",
             private_meeting: :boolean,
             transparent: :boolean,
             organizer_id: "Decidim::Meetings::AdminLog::ValueTypes::OrganizerPresenter"

data/app/presenters/decidim/meetings/admin_log/value_types/meeting_title_description_presenter.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module AdminLog
+      module ValueTypes
+        # This class presents the given value as a Decidim::Meetings::MeetingTitleBody. Check
+        # the `DefaultPresenter` for more info on how value presenters work.
+        class MeetingTitleDescriptionPresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          def present
+            return unless value
+
+            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.translated_attribute(value))
+            renderer.render_without_link.html_safe
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/meetings/log/resource_presenter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Log
+      class ResourcePresenter < Decidim::Log::ResourcePresenter
+        private
+
+        # Private: Presents resource name.
+        #
+        # Returns an HTML-safe String.
+        def present_resource_name
+          Decidim::Meetings::MeetingPresenter.new(resource).title
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    #
+    # Decorator for meetings
+    #
+    class MeetingPresenter < SimpleDelegator
+      include Decidim::TranslationsHelper
+
+      def meeting
+        __getobj__
+      end
+
+      def title
+        return unless meeting
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_attribute(meeting.title))
+        renderer.render_without_link.html_safe
+      end
+
+      def html_title
+        return unless meeting
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_attribute(meeting.title))
+        renderer.render.html_safe
+      end
+
+      def description
+        return unless meeting
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_attribute(meeting.description))
+        renderer.render_without_link.html_safe
+      end
+
+      def html_description
+        return unless meeting
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_attribute(meeting.description))
+        renderer.render.html_safe
+      end
+    end
+  end
+end

data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Metrics
+      class MeetingsMetricManage < Decidim::MetricManage
+        def metric_name
+          "meetings"
+        end
+
+        def save
+          return @registry if @registry
+
+          @registry = []
+          cumulative.each do |key, cumulative_value|
+            next if cumulative_value.zero?
+            quantity_value = quantity[key] || 0
+            category_id, space_type, space_id = key
+            record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
+                                                           organization: @organization, decidim_category_id: category_id,
+                                                           participatory_space_type: space_type, participatory_space_id: space_id)
+            record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
+            @registry << record
+          end
+          @registry.each(&:save!)
+          @registry
+        end
+
+        private
+
+        def query
+          return @query if @query
+
+          spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
+            manifest.participatory_spaces.call(@organization).public_spaces
+          end
+          components = Decidim::Component.where(participatory_space: spaces).published
+          @query = Decidim::Meetings::Meeting.where(component: components).joins(:component)
+                                             .left_outer_joins(:category).visible
+          @query = @query.where("decidim_meetings_meetings.created_at <= ?", end_time)
+          @query = @query.group("decidim_categorizations.decidim_category_id",
+                                :participatory_space_type,
+                                :participatory_space_id)
+          @query
+        end
+
+        def quantity
+          @quantity ||= query.where("decidim_meetings_meetings.created_at >= ?", start_time).count
+        end
+      end
+    end
+  end
+end

data/app/services/decidim/meetings/meeting_search.rb

@@ -11,7 +11,8 @@ module Decidim
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
       def initialize(options = {})
-        super(Meeting.all, options)
+        scope = options.fetch(:scope, Meeting.all)
+        super(scope, options)
       end
 
       # Handle the search_text filter
@@ -30,6 +31,12 @@ module Decidim
         end
       end
 
+      def search_space
+        return query if options[:space].blank? || options[:space] == "all"
+
+        query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].classify })
+      end
+
       private
 
       # Internal: builds the needed query to search for a text in the organization's

data/app/views/decidim/meetings/admin/agenda/_form.html.erb

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <div class="flex--sbc">
         <div class="grid-x align-middle">
-          <u> <%= translated_attribute(meeting.title) %> </u> &nbsp;<%= icon "arrow-right" %>&nbsp;<%= title %>
+          <u> <%= present(@meeting).title %> </u> &nbsp;<%= icon "arrow-right" %>&nbsp;<%= title %>
         </div>
       </div>
     </h2>

data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb

@@ -4,5 +4,5 @@
   <%= t ".invited_you_to_join_a_meeting", invited_by: @invited_by.name, application: @user.organization.name %>
 </p>
 
-<p><%= link_to t(".decline", meeting_title: translated_attribute(@meeting.title)),routes.decline_invitation_meeting_registration_path(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
-<p><%= link_to t(".join", meeting_title: translated_attribute(@meeting.title)),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
+<p><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.decline_invitation_meeting_registration_path(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
+<p><%= link_to t(".join", meeting_title: present(@meeting).title),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>

data/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb

@@ -24,9 +24,9 @@
     <div class="row column">
       <% if @form.proposals %>
         <%= form.select :proposal_ids,
-                        @form.proposals.order(title: :asc).pluck(:title, :id),
-                        { include_blank: true },
-                        { multiple: true, class: "chosen-select" } %>
+                      @form.proposals.order(title: :asc).map{|proposal| [present(proposal).title, proposal.id]},
+                      { include_blank: true },
+                      { multiple: true, class: "chosen-select" } %>
       <% end %>
     </div>
   </div>

data/app/views/decidim/meetings/admin/meeting_copies/_form.html.erb

@@ -5,11 +5,11 @@
 
   <div class="card-section">
     <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
+      <%= form.translated :text_field, :title, autofocus: true, value: present(@meeting).title %>
     </div>
 
     <div class="row column">
-      <%= form.translated :editor, :description %>
+      <%= form.translated :editor, :description, value: present(@meeting).description %>
     </div>
 
     <div class="row column">

data/app/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -3,12 +3,12 @@
     <h2 class="card-title"><%= title %></h2>
   </div>
   <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true  %>
+    <div class="row column  hashtags__container">
+      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, value: @meeting.present? ? present(@meeting).title : "" %>
     </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :description, class: "js-hashtags", hashtaggable: true  %>
+    <div class="row column hashtags__container">
+      <%= form.translated :editor, :description, class: "js-hashtags", hashtaggable: true, value: @meeting.present? ? present(@meeting).title : "" %>
     </div>
 
     <div class="row column">

data/app/views/decidim/meetings/admin/meetings/index.html.erb

@@ -25,7 +25,7 @@
           <% meetings.each do |meeting| %>
             <tr data-id="<%= meeting.id %>">
               <td>
-                <%= translated_attribute(meeting.title) %><br />
+                <%= present(meeting).title %><br />
               </td>
               <td>
                 <% if meeting.start_time %>

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

@@ -0,0 +1,14 @@
+<% if meetings.length == 0 %>
+  <div class="callout warning">
+    <%= t "decidim.meetings.meetings.meetings.no_meetings_warning" %>
+  </div>
+<% else %>
+  <%= render partial: "decidim/shared/results_per_page" %>
+
+  <div class="row small-up-1 medium-up-2 card-grid">
+    <% meetings.each do |meeting| %>
+      <%= card_for meeting %>
+    <% end %>
+  </div>
+  <%= decidim_paginate meetings, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>
+<% end %>

data/app/views/decidim/meetings/directory/meetings/index.html.erb

@@ -0,0 +1,34 @@
+<div class="wrapper">
+  <div class="row">
+    <h1 class="section-heading"><%= t(".meetings") %></h1>
+
+    <%= cell "decidim/meetings/meetings_map", search.results %>
+
+    <div class="columns mediumlarge-4 large-3">
+      <div class="card card--secondary show-for-mediumlarge">
+        <%= filter_form_for filter, meetings_directory.root_path do |form| %>
+          <div class="filters__section">
+            <div class="filters__search">
+              <div class="input-group">
+                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+                <div class="input-group-button">
+                  <button type="submit" class="button button--muted">
+                    <%= icon "magnifying-glass", aria_label: t(".search") %>
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
+          <%= form.collection_radio_buttons :space, @meeting_spaces, :first, :last, legend_title: t(".space_type") %>
+        <% end %>
+      </div>
+    </div>
+    <div id="meetings" class="columns mediumlarge-8 large-9">
+      <%= render partial: "meetings" %>
+    </div>
+  </div>
+</div>
+
+<%= javascript_include_tag("decidim/filters") %>

data/app/views/decidim/meetings/directory/meetings/index.js.erb

@@ -0,0 +1,11 @@
+var $meetings = $('#meetings');
+
+$meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
+
+var $dropdownMenu = $('.dropdown.menu', $meetings);
+$dropdownMenu.foundation();
+
+window.Decidim.currentMap = window.Decidim.loadMap(
+  'map',
+  JSON.parse('<%= escape_javascript meetings_data_for_map(search.results).to_json.html_safe %>')
+);

data/app/views/decidim/meetings/meeting_widgets/show.html.erb

@@ -1,4 +1,4 @@
-<%= content_for(:title, translated_attribute(model.title)) %>
+<%= content_for(:title, present(model).title) %>
 <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
 <%= decidim_sanitize meeting_description(model) %>
 <div class="address card__extra">

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

@@ -4,7 +4,7 @@
       <article class="card card--meeting">
         <div class="card__content">
           <%= link_to resource_locator(meeting).path, class: "card__link" do %>
-            <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
+            <h5 class="card__title"><%= present(meeting).title %></h5>
           <% end %>
           <div class="card__datetime">
             <div class="card__datetime__date">
@@ -14,7 +14,7 @@
               <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
             </div>
           </div>
-          <%= decidim_sanitize translated_attribute meeting.description %>
+          <%= decidim_sanitize( present(meeting).description ) %>
         </div>
       </article>
     </div>

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

@@ -1,38 +1,6 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
-<%= dynamic_map_for meetings_data_for_map(geocoded_meetings) do %>
-  <template id="marker-popup">
-    <div class="map-info__content">
-      <h3>${title}</h3>
-      <div id="bodyContent">
-        <p>{{html description}}</p>
-        <div class="map__date-adress">
-          <div class="card__datetime">
-            <div class="card__datetime__date">
-              ${startTimeDay} <span class="card__datetime__month">${startTimeMonth} ${startTimeYear}</span>
-            </div>
-            <div class="card__datetime__time">${starTime}</div>
-          </div>
-          <div class="address card__extra">
-            <div class="address__icon">{{html icon}}</div>
-            <div class="address__details">
-              <strong>{{html location}}</strong><br />
-              <span>${address}</span><br />
-              <span>{{html locationHints}}</span>
-            </div>
-          </div>
-        </div>
-        <div class="map-info__button">
-          <a href="${link}" class="button button--sc">
-            <%= t(".view_meeting") %>
-          </a>
-        </div>
-      </div>
-    </div>
-  </template>
-  <%= stylesheet_link_tag "decidim/map" %>
-  <%= javascript_include_tag "decidim/map" %>
-<% end %>
+<%= cell "decidim/meetings/meetings_map", search.results %>
 
 <div class="row">
   <div class="columns mediumlarge-4 large-3">

data/app/views/decidim/meetings/meetings/index.js.erb

@@ -7,5 +7,5 @@ $dropdownMenu.foundation();
 
 window.Decidim.currentMap = window.Decidim.loadMap(
   'map',
-  JSON.parse('<%= escape_javascript meetings_data_for_map(geocoded_meetings).to_json.html_safe %>')
+  JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.select(&:geocoded?)).to_json.html_safe %>')
 );

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

@@ -1,8 +1,8 @@
-<% provide(:title, translated_attribute(meeting.title)) %>
+<% provide(:title, present(meeting).title) %>
 
 <% add_decidim_meta_tags({
-  title: translated_attribute(meeting.title),
-  description: translated_attribute(meeting.description),
+  title: present(meeting).title,
+  description: present(meeting).description,
   url: meeting_url(meeting.id)
 }) %>
 
@@ -16,7 +16,7 @@ edit_link(
 %>
 
 <div class="row column view-header">
-  <h2 class="heading2"><%= translated_attribute meeting.title %></h2>
+  <h2 class="heading2"><%= present(meeting).html_title %></h2>
   <% if meeting.organizer.present? %>
     <%= render partial: "decidim/shared/author_reference", locals: { author: present(meeting.organizer) } %>
   <% end %>
@@ -92,7 +92,7 @@ edit_link(
           <%= t("transparent", scope: "decidim.meetings.types") %>
         </span>
       <% end %>
-      <p><%= decidim_sanitize translated_attribute meeting.description %></p>
+      <p><%= decidim_sanitize(present(meeting).html_description) %></p>
       <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
       <%= render partial: "decidim/shared/tags", locals: { resource: meeting, tags_class_extra: "tags--meeting" } %>
     </div>

data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb

@@ -1,4 +1,4 @@
-<p><%= t(".confirmed_html", title: translated_attribute(@meeting.title), url: @locator.url) %></p>
+<p><%= t(".confirmed_html", title: present(@meeting).title, url: @locator.url) %></p>
 
 <p><%= t(".registration_code", code: @registration.code) %></p>
 

data/app/views/decidim/participatory_processes/participatory_process_groups/_meeting.html.erb

@@ -2,7 +2,7 @@
   <article class="card card--meeting">
     <div class="card__content">
       <%= link_to resource_locator(meeting).path, class: "card__link" do %>
-        <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
+        <h5 class="card__title"><%= present(meeting).title %></h5>
       <% end %>
       <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: meeting } %>
     </div>

data/app/views/decidim/participatory_spaces/_conference_venues.html.erb

@@ -0,0 +1,20 @@
+<% if meetings.any? %>
+<hr class="reset mt-none mb-m" />
+<section class="section" id="venues">
+  <h4 class="section-heading"><%= t("conference_venues", scope: "decidim.meetings") %></h4>
+  <div class="row">
+    <div class="column medium-4">
+      <% meetings.each do |meeting_block| %>
+        <% meeting_block.last.each_with_index do |meeting, index| %>
+          <% next if index != 0 %>
+          <%== cell("decidim/conferences/conference_address", meeting) %>
+        <% end %>
+      <% end %>
+
+      </div>
+    <div class="column medium-8">
+      <%= cell "decidim/meetings/meetings_map", meetings_geocoded %>
+    </div>
+  </div>
+</section>
+<% end %>

data/config/locales/ca.yml

@@ -20,6 +20,7 @@ ca:
         end_time: Hora de finalització
         location: Ubicació
         location_hints: Detalls d'ubicació
+        organizer_id: Organitzador
         private_meeting: Trobada privada
         registration_terms: Termes i condicions de l'inscripció
         registrations_enabled: Inscripcions obertes
@@ -121,6 +122,18 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir des de l'enllaç anterior.
           email_subject: En menys de 48 hores s'iniciarà la trobada "%{resource_title}".
           notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> començarà en menys de 48 hores.
+    gamification:
+      badges:
+        attended_meetings:
+          conditions:
+            - Inscriu-te a les reunions que vulguis assistir
+          description: Aquest distintiu s'aconsegueix assistint a diverses reunions presencials.
+          description_another: Aquest usuari ha assistit a %{score} trobades.
+          description_own: Has assistit a %{score} trobades.
+          name: Torbades a les que has assistit
+          next_level_in: Assisteix a més de %{score} reunions per arribar al següent nivell!
+          unearned_another: Aquest usuari encara no ha assistit a cap reunió.
+          unearned_own: Encara no has assistit a cap reunió.
     meetings:
       actions:
         agenda: Ordre del dia
@@ -284,6 +297,24 @@ ca:
         minutes:
           create: "%{user_name} ha creat l'acta de la reunió %{resource_name} a l'espai %{space_name}"
           update: "%{user_name} va ha actualitzat l'acta de la reunió %{resource_name} a l'espai %{space_name}"
+      conference_venues: Seus de les jornades
+      content_blocks:
+        upcoming_events:
+          name: Propers esdeveniments
+          upcoming_events: Properes reunions
+          view_all_events: Veure-ho tot
+      directory:
+        meetings:
+          index:
+            all: Totes
+            date: Data
+            meetings: Trobades
+            past: Passades
+            search: Cercar
+            space_type: Espai participatiu
+            upcoming: Properes
+      last_activity:
+        new_meeting_at_html: "<span>Nova trobada a %{link}</span>"
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -306,8 +337,6 @@ ca:
           filter: Filtra
           filter_by: Filtra per
           unfold: Desplegar
-        index:
-          view_meeting: Veure trobada
         meeting_minutes:
           meeting_minutes: Minuts de trobada
           related_information: Informació relacionada
@@ -329,6 +358,8 @@ ca:
             one: 1 espai reservat restant
             other: "%{count} inscripcions restants"
           view: Veure
+      meetings_map:
+        view_meeting: Veure trobada
       models:
         invite:
           fields:
@@ -366,6 +397,10 @@ ca:
       types:
         private_meeting: Trobada privada
         transparent: Transparent
+    metrics:
+      meetings:
+        object: trobades
+        title: Trobades
     participatory_processes:
       participatory_process_groups:
         highlighted_meetings: