decidim-meetings 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61079b47c6d465bf1466d69ca7b4760e4bef2a70dc822ba2490dd0e9dd1fa659
-  data.tar.gz: 32f5633ee88cc041bb014103695e9f2babb6bc7281c88155c1c3a2774d41de9d
+  metadata.gz: 3493a74548421f55b6a89175eb56a4033ae876c525a0ca53fdc74ebf8a6937f2
+  data.tar.gz: c394ccff7f76d78b7cc4f95386effad8e4642842627b1e969c9f96e0ea9473fb
 SHA512:
-  metadata.gz: f783a48a57a1c436c0b6e50795313a63adeb604ad20cc2c8389164197d4bd168cc610ce74490f910a33d3500fabd7e969256abbea67ed4409c00a6916667253c
-  data.tar.gz: 1cad2a321f83f67be4a04b3e334ba0ced1ba4779e2d6808a38c5872dc9b69e5eef4000b3d5f4ee150c5c5ce4ae7e2824e2034667da94c1f1731bfdf59c345ad2
+  metadata.gz: 27421ab6254ec7d9cbdfa9bba0f6f4489ccc5bde2521d44e04dd73e3213cc8d76832aec89448d3f9684c2f42d0d8d35806855a6617a4c30f61361783c0ea7c19
+  data.tar.gz: 62c9f79b113fea3964b51a619464b6110b90a7a439cad6c5671b0fcce113b2702979262b6f7d7eab1b9008f5d7f1904f9d5c09b8ee2b632ad08c95973768b34f

data/app/commands/decidim/meetings/admin/close_meeting.rb

@@ -34,13 +34,19 @@ module Decidim
         attr_reader :form, :meeting
 
         def close_meeting
-          meeting.update_attributes!(
-            closing_report: form.closing_report,
-            attendees_count: form.attendees_count,
-            contributions_count: form.contributions_count,
-            attending_organizations: form.attending_organizations,
-            closed_at: form.closed_at
-          )
+          Decidim.traceability.perform_action!(
+            :close,
+            meeting,
+            form.current_user
+          ) do
+            meeting.update!(
+              closing_report: form.closing_report,
+              attendees_count: form.attendees_count,
+              contributions_count: form.contributions_count,
+              attending_organizations: form.attending_organizations,
+              closed_at: form.closed_at
+            )
+          end
 
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.meeting_closed",

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -19,6 +19,7 @@ module Decidim
           transaction do
             create_meeting!
             schedule_upcoming_meeting_notification
+            send_notification
           end
 
           broadcast(:ok, @meeting)
@@ -27,7 +28,9 @@ module Decidim
         private
 
         def create_meeting!
