decidim-meetings 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7f59ccd8083c89aae051a8636f95fae9e32a5642
-  data.tar.gz: b976ae32da89bd9b10f9aa7d5cf6eec4907051dc
+SHA256:
+  metadata.gz: c42323ed4d34709662a3fdd9446c8ea98c8eb7d5cfc0f56064ef6f1709579b98
+  data.tar.gz: 0ce605aa102004ed06af33eb4a9a7f51eeb805a9336e9824ccba4faf91409066
 SHA512:
-  metadata.gz: 9d1b2453c9a54ff9e5337c1ac6a410cfc580f053a1217b72689b0dfdd79bb4b189f5899867f9041eb677218c147378ef4bba5d6ad505ca9c87b25d8111396f0a
-  data.tar.gz: 9d14e579feec92161e8e432d7548a80c21828f8077c4bbc92ce130d723af15867a5fe59acaf71de82205798f274fb95dc91b954991bad173cd9b082f3aa18673
+  metadata.gz: 5ae376ffde9ace76e4d5caced4bc1d8e96e77d6ee9b007dbbfc262741638af59b0e20fa105672e57507047428ac17aee0200f73157cdb2c749a0b09c441ab7c2
+  data.tar.gz: 6f152df9163129d2c7a59fa86aab059d80a853a45f668c81d2ec4c022d4ec0751ca844ee38379b38ed5052f852ccfe14990d8907d3670707b6d63572c479e9d9

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

@@ -41,6 +41,7 @@ module Decidim
             attending_organizations: form.attending_organizations,
             closed_at: form.closed_at
           )
+
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.meeting_closed",
             event_class: Decidim::Meetings::CloseMeetingEvent,

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

@@ -2,29 +2,7 @@
 
 module Decidim
   module Meetings
-    class CloseMeetingEvent < Decidim::Events::BaseEvent
-      include Decidim::Events::EmailEvent
-      include Decidim::Events::NotificationEvent
-
-      def email_subject
-        I18n.t("decidim.meetings.events.close_meeting_event.email_subject", resource_title: resource_title)
-      end
-
-      def email_intro
-        I18n.t("decidim.meetings.events.close_meeting_event.email_intro", resource_title: resource_title)
-      end
-
-      def email_outro
-        I18n.t("decidim.meetings.events.close_meeting_event.email_outro", resource_title: resource_title)
-      end
-
-      def notification_title
-        I18n.t(
-          "decidim.meetings.events.close_meeting_event.notification_title",
-          resource_title: resource_title,
-          resource_path: resource_path
-        ).html_safe
-      end
+    class CloseMeetingEvent < Decidim::Events::SimpleEvent
     end
   end
 end

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

@@ -2,38 +2,7 @@
 
 module Decidim
   module Meetings
-    class MeetingRegistrationsEnabledEvent < Decidim::Events::BaseEvent
-      include Decidim::Events::EmailEvent
-      include Decidim::Events::NotificationEvent
-
-      def email_subject
-        I18n.t(
-          "decidim.meetings.events.meeting_registrations_enabled.email_subject",
-          resource_title: resource_title
-        )
-      end
-
-      def email_intro
-        I18n.t(
-          "decidim.meetings.events.meeting_registrations_enabled.email_intro",
-          resource_title: resource_title
-        )
-      end
-
-      def email_outro
-        I18n.t(
-          "decidim.meetings.events.meeting_registrations_enabled.email_outro",
-          resource_title: resource_title
-        )
-      end
-
-      def notification_title
-        I18n.t(
-          "decidim.meetings.events.meeting_registrations_enabled.notification_title",
-          resource_title: resource_title,
-          resource_path: resource_path
-        ).html_safe
-      end
+    class MeetingRegistrationsEnabledEvent < Decidim::Events::SimpleEvent
     end
   end
 end

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

@@ -2,41 +2,11 @@
 
 module Decidim
   module Meetings
-    class MeetingRegistrationsOverPercentageEvent < Decidim::Events::BaseEvent
-      include Decidim::Events::EmailEvent
-      include Decidim::Events::NotificationEvent
+    class MeetingRegistrationsOverPercentageEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :percentage
 
-      def email_subject
-        I18n.t(
-          "decidim.meetings.events.meeting_registrations_over_percentage.email_subject",
-          resource_title: resource_title,
-          percentage: extra["percentage"] * 100
-        )
-      end
-
-      def email_intro
-        I18n.t(
-          "decidim.meetings.events.meeting_registrations_over_percentage.email_intro",
-          resource_title: resource_title,
-          percentage: extra["percentage"] * 100
-        )
-      end
-
-      def email_outro
-        I18n.t(
-          "decidim.meetings.events.meeting_registrations_over_percentage.email_outro",
-          resource_title: resource_title,
-          percentage: extra["percentage"] * 100
-        )
-      end
-
-      def notification_title
-        I18n.t(
-          "decidim.meetings.events.meeting_registrations_over_percentage.notification_title",
-          resource_title: resource_title,
-          resource_path: resource_path,
-          percentage: extra["percentage"] * 100
-        ).html_safe
+      def percentage
+        extra["percentage"] * 100
       end
     end
   end

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

@@ -2,29 +2,7 @@
 
 module Decidim
   module Meetings
-    class UpcomingMeetingEvent < Decidim::Events::BaseEvent
-      include Decidim::Events::EmailEvent
-      include Decidim::Events::NotificationEvent
-
-      def email_subject
-        I18n.t("decidim.meetings.events.upcoming_meeting_event.email_subject", resource_title: resource_title)
-      end
-
-      def email_intro
-        I18n.t("decidim.meetings.events.upcoming_meeting_event.email_intro", resource_title: resource_title)
-      end
-
-      def email_outro
-        I18n.t("decidim.meetings.events.upcoming_meeting_event.email_outro", resource_title: resource_title)
-      end
-
-      def notification_title
-        I18n.t(
-          "decidim.meetings.events.upcoming_meeting_event.notification_title",
-          resource_title: resource_title,
-          resource_path: resource_path
-        ).html_safe
-      end
+    class UpcomingMeetingEvent < Decidim::Events::SimpleEvent
     end
   end
 end

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

@@ -2,29 +2,7 @@
 
 module Decidim
   module Meetings
-    class UpdateMeetingEvent < Decidim::Events::BaseEvent
-      include Decidim::Events::EmailEvent
-      include Decidim::Events::NotificationEvent
-
-      def email_subject
-        I18n.t("decidim.meetings.events.update_meeting_event.email_subject", resource_title: resource_title)
-      end
-
-      def email_intro
-        I18n.t("decidim.meetings.events.update_meeting_event.email_intro", resource_title: resource_title)
-      end
-
-      def email_outro
-        I18n.t("decidim.meetings.events.update_meeting_event.email_outro", resource_title: resource_title)
-      end
-
-      def notification_title
-        I18n.t(
-          "decidim.meetings.events.update_meeting_event.notification_title",
-          resource_title: resource_title,
-          resource_path: resource_path
-        ).html_safe
-      end
+    class UpdateMeetingEvent < Decidim::Events::SimpleEvent
     end
   end
 end

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

@@ -28,8 +28,11 @@ module Decidim
         validates :end_time, presence: true, date: { after: :start_time }
 
         validates :current_feature, presence: true
-        validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         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) }
+
+        delegate :categories, to: :current_feature
 
         def map_model(model)
           return unless model.categorization
@@ -37,20 +40,26 @@ module Decidim
           self.decidim_category_id = model.categorization.decidim_category_id
         end
 
-        def process_scope
-          current_feature.participatory_space.scope
-        end
-
         alias feature current_feature
 
+        # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
+        #
+        # Returns a Decidim::Scope
         def scope
           return unless current_feature