-          @meeting = Meeting.create!(
+          @meeting = Decidim.traceability.create!(
+            Meeting,
+            @form.current_user,
             scope: @form.scope,
             category: @form.category,
             title: @form.title,
@@ -50,6 +53,15 @@ module Decidim
             .set(wait_until: @meeting.start_time - 2.days)
             .perform_later(@meeting.id, checksum)
         end
+
+        def send_notification
+          Decidim::EventsManager.publish(
+            event: "decidim.events.meetings.meeting_created",
+            event_class: Decidim::Meetings::CreateMeetingEvent,
+            resource: @meeting,
+            recipient_ids: @meeting.participatory_space.followers.pluck(:id)
+          )
+        end
       end
     end
   end

data/app/commands/decidim/meetings/admin/destroy_meeting.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This command is executed when the user destroys a Meeting from the admin
+      # panel.
+      class DestroyMeeting < Rectify::Command
+        # Initializes a CloseMeeting Command.
+        #
+        # meeting - The current instance of the page to be closed.
+        # current_user - the user performing the action
+        def initialize(meeting, current_user)
+          @meeting = meeting
+          @current_user = current_user
+        end
+
+        # Destroys the meeting if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          destroy_meeting
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :current_user, :meeting
+
+        def destroy_meeting
+          Decidim.traceability.perform_action!(
+            :delete,
+            meeting,
+            current_user
+          ) do
+            meeting.destroy!
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -35,7 +35,9 @@ module Decidim
         attr_reader :form, :meeting
 
         def update_meeting!
-          meeting.update_attributes!(
+          Decidim.traceability.update!(
+            meeting,
+            form.current_user,
             scope: form.scope,
             category: form.category,
             title: form.title,

data/app/controllers/decidim/meetings/admin/attachment_collections_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # Controller that allows managing all the attachment collections for an assembly.
+      #
+      class AttachmentCollectionsController < Admin::ApplicationController
+        include Decidim::Admin::Concerns::HasAttachmentCollections
+
+        def after_destroy_path
+          meeting_attachment_collections_path(meeting, meeting.feature, current_participatory_space)
+        end
+
+        def collection_for
+          meeting
+        end
+
+        def meeting
+          @meeting ||= meetings.find(params[:meeting_id])
+        end
+
+        def authorization_object
+          meeting.feature
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/meetings/admin/meetings_controller.rb

@@ -46,11 +46,13 @@ module Decidim
         end
 
         def destroy
-          meeting.destroy!
-
-          flash[:notice] = I18n.t("meetings.destroy.success", scope: "decidim.meetings.admin")
+          DestroyMeeting.call(meeting, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("meetings.destroy.success", scope: "decidim.meetings.admin")
 
-          redirect_to meetings_path
+              redirect_to meetings_path
+            end
+          end
         end
       end
     end

data/app/events/decidim/meetings/create_meeting_event.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class CreateMeetingEvent < Decidim::Events::SimpleEvent
+    end
+  end
+end

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -11,6 +11,7 @@ module Decidim
         translatable_attribute :description, String
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
+
         attribute :address, String
         attribute :latitude, Float
         attribute :longitude, Float
@@ -30,7 +31,8 @@ module Decidim
         validates :current_feature, presence: true
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
-        validate { errors.add(:decidim_scope_id, :invalid) if current_participatory_space&.scope && !current_participatory_space&.scope&.ancestor_of?(scope) }
+
+        validate :scope_belongs_to_participatory_space_scope
 
         delegate :categories, to: :current_feature
 
@@ -46,8 +48,7 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          return unless current_feature
-          @scope ||= @decidim_scope_id ? current_feature.scopes.find_by(id: @decidim_scope_id) : current_participatory_space&.scope
+          @scope ||= @decidim_scope_id ? current_participatory_space.scopes.find_by(id: @decidim_scope_id) : current_participatory_space.scope
         end
 
         # Scope identifier
@@ -61,6 +62,12 @@ module Decidim
           return unless current_feature
           @category ||= categories.find_by(id: decidim_category_id)
         end
+
+        private
+
+        def scope_belongs_to_participatory_space_scope
+          errors.add(:decidim_scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
+        end
       end
     end
   end

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

@@ -35,7 +35,7 @@ module Decidim
         private
 
         def routes
-          @router ||= Decidim::EngineRouter.main_proxy(@meeting.feature)
+          @routes ||= Decidim::EngineRouter.main_proxy(@meeting.feature)
         end
       end
     end

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

@@ -7,12 +7,15 @@ module Decidim
     class Meeting < Meetings::ApplicationRecord
       include Decidim::Resourceable
       include Decidim::HasAttachments
+      include Decidim::HasAttachmentCollections
       include Decidim::HasFeature
       include Decidim::HasReference
-      include Decidim::HasScope
+      include Decidim::ScopableFeature
       include Decidim::HasCategory
       include Decidim::Followable
       include Decidim::Comments::Commentable
+      include Decidim::Traceable
+      include Decidim::Loggable
 
       has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
 
@@ -22,6 +25,13 @@ module Decidim
 
       geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.feature.organization.host } }
 
+      scope :past, -> { where(arel_table[:end_time].lteq(Time.current)) }
+      scope :upcoming, -> { where(arel_table[:start_time].gt(Time.current)) }
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Meetings::AdminLog::MeetingPresenter
+      end
+
       def closed?
         closed_at.present?
       end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Meetings::Meeting`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    MeetingPresenter.new(action_log, view_helpers).present
+      class MeetingPresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            address: :string,
+            attendees_count: :integer,
+            attending_organizations: :string,
+            closed_at: :date,
+            closing_report: :i18n,
+            description: :i18n,
+            end_date: :date,
+            location: :i18n,
+            location_hints: :i18n,
+            start_date: :date,
+            title: :i18n
+          }
+        end
+
+        def action_string
+          case action
+          when "close", "create", "delete", "update"
+            "decidim.meetings.admin_log.meeting.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.meeting"
+        end
+
+        def has_diff?
+          action == "close" || super
+        end
+      end
+    end
+  end
+end

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

@@ -57,6 +57,10 @@
                   <%= icon_link_to "lock-locked", edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
                 <% end %>
 
+                <% if can? :update, current_feature %>
+                    <%= icon_link_to "folder", meeting_attachment_collections_path(meeting), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
+                <% end %>
+
                 <% if can? :update, current_feature %>
                   <%= icon_link_to "paperclip", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
                 <% end %>

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

@@ -56,7 +56,7 @@
         </div>
       <% end %>
     </div>
-    <%= feature_reference(meeting) %>
+    <%= resource_reference(meeting) %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for meeting_meeting_widget_url(meeting, format: :js) %>
   </div>

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

@@ -0,0 +1,15 @@
+<% if upcoming_meetings.any? %>
+  <section class="section row collapse upcoming_meetings">
+    <h2 class="section-heading"><%= t(".upcoming_meetings") %></h2>
+    <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
+      <%= render partial: 'decidim/participatory_processes/participatory_process_groups/meeting', collection: upcoming_meetings %>
+    </div>
+  </section>
+<% elsif past_meetings.any? %>
+  <section class="section row collapse past_meetings">
+    <h2 class="section-heading"><%= t(".past_meetings") %></h2>
+    <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
+      <%= render partial: 'decidim/participatory_processes/participatory_process_groups/meeting', collection: past_meetings %>
+    </div>
+  </section>
+<% end %>

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

@@ -0,0 +1,10 @@
+<div class="column">
+  <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>
+      <% end %>
+      <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: meeting } %>
+    </div>
+  </article>
+</div>

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

@@ -0,0 +1,19 @@
+<% if upcoming_meetings.any? %>
+  <div class="section upcoming_meetings">
+    <h4 class="section-heading">
+      <%= t(".upcoming_meetings") %> <a href="<%= main_feature_path(upcoming_meetings.first.feature) %>" class="text-small"><%= t(".see_all_meetings") %></a>
+    </h4>
+    <div class="card card--list">
+      <%= render partial: 'decidim/participatory_spaces/meeting', collection: upcoming_meetings %>
+    </div>
+  </div>
+<% elsif past_meetings.any? %>
+  <div class="section past_meetings">
+    <h4 class="section-heading">
+      <%= t(".past_meetings") %> <a href="<%= main_feature_path(past_meetings.first.feature) %>" class="text-small"><%= t(".see_all_meetings") %></a>
+    </h4>
+    <div class="card card--list">
+      <%= render partial: 'decidim/participatory_spaces/meeting', collection: past_meetings %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,14 @@
+<div class="card--list__item">
+  <div class="card--list__text">
+    <div>
+      <a href="<%= resource_locator(meeting).path %>" class="card__link">
+        <h6 class="card--list__heading heading6">
+          <%= translated_attribute meeting.title %>
+        </h6>
+        <span class="text-medium">
+          <%= l meeting.start_time, format: :decidim_day_of_year %> - <%= l meeting.start_time, format: :time_of_day %> - <%= l meeting.end_time, format: :time_of_day %>
+        </span>
+      </a>
+    </div>
+  </div>
+</div>

data/config/locales/ca.yml

@@ -19,7 +19,7 @@ ca:
         registration_terms: Termes i condicions de l'inscripció
         registrations_enabled: Inscripcions obertes
         start_time: Hora d'inici
-        title: Editar trobada
+        title: Títol
   decidim:
     events:
       meetings:
@@ -28,6 +28,11 @@ 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: S'ha tancat la trobada "%{resource_title}"
           notification_title: La trobada de <a href="%{resource_path}">%{resource_title}</a> s'ha tancat.
+        meeting_created:
+          email_intro: S'ha afegit la trobada "%{resource_title}" a l'espai "%{participatory_space_title}" que estàs seguint.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
+          email_subject: Nova trobada a %{participatory_space_title}
+          notification_title: S'ha afegit la trobada <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}
         meeting_registrations_over_percentage:
           email_intro: La disponibilitat d'espais a la trobada "%{resource_title}" està per sobre del %{percentage}%.
           email_outro: Has rebut aquesta notificació perquè ets un administrador de l'espai participatiu d'aquesta trobada.
@@ -62,6 +67,7 @@ ca:
             comments_blocked: Comentaris bloquejats
     meetings:
       actions:
+        attachment_collections: Col·leccions
         attachments: Adjunts
         close: Tancar
         confirm_destroy: Segur que vols suprimir aquesta trobada?
@@ -124,6 +130,12 @@ ca:
           update:
             invalid: S'ha produït un problema en desar la configuració de la inscripció.
             success: La configuració de les inscripcions de la trobada s'ha desat correctament.
+      admin_log:
+        meeting:
+          close: "%{user_name} ha tancat la trobada %{resource_name} a l'espai %{space_name}"
+          create: "%{user_name} ha creat la trobada %{resource_name} a l'espai %{space_name}"
+          delete: "%{user_name} ha eliminat la trobada %{resource_name} a l'espai %{space_name}"
+          update: "%{user_name} ha actualitzat la trobada %{resource_name} a l'espai %{space_name}"
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -183,6 +195,16 @@ ca:
         destroy:
           invalid: Hi ha hagut un problema en sortir d'aquesta trobada.
           success: Heu deixat la trobada amb èxit.
+    participatory_processes:
+      participatory_process_groups:
+        highlighted_meetings:
+          past_meetings: Trobades anteriors
+          upcoming_meetings: Properes trobades
+    participatory_spaces:
+      highlighted_meetings:
+        past_meetings: Trobades anteriors
+        see_all_meetings: Veure totes les trobades
+        upcoming_meetings: Properes rrobades
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Resultats relacionats:'

data/config/locales/en.yml

@@ -29,6 +29,11 @@ en:
           email_outro: You have received this notification because you are following the "%{resource_title}" meeting. You can unfollow it from the previous link.
           email_subject: The "%{resource_title}" meeting was closed
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting was closed.
+        meeting_created:
+          email_intro: The meeting "%{resource_title}" has been added to "%{participatory_space_title}" that you are following.
+          email_outro: You have received this notification because you are following "%{participatory_space_title}". You can unfollow it from the previous link.
+          email_subject: New meeting added to %{participatory_space_title}
+          notification_title: The meeting <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title}
         meeting_registrations_over_percentage:
           email_intro: The "%{resource_title}" meeting occupied slots are over %{percentage}%.
           email_outro: You have received this notification because you are an admin of the meeting's participatory space.
@@ -63,6 +68,7 @@ en:
             comments_blocked: Comments blocked
     meetings:
       actions:
+        attachment_collections: Collections
         attachments: Attachments
         close: Close
         confirm_destroy: Are you sure you want to delete this meeting?
@@ -126,6 +132,12 @@ en:
           update:
             invalid: There's been a problem saving the registration settings.
             success: Meeting registrations settings successfully saved.
+      admin_log:
+        meeting:
+          close: "%{user_name} closed the %{resource_name} meeting on the %{space_name} space"
+          create: "%{user_name} created the %{resource_name} meeting on the %{space_name} space"
+          delete: "%{user_name} deleted the %{resource_name} meeting on the %{space_name} space"
+          update: "%{user_name} updated the %{resource_name} meeting on the %{space_name} space"
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -186,6 +198,16 @@ en:
         destroy:
           invalid: There's been a problem leaving this meeting.
           success: You have left the meeting successfully.
+    participatory_processes:
+      participatory_process_groups:
+        highlighted_meetings:
+          past_meetings: Past meetings
+          upcoming_meetings: Upcoming meetings
+    participatory_spaces:
+      highlighted_meetings:
+        past_meetings: Past meetings
+        see_all_meetings: See all meetings
+        upcoming_meetings: Upcoming meetings
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Related results:'

data/config/locales/es.yml

@@ -28,6 +28,11 @@ es:
           email_outro: Has recibido esta notificación porque sigues el encuentro "%{resource_title}". Puedes dejar de seguirlo en el enlace anterior.
           email_subject: Se ha cerrado el encuentro "%{resource_title}"
           notification_title: El encuentro <a href="%{resource_path}">%{resource_title}</a> ha sido cerrada.
+        meeting_created:
+          email_intro: Se ha añadido el encuentro "%{resource_title}" al espacio "%{participatory_space_title}" que estás siguiendo.
+          email_outro: Has recibido esta notificación porque sigues "%{participatory_space_title}". Puedes dejar de seguirlo en el enlace anterior.
+          email_subject: Nuevo encuentro añadido a %{participatory_space_title}
+          notification_title: Se ha añadido el encuentro <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}
         meeting_registrations_over_percentage:
           email_intro: Las inscripciones ocupadas en "%{resource_title}" son %{percentage}%.
           email_outro: Has recibido esta notificación porque eres es un administrador del espacio participativo de la reunión.
@@ -62,6 +67,7 @@ es:
             comments_blocked: Comentarios bloqueados
     meetings:
       actions:
+        attachment_collections: Colecciones
         attachments: Archivos adjuntos
         close: Cerrar
         confirm_destroy: '¿Está seguro de que quiere eliminar este encuentro?'
@@ -124,6 +130,12 @@ es:
           update:
             invalid: Se ha producido un problema al guardar la configuración de la inscripción.
             success: Se han guardado correctamente las configuraciones de inscripciones de encuentros.
+      admin_log:
+        meeting:
+          close: "%{user_name} cerró el encuentro %{resource_name} en el espacio %{space_name}"
+          create: "%{user_name} creó el encuentro %{resource_name} en el espacio %{space_name}"
+          delete: "%{user_name} eliminó el encuentro %{resource_name} en el espacio %{space_name}"
+          update: "%{user_name} actualizó el encuentro %{resource_name} en el espacio %{space_name}"
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -183,6 +195,16 @@ es:
         destroy:
           invalid: Ha habido un problema al salir de esta encuentro.
           success: Has salido del encuentro con éxito.
+    participatory_processes:
+      participatory_process_groups:
+        highlighted_meetings:
+          past_meetings: Encuentros pasados
+          upcoming_meetings: Próximos encuentros
+    participatory_spaces:
+      highlighted_meetings:
+        past_meetings: Encuentros pasados
+        see_all_meetings: Ver todos los encuentros
+        upcoming_meetings: Próximos encuentros
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Resultados relacionados:'

data/config/locales/eu.yml

@@ -28,6 +28,11 @@ eu:
           email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" bilera jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
           email_subject: '"%{resource_title}" bilera itxita zegoen'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera itxita zegoen.
+        meeting_created:
+          email_intro: Bilera "%{resource_title}" | gehitu da "%{participatory_space_title}" " jarraitzen ari zarela.
+          email_outro: Jakinarazpena jaso duzu "%{participatory_space_title}" jarraitzen ari zarenagatik. Aurreko esteka estekan jarrai dezakezu.
+          email_subject: Bilera berria %{participatory_space_title}
+          notification_title: Bilera <a href="%{resource_path}">%{resource_title}</a> gehitu da %{participatory_space_title}
         meeting_registrations_over_percentage:
           email_intro: '"%{resource_title}" bilera okupatutako zirrikituak %{percentage} baino gehiagokoak dira.'
           email_outro: Jakinarazpen hau jaso duzu bileraren parte hartzaileen gunea delako.
@@ -62,6 +67,7 @@ eu:
             comments_blocked: Iruzkinak blokeatuta
     meetings:
       actions:
+        attachment_collections: Bilduma
         attachments: Eranskinak
         close: Itxi
         confirm_destroy: Ziur zaude topaketa hau ezabatu nahi duzula?
@@ -124,6 +130,12 @@ eu:
           update:
             invalid: Arazo bat izan da izen-ematearen konfigurazioa gordetzean.
             success: Topaketen izen-emateen konfigurazioak zuzen gorde dira.
+      admin_log:
+        meeting:
+          close: "%{user_name} %{resource_name} bilera %{space_name} espazioan itxi zen"
+          create: "%{user_name} %{resource_name} bilera sortu zen %{space_name} espazioan"
+          delete: "%{user_name} %{resource_name} topaketa ezabatu da %{space_name} espazioan"
+          update: "%{user_name} %{resource_name} topaketa %{space_name} espazioan eguneratu zen"
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -183,6 +195,16 @@ eu:
         destroy:
           invalid: Arazo bat izan da topaketa honetatik ateratzean.
           success: Topaketatik ongi atera zara.
+    participatory_processes:
+      participatory_process_groups:
+        highlighted_meetings:
+          past_meetings: Azken bilerak
+          upcoming_meetings: Hurrengo topaketak
+    participatory_spaces:
+      highlighted_meetings:
+        past_meetings: Azken bilerak
+        see_all_meetings: Ikusi bilera guztiak
+        upcoming_meetings: Hurrengo topaketak
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Topaketaren emaitzak:'