-          @scope ||= current_feature.scopes.where(id: decidim_scope_id).first || process_scope
+          @scope ||= @decidim_scope_id ? current_feature.scopes.find_by(id: @decidim_scope_id) : current_participatory_space&.scope
+        end
+
+        # Scope identifier
+        #
+        # Returns the scope identifier related to the meeting
+        def decidim_scope_id
+          @decidim_scope_id || scope&.id
         end
 
         def category
           return unless current_feature
-          @category ||= current_feature.categories.where(id: decidim_category_id).first
+          @category ||= categories.find_by(id: decidim_category_id)
         end
       end
     end

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

@@ -36,7 +36,7 @@
     <div class="row" >
       <% if current_participatory_space.has_subscopes? %>
         <div class="columns xlarge-6" >
-          <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
+          <%= scopes_picker_field form, :decidim_scope_id %>
         </div>
       <% end %>
 

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

@@ -17,7 +17,7 @@
   <% end %>
 
   <% if current_participatory_space.has_subscopes? %>
-    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope, include_root: true), multiple: true %>
+    <%= scopes_picker_filter form, :scope_id %>
   <% end %>
 
   <% if current_feature.categories.any? %>

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

@@ -6,7 +6,7 @@
   </div>
   <div class="row">
     <div class="columns medium-8 medium-offset-2">
-      <%= button_to t('.confirm'), meeting_registration_path(meeting), class: "button expanded" %>
+      <%= button_to t('.confirm'), meeting_registration_path(meeting), class: "button expanded", data: { disable: true } %>
     </div>
   </div>
   <div class="text-center">

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

@@ -22,9 +22,9 @@
         </div>
         <% if !meeting.closed? && meeting.registrations_enabled? %>
           <% if meeting.has_registration_for? current_user %>
-            <%= action_authorized_button_to :leave, t('.going'), meeting_registration_path(meeting), method: :delete, class: "button expanded button--sc success" %>
+            <%= action_authorized_button_to :leave, t('.going'), meeting_registration_path(meeting), method: :delete, class: "button expanded button--sc success", data: { disable: true } %>
           <% else %>
-            <%= action_authorized_button_to :join, meeting.has_available_slots? ? t('.join') : t('.no_slots_available'), "", class: "button expanded button--sc", disabled: !meeting.has_available_slots?, data: { toggle: current_user.present? ? "meeting-registration-confirm" : "loginModal" } %>
+            <%= action_authorized_button_to :join, meeting.has_available_slots? ? t('.join') : t('.no_slots_available'), "", class: "button expanded button--sc", disabled: !meeting.has_available_slots?, data: { open: current_user.present? ? "meeting-registration-confirm" : "loginModal" } %>
           <% end %>
           <% if meeting.available_slots.positive? %>
             <span><%= t(".remaining_slots", count: meeting.remaining_slots) %></span>

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
----
 ca:
   activemodel:
     attributes:
@@ -10,15 +9,45 @@ ca:
         proposal_ids: Propostes creades en una trobada
       meeting:
         address: Adreça
+        available_slots: Espais disponibles per a aquesta trobada
         decidim_category_id: Categoria
         decidim_scope_id: Àmbit
         description: Descripció
         end_time: Hora de finalització
         location: Ubicació
         location_hints: Detalls d'ubicació
+        registration_terms: Termes i condicions de l'inscripció
+        registrations_enabled: Inscripcions obertes
         start_time: Hora d'inici
         title: Editar trobada
   decidim:
+    events:
+      meetings:
+        meeting_closed:
+          email_intro: 'La trobada de "%{resource_title}" ha estat tancada. Pots llegir les conclusions a la seva pàgina:'
+          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_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.
+          email_subject: La disponibilitat d'espais a la trobada "%{resource_title}" està per sobre del %{percentage}%
+          notification_title: L'espai ocupat per la trobada <a href="%{resource_path}">%{resource_title}</a> està per sobre del %{percentage}%.
+        meeting_updated:
+          email_intro: 'La trobada de "%{resource_title}" ha estat actualitzada. Pots llegir-ne la nova versió a la seva pàgina:'
+          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: La trobada "%{resource_title}" s'ha actualitzat
+          notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> ha estat actualitzada.
+        registrations_enabled:
+          email_intro: 'La trobada "%{resource_title}" ha activat inscripcions. Pots registrar-te a la seva pàgina:'
+          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: La trobada de "%{resource_title}" ha obert les inscripcions.
+          notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> ha obert les inscripcions.
+        upcoming_meeting:
+          email_intro: En menys de 48 hores s'iniciarà la trobada "%{resource_title}".
+          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.
     features:
       meetings:
         actions:
@@ -95,36 +124,10 @@ 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.
-      events:
-        close_meeting_event:
-          email_intro: 'La trobada de "%{resource_title}" ha estat tancada. Podeu llegir les conclusions a la seva pàgina:'
-          email_outro: Has rebut aquesta notificació, perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir des del seu enllaç.
-          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_registrations_enabled:
-          email_intro: 'La trobada "%{resource_title}" ha activat inscripcions. Pots registrar-te a la seva pàgina:'
-          email_outro: Has rebut aquesta notificació perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir a l'enllaç anterior.
-          email_subject: La trobada de "%{resource_title}" ha permès inscripcions.
-          notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> ha activat inscripcions.
-        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.
-          email_subject: L'espai ocupat per la trobada "%{resource_title}" està per sobre del %{percentage}%
-          notification_title: L'espai ocupat per la trobada <a href="%{resource_path}">%{resource_title}</a> està per sobre del %{percentage}%.
-        upcoming_meeting_event:
-          email_intro: En menys de 48 hores s'iniciarà la trobada "%{resource_title}".
-          email_outro: Has rebut aquesta notificació perquè estàs seguint la trobada "%{resource_title}". Pots deixar-la de seguir a 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.
-        update_meeting_event:
-          email_intro: 'La trobada de "%{resource_title}" ha estat actualitzada. Pots llegir-ne la nova versió a la seva pàgina:'
-          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: La trobada "%{resource_title}" s'ha actualitzat
-          notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> ha estat actualitzada.
       mailer:
         invite_join_meeting_mailer:
           invite:
-            subject: Assumpte
+            subject: Invitació per participar en una reunió
         registration_mailer:
           confirmation:
             subject: La teva inscripció a la trobada ha estat confirmada
@@ -134,8 +137,6 @@ ca:
           category_prompt: Selecciona una categoria
           date: Data
           past: Passades
-          scope_prompt: Seleccioneu un àmbit
-          scopes: Àmbits
           search: Cerca
           upcoming: Properes
         filters_small_view:
@@ -192,4 +193,4 @@ ca:
   devise:
     mailer:
       join_meeting:
-        subject: Assumpte
+        subject: Invitació per participar en una reunió

data/config/locales/en.yml

@@ -10,15 +10,45 @@ en:
         proposal_ids: Proposals created in the meeting
       meeting:
         address: Address
+        available_slots: Available slots for this meeting
         decidim_category_id: Category
         decidim_scope_id: Scope
         description: Description
         end_time: End Time
         location: Location
         location_hints: Location hints
+        registration_terms: Registration terms
+        registrations_enabled: Registrations enabled
         start_time: Start Time
         title: Title
   decidim:
+    events:
+      meetings:
+        meeting_closed:
+          email_intro: 'The "%{resource_title}" meeting was closed. You can read the conclusions from its page:'
+          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_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.
+          email_subject: The "%{resource_title}" meeting occupied slots are over %{percentage}%
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting occupied slots are over %{percentage}%.
+        meeting_updated:
+          email_intro: 'The "%{resource_title}" meeting was updated. You can read the new version from its page:'
+          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 updated
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting was updated.
+        registrations_enabled:
+          email_intro: 'The "%{resource_title}" meeting has enabled registrations. You can register yourself on its page:'
+          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 has enabled registrations.
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting has enabled registrations.
+        upcoming_meeting:
+          email_intro: The "%{resource_title}" meeting will start in less than 48h.
+          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 will start in less than 48h.
+          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting will start in less than 48h.
     features:
       meetings:
         actions:
@@ -96,36 +126,10 @@ en:
           update:
             invalid: There's been a problem saving the registration settings.
             success: Meeting registrations settings successfully saved.
-      events:
-        close_meeting_event:
-          email_intro: 'The "%{resource_title}" meeting was closed. You can read the conclusions from its page:'
-          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_registrations_enabled:
-          email_intro: 'The "%{resource_title}" meeting has enabled registrations. You can register yourself on its page:'
-          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 has enabled registrations.
-          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting has enabled registrations.
-        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.
-          email_subject: The "%{resource_title}" meeting occupied slots are over %{percentage}%
-          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting occupied slots are over %{percentage}%.
-        upcoming_meeting_event:
-          email_intro: The "%{resource_title}" meeting will start in less than 48h.
-          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 will start in less than 48h.
-          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting will start in less than 48h.
-        update_meeting_event:
-          email_intro: 'The "%{resource_title}" meeting was updated. You can read the new version from its page:'
-          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 updated
-          notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting was updated.
       mailer:
         invite_join_meeting_mailer:
           invite:
-            subject: Subject
+            subject: Invitation to join a meeting
         registration_mailer:
           confirmation:
             subject: Your meeting's registration has been confirmed
@@ -135,8 +139,6 @@ en:
           category_prompt: Select a category
           date: Date
           past: Past
-          scope_prompt: Select a scope
-          scopes: Scopes
           search: Search
           upcoming: Upcoming
         filters_small_view:
@@ -194,4 +196,4 @@ en:
   devise:
     mailer:
       join_meeting:
-        subject: Subject
+        subject: Invitation to join a meeting

data/config/locales/es.yml

@@ -1,4 +1,3 @@
----
 es:
   activemodel:
     attributes:
@@ -10,20 +9,50 @@ es:
         proposal_ids: Propuestas creadas en el encuentro
       meeting:
         address: Dirección
+        available_slots: Espacios disponibles para este encuentro
         decidim_category_id: Categoría
         decidim_scope_id: Ámbito
         description: Descripción
         end_time: Hora de finalización
         location: Ubicación
         location_hints: Pistas de ubicación
+        registration_terms: Términos y condiciones de inscripción
+        registrations_enabled: Inscripciones abiertas
         start_time: Hora de inicio
         title: Título
   decidim:
+    events:
+      meetings:
+        meeting_closed:
+          email_intro: 'Se ha cerrado la reunión "%{resource_title}". Puedes leer las conclusiones en su página:'
+          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_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.
+          email_subject: Las inscripciones en "%{resource_title}" están por encima del %{percentage}%
+          notification_title: Las inscripciones de <a href="%{resource_path}">%{resource_title}</a> están por encima del %{percentage}%.
+        meeting_updated:
+          email_intro: 'Se ha cerrado el encuentro "%{resource_title}". Puedes leer las conclusiones en su página:'
+          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 actualizado el encuentro "%{resource_title}"
+          notification_title: El encuentro <a href="%{resource_path}">%{resource_title}</a> ha sido actualizado.
+        registrations_enabled:
+          email_intro: 'El encuentro "%{resource_title}" ha ha abierto las inscripciones. Puedes inscribirte en su página:'
+          email_outro: Has recibido esta notificación porque sigues el encuentro "%{resource_title}". Puedes dejar de seguirlo en el enlace anterior.
+          email_subject: El encuentro "%{resource_title}" ha abierto las inscripciones.
+          notification_title: El encuentro <a href="%{resource_path}">%{resource_title}</a> ha abierto las inscripciones.
+        upcoming_meeting:
+          email_intro: El encuentro "%{resource_title}" comenzará en menos de 48 h.
+          email_outro: Has recibido esta notificación porque sigues el encuentro "%{resource_title}". Puedes dejar de seguirlo en el enlace anterior.
+          email_subject: El encuentro "%{resource_title}" comenzará en menos de 48 h.
+          notification_title: El encuentro <a href="%{resource_path}">%{resource_title}</a> comenzará en menos de 48 h.
     features:
       meetings:
         actions:
           join: Unirse
-        name: Lista de encuentros
+        name: Encuentros
         settings:
           global:
             announcement: Aviso
@@ -35,7 +64,7 @@ es:
       actions:
         attachments: Archivos adjuntos
         close: Cerrar
-        confirm_destroy: "¿Está seguro de que quiere eliminar este encuentro?"
+        confirm_destroy: '¿Está seguro de que quiere eliminar este encuentro?'
         destroy: Borrar
         edit: Editar
         new: Nuevo
@@ -73,7 +102,7 @@ es:
           edit:
             update: Actualizar
           index:
-            title: Lista de encuentros
+            title: Encuentros
           new:
             create: Crear
             title: Crear encuentro
@@ -95,36 +124,10 @@ 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.
-      events:
-        close_meeting_event:
-          email_intro: 'Se ha cerrado la reunión "%{resource_title}". Puedes leer las conclusiones en su página:'
-          email_outro: Has recibido esta notificación porque sigues la reunión "%{resource_title}". Puedes dejar de seguirla en el enlace anterior.
-          email_subject: Se ha cerrado la reunión "%{resource_title}"
-          notification_title: La reunión <a href="%{resource_path}">%{resource_title}</a> ha sido cerrada.
-        meeting_registrations_enabled:
-          email_intro: 'La reunión "%{resource_title}" ha ha activado inscripciones. Puedes inscribirte en su página:'
-          email_outro: Ha recibido esta notificación porque usted sigue el encuentro "%{resource_title}". Puedes dejar de seguirlo en el enlace anterior.
-          email_subject: El encuentro "%{resource_title}" ha activado inscripciones.
-          notification_title: El encuentro <a href="%{resource_path}">%{resource_title}</a> ha activado inscripciones.
-        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.
-          email_subject: Las inscripciones ocupadas de "%{resource_title}" son %{percentage}%
-          notification_title: Las inscripciones ocupadas de <a href="%{resource_path}">%{resource_title}</a> son %{percentage}%.
-        upcoming_meeting_event:
-          email_intro: La reunión "%{resource_title}" se iniciará en menos de 48h.
-          email_outro: Has recibido esta notificación porque sigues la reunión "%{resource_title}". Puedes dejar de seguirla en el enlace anterior.
-          email_subject: La reunión "%{resource_title}" comenzará en menos de 48h.
-          notification_title: La reunión de <a href="%{resource_path}">%{resource_title}</a> comenzará en menos de 48h.
-        update_meeting_event:
-          email_intro: 'La reunión "%{resource_title}" fue actualizada. Puedes leer la nueva versión en su página:'
-          email_outro: Has recibido esta notificación porque sigues la reunión "%{resource_title}". Puedes dejar de seguirla en el enlace anterior.
-          email_subject: La reunión "%{resource_title}" ha sido actualizada
-          notification_title: La reunión <a href="%{resource_path}">%{resource_title}</a> ha sido actualizada.
       mailer:
         invite_join_meeting_mailer:
           invite:
-            subject: Asunto
+            subject: Invitación a unirse a una reunión
         registration_mailer:
           confirmation:
             subject: La inscripción a tu encuentro ha sido confirmada
@@ -134,8 +137,6 @@ es:
           category_prompt: Selecciona una categoría
           date: Fecha
           past: Pasadas
-          scope_prompt: Seleccione un ámbito
-          scopes: Ámbitos
           search: Buscar
           upcoming: Próximas
         filters_small_view:
@@ -192,4 +193,4 @@ es:
   devise:
     mailer:
       join_meeting:
-        subject: Asunto
+        subject: Invitación a unirse a una reunión