decidim-meetings 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703979c123c332b2dc5f89e5240827e932951dab
-  data.tar.gz: 3a407ec7c35450f4d16cd17f519096516d5e0aab
+  metadata.gz: 01ce2b2ec67e0793b65b9412060f6557b000f57d
+  data.tar.gz: 4c21975e2f0b7f710d78b1e4f93f9baa83395fc3
 SHA512:
-  metadata.gz: ae4862bdb7da7e4a51a63feb1f3181031cb4e049b7c15b117ef3f8abfe7a34533fe97f317983e20bf30d6e8adac8b04d9d88720154ac431af07a509815020e5c
-  data.tar.gz: b9197688ec9aff83df3f354831ccddb551882f49bf01daa1db3a9bd62e3979a1689cd50d453098576e161db16de03f800c5d8c31d84d24a7f001f069ec64ad97
+  metadata.gz: 7e50ac9e0b9ed9876724e5517b0db927428f8b539772bc4c692a4ed8f60c6232f89a58cee7e54d159edfc2f78830472801e04fdb3f175a740a873ee4a558a4f3
+  data.tar.gz: a89ad20fb5f3abc65749d5dd2fc2f751c92bfebd04429c0a1a779841f4886c0c9108b69f5fa92af1ba097510224a13cf4c049ff7bfa709598a5976dd7d1aef64

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A command with all the business logic to invite users to join a meeting.
+      #
+      class InviteUserToJoinMeeting < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form         - A form object with the params.
+        # meeting      - The meeting which the user is invited to.
+        # invited_by   - The user performing the operation
+        def initialize(form, meeting, invited_by)
+          @form = form
+          @meeting = meeting
+          @invited_by = invited_by
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          invite_user
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form, :invited_by, :meeting
+
+        def invite_user
+          if user.persisted?
+            InviteJoinMeetingMailer.invite(user, meeting, invited_by).deliver_later
+          else
+            user.name = form.name
+            user.skip_reconfirmation!
+            user.invite!(invited_by, invitation_instructions: "join_meeting", meeting: meeting)
+          end
+        end
+
+        def user
+          @user ||= Decidim::User.find_or_create_by(
+            organization: form.current_organization,
+            email: form.email.downcase
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_dependency "decidim/admin/application_controller"
+
+module Decidim
+  module Meetings
+    module Admin
+      # Controller that allows inviting users to join a meeting.
+      #
+      class InvitesController < Admin::ApplicationController
+        def new
+          @form = form(MeetingRegistrationInviteForm).instance
+        end
+
+        def create
+          @form = form(MeetingRegistrationInviteForm).from_params(params)
+
+          InviteUserToJoinMeeting.call(@form, meeting, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("invites.create.success", scope: "decidim.meetings.admin")
+              redirect_to edit_meeting_registrations_path(meeting)
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("invites.create.error", scope: "decidim.meetings.admin")
+              render :new
+            end
+          end
+        end
+
+        private
+
+        def meeting
+          @meeting ||= Meeting.where(feature: current_feature).find(params[:meeting_id])
+        end
+      end
+    end
+  end
+end

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

@@ -29,7 +29,7 @@ module Decidim
           format = params[:format]
           export_data = Decidim::Exporters.find_exporter(format).new(meeting.registrations, Decidim::Meetings::RegistrationSerializer).export
 
-          send_data export_data.read, type: "text/#{format}", filename: export_data.filename("registrations")
+          send_data export_data.read, type: "text/#{export_data.extension}", filename: export_data.filename("registrations")
         end
 
         private

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A form object used to invite users to join a meeting.
+      #
+      class MeetingRegistrationInviteForm < Form
+        attribute :name, String
+        attribute :email, String
+
+        validates :name, :email, presence: true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A custom mailer for sending an invitation to join a meeting to
+      # an existing user.
+      class InviteJoinMeetingMailer < Decidim::ApplicationMailer
+        include Decidim::TranslationsHelper
+        include ActionView::Helpers::SanitizeHelper
+
+        helper Decidim::ResourceHelper
+        helper Decidim::TranslationsHelper
+
+        helper_method :routes
+
+        # Send an email to an user to invite them to join a meeting.
+        #
+        # user - The user being invited
+        # meeting - The meeting being joined.
+        # invited_by - The user performing the invitation.
+        def invite(user, meeting, invited_by)
+          with_user(user) do
+            @user = user
+            @meeting = meeting
+            @invited_by = invited_by
+            @organization = @meeting.organization
+            @locator = Decidim::ResourceLocatorPresenter.new(@meeting)
+
+            subject = I18n.t("invite.subject", scope: "decidim.meetings.mailer.invite_join_meeting_mailer")
+            mail(to: user.email, subject: subject)
+          end
+        end
+
+        private
+
+        def routes
+          @router ||= Decidim::EngineRouter.main_proxy(@meeting.feature)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+<p><%= t("devise.mailer.invitation_instructions.hello", email: @user.name) %></p>
+
+<p>
+  <%= t ".invited_you_to_join_a_meeting", invited_by: @invited_by.name, application: @user.organization.name %>
+</p>
+
+<p><%= link_to t(".join", meeting_title: translated_attribute(@meeting.title)),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.feature.participatory_space) %>

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

@@ -0,0 +1,7 @@
+<div class="row column">
+  <%= form.text_field :name %>
+</div>
+
+<div class="row column">
+  <%= form.text_field :email %>
+</div>

data/app/views/decidim/meetings/admin/invites/new.html.erb

@@ -0,0 +1,21 @@
+<h2 class="process-title-summary">
+  <%= t('.new_invite') %>
+</h2>
+
+<div class="section">
+  <div class="callout warning">
+    <p><%= t('.explanation') %></p>
+  </div>
+</div>
+
+<%= decidim_form_for(@form, url: meeting_registrations_invites_path, method: :post, html: { class: "form new_meeting_registration_invite" }) do |f| %>
+  <div class="card">
+    <div class="card-section">
+      <%= render partial: 'form', object: f %>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".invite") %>
+  </div>
+<% end %>

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

@@ -2,11 +2,12 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= title %>
+      <%= link_to t(".invite_user"), meeting.registrations_enabled ? new_meeting_registrations_invites_path(meeting) : "#", class: "button tiny button--title #{'disabled' unless meeting.registrations_enabled?}" %>
       <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
       <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
         <ul class="vertical menu add-features">
-          <% %w{csv json}.each do |format| %>
-            <li class="exports--format--<%= format %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{current_feature.manifest.name}.admin.exports.registrations"), export_format: format.upcase), export_meeting_registrations_path(meeting_id: meeting, format: format) %></li>
+          <% %w{CSV JSON Excel}.each do |format| %>
+            <li class="exports--format--<%= format.downcase %> exports--registrations"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{current_feature.manifest.name}.admin.exports.registrations"), export_format: format), export_meeting_registrations_path(meeting_id: meeting, format: format) %></li>
           <% end %>
         </ul>
       </div>
@@ -30,4 +31,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/meetings/admin/registrations_form" %>
+<%= javascript_include_tag "decidim/meetings/admin/registrations_form" %>

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

@@ -1,6 +1,6 @@
 <%= content_for(:title, translated_attribute(model.title)) %>
 <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
-<%== meeting_description(model) %>
+<%= sanitize meeting_description(model) %>
 <div class="address card__extra">
   <div class="address__icon">
     <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>

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

@@ -14,7 +14,7 @@
               <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
             </div>
           </div>
-          <%== translated_attribute meeting.description %>
+          <%= sanitize translated_attribute meeting.description %>
         </div>
       </article>
     </div>

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

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

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

@@ -1,7 +1,7 @@
 <div class="reveal" data-reveal id="meeting-registration-confirm">
   <div class="row">
     <div class="columns medium-10 medium-offset-1 help-text">
-      <%== translated_attribute(meeting.registration_terms) %>
+      <%= sanitize translated_attribute(meeting.registration_terms) %>
     </div>
   </div>
   <div class="row">

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

@@ -62,14 +62,14 @@
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
-      <p><%== translated_attribute meeting.description %></p>
+      <p><%= sanitize translated_attribute meeting.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>
     <% if meeting.closed? %>
       <div class="section">
         <h3 class="section-heading"><%= t(".meeting_report") %></h3>
-        <%== translated_attribute meeting.closing_report %>
+        <%= sanitize translated_attribute meeting.closing_report %>
       </div>
     <% end %>
     <%= linked_resources_for meeting, :proposals, "proposals_from_meeting" %>

data/app/views/devise/mailer/join_meeting.html.erb

@@ -0,0 +1,13 @@
+<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
+
+<p>
+  <%= t("decidim.meetings.admin.invite_join_meeting_mailer.invite.invited_you_to_join_a_meeting", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+</p>
+
+<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].feature).meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].feature.participatory_space), host: @resource.organization.host) %></p>
+
+<% if @resource.invitation_due_at %>
+  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
+<% end %>
+
+<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

data/app/views/devise/mailer/join_meeting.text.erb

@@ -0,0 +1,11 @@
+<%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
+
+<%= t("decidim.meetings.admin.invite_join_meeting_mailer.invite.invited_you_to_join_a_meeting", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+
+<% accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:meeting].feature).meeting_registration_path(meeting_id: @opts[:meeting], participatory_space_id: @opts[:meeting].feature.participatory_space), host: @resource.organization.host) %>
+
+<% if @resource.invitation_due_at %>
+<%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %>
+<% end %>
+
+<%= t("devise.mailer.invitation_instructions.ignore").html_safe %>

data/config/locales/ca.yml

@@ -45,6 +45,18 @@ ca:
       admin:
         exports:
           registrations: Inscripcions
+        invite_join_meeting_mailer:
+          invite:
+            invited_you_to_join_a_meeting: "%{invited_by} t'ha convidat a participar en una trobada a %{application}. Pots acceptar la invitació a través de l'enllaç següent."
+            join: Uneix-te a la trobada '%{meeting_title}'
+        invites:
+          create:
+            error: Hi ha hagut un problema al convidar l'usuari a unir-se a la trobada.
+            success: L'usuari s'ha convidat correctament a unir-se a la trobada.
+          new:
+            explanation: L'usuari serà convidat a participar en una trobada. Si el correu electrònic no està registrat, també se'l convidarà a l'organització.
+            invite: Convidar
+            new_invite: Convida l'usuari
         meeting_closes:
           edit:
             close: Tancar
@@ -76,6 +88,7 @@ ca:
             save: Desa
           form:
             available_slots_help: Deixeu-lo a 0 si teniu espais il·limitats disponibles.
+            invite_user: Convida l'usuari
             registrations_count:
               one: Hi ha hagut 1 inscripció.
               other: Hi ha hagut %{count} inscripcions.
@@ -109,6 +122,9 @@ ca:
           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
         registration_mailer:
           confirmation:
             subject: La teva inscripció a la trobada ha estat confirmada
@@ -173,3 +189,7 @@ ca:
       proposals_from_meeting:
         meeting_proposals: 'Propostes relacionades:'
         proposal_meetings: 'Trobades relacionades:'
+  devise:
+    mailer:
+      join_meeting:
+        subject: Assumpte

data/config/locales/en.yml

@@ -45,6 +45,18 @@ en:
       admin:
         exports:
           registrations: Registrations
+        invite_join_meeting_mailer:
+          invite:
+            invited_you_to_join_a_meeting: "%{invited_by} has invited you to join a meeting at %{application}. You can accept it through the link below."
+            join: Join meeting '%{meeting_title}'
+        invites:
+          create:
+            error: There's been a problem while inviting the user to join the meeting.
+            success: User successfully invited to join the meeting.
+          new:
+            explanation: The user will be invited to join a meeting. If the email is not registered they will be invited to the organization as well.
+            invite: Invite
+            new_invite: Invite user
         meeting_closes:
           edit:
             close: Close
@@ -76,6 +88,7 @@ en:
             save: Save
           form:
             available_slots_help: Leave it to 0 if you have unlimited slots available.
+            invite_user: Invite user
             registrations_count:
               one: There has been 1 registration.
               other: There has been %{count} registrations.
@@ -110,6 +123,9 @@ en:
           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
         registration_mailer:
           confirmation:
             subject: Your meeting's registration has been confirmed
@@ -175,3 +191,7 @@ en:
       proposals_from_meeting:
         meeting_proposals: 'Related proposals:'
         proposal_meetings: 'Related meetings:'
+  devise:
+    mailer:
+      join_meeting:
+        subject: Subject

data/config/locales/es.yml

@@ -45,6 +45,18 @@ es:
       admin:
         exports:
           registrations: Inscripciones
+        invite_join_meeting_mailer:
+          invite:
+            invited_you_to_join_a_meeting: "%{invited_by} te ha invitado a unirte a un encuentro en %{application}. Puedes aceptarlo a través del siguiente enlace."
+            join: Únete al encuentro '%{meeting_title}'
+        invites:
+          create:
+            error: Ha habido un problema al invitar al usuario a unirse al encuentro.
+            success: El usuario ha sido invitado con éxito a unirse al encuentro.
+          new:
+            explanation: El usuario será invitado a unirse a un encuentro. Si el correo electrónico no está registrado, será invitado a la organización también.
+            invite: Invitar
+            new_invite: Invitar usuario
         meeting_closes:
           edit:
             close: Cerrar
@@ -76,6 +88,7 @@ es:
             save: Guardar
           form:
             available_slots_help: Déjalo a 0 si tiene inscripciones ilimitadas.
+            invite_user: Invitar usuario
             registrations_count:
               one: Ha habido 1 inscripción.
               other: Ha habido %{count} inscripciones.
@@ -109,6 +122,9 @@ es:
           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
         registration_mailer:
           confirmation:
             subject: La inscripción a tu encuentro ha sido confirmada
@@ -173,3 +189,7 @@ es:
       proposals_from_meeting:
         meeting_proposals: 'Propuestas relacionadas:'
         proposal_meetings: 'Encuentros relacionados:'
+  devise:
+    mailer:
+      join_meeting:
+        subject: Asunto

data/config/locales/eu.yml

@@ -21,7 +21,7 @@ eu:
     features:
       meetings:
         actions:
-          join: Parte hartu
+          join: Bat egin
         name: Topaketa-zerrenda
         settings:
           global:
@@ -44,6 +44,18 @@ eu:
       admin:
         exports:
           registrations: Izen-emateak
+        invite_join_meeting_mailer:
+          invite:
+            invited_you_to_join_a_meeting: "%{invited_by} gonbidatu zaitu %{application} bileran. Beheko estekan onartu dezakezu."
+            join: Erregistratu bilera '%{meeting_title}'
+        invites:
+          create:
+            error: Arazo bat izan da erabiltzaileak bileran sartzeko gonbita emanda.
+            success: Erabiltzailea behar bezala gonbidatu bilera batera.
+          new:
+            explanation: Erabiltzailea bilera batera gonbidatuko zaizu. Posta elektronikoa ez bada erregistratuta, erakundera gonbidatuko dute.
+            invite: Gonbit egin
+            new_invite: Gonbidatu erabiltzailea
         meeting_closes:
           edit:
             close: Itxi
@@ -74,43 +86,47 @@ eu:
           edit:
             save: Gorde
           form:
-            available_slots_help: Utzi 0 mugak mugagabea badaude.
+            available_slots_help: Utzi 0an izen-emate mugagabeak edukiz gero.
+            invite_user: Gonbidatu erabiltzailea
             registrations_count:
-              one: Izena eman da.
-              other: '%{count} matrikulazio izan dira.'
+              one: Izen-emate bat egin da.
+              other: '%{count} izen-emate egin dira.'
           update:
-            invalid: Arazo bat izan da erregistroaren ezarpenak gordetzean.
-            success: Bilera erregistratzeen ezarpenak behar bezala gorde dira.
+            invalid: Arazo bat izan da izen-ematearen konfigurazioa gordetzean.
+            success: Topaketen izen-emateen konfigurazioak zuzen gorde dira.
       events:
         close_meeting_event:
-          email_intro: '"%{resource_title}" bilera itxita zegoen. Bere orriko ondorioak irakur ditzakezu:'
-          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.
+          email_intro: '%{resource_title}” bilera itxi da. Ondorioak orrian bertan irakur ditzakezu:'
+          email_outro: Jakinarazpen hau jaso duzu "%{resource_title}” bilera jarraitzen duzulako. Jarraitzeari utzi diezaiokezu aurreko estekan.
+          email_subject: '%{resource_title}” bilera itxi da'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera itxi da.
         meeting_registrations_enabled:
-          email_intro: '"%{resource_title}" topaketak erregistroak gaitu ditu. Zeure burua erregistratu dezakezu bere orrialdean:'
-          email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" bilera jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
-          email_subject: '"%{resource_title}" topaketak erregistroak gaitu ditu.'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera erregistratzeak gaitu du.
+          email_intro: '“%{resource_title}” bilerak izen-emateak aktibatu ditu. Izena eman dezakezu orrian bertan:'
+          email_outro: Jakinarazpen hau jaso duzu "%{resource_title}” topaketa jarraitzen duzulako. Jarraitzeari utzi diezaiokezu aurreko estekan.
+          email_subject: '“%{resource_title}” topaketak izen-emateak aktibatu ditu.'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketak izen-emateak aktibatu ditu.
         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.
-          email_subject: '"%{resource_title}" bilera okupatutako zirrikituak %{percentage} baino gehiago dira.'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> bilerako slot okupatuak %{percentage} baino gehiagokoak dira.
+          email_intro: '"%{resource_title}" (e)an beteta dauden izen-emateak honako hauek dira: %{percentage}%.'
+          email_outro: Jakinarazpen hau jaso duzu bileraren gune partizipatiboko administratzaile bat zarelako.
+          email_subject: '"%{resource_title}" (e)an beteta dauden izen-emateak honako hauek dira: %{percentage}%'
+          notification_title: '<a href="%{resource_path}">%{resource_title}</a>-ko izen-emateak honako hauek dira: %{percentage}%.'
         upcoming_meeting_event:
-          email_intro: '"%{resource_title}" topaketa 48 ordu baino gutxiagoan hasiko da.'
-          email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" bilera jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
-          email_subject: '"%{resource_title}" topaketa 48 ordu baino gutxiagoan hasiko da.'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> topaketa 48 ordu baino gutxiagoan hasiko da.
+          email_intro: '"%{resource_title}" bilera 48 ordu baino lehenago hasiko da.'
+          email_outro: Jakinarazpen hau jaso duzu "%{resource_title}” bilera jarraitzen duzulako. Jarraitzeari utzi diezaiokezu aurreko estekan.
+          email_subject: '"%{resource_title}" bilera 48 ordu baino lehenago hasiko da.'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera 48 ordu baino lehenago hasiko da.
         update_meeting_event:
-          email_intro: '"%{resource_title}" bilera eguneratu da. Bertsio berria bere orritik irakurri dezakezu:'
-          email_outro: Jakinarazpen hori jaso duzu "%{resource_title}" bilera jarraitzen duzulako. Aurreko esteka estekan jarrai dezakezu.
-          email_subject: '"%{resource_title}" bilera eguneratu da'
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> bilera eguneratu da.
+          email_intro: '"%{resource_title}" bilera eguneratua izan zen. Bertsio berria orrian bertan irakur dezakezu:'
+          email_outro: Jakinarazpen hau jaso duzu "%{resource_title}” bilera jarraitzen duzulako. Jarraitzeari utzi diezaiokezu aurreko estekan.
+          email_subject: '"%{resource_title}" bilera eguneratua izan da'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> eguneratua izan da.
       mailer:
+        invite_join_meeting_mailer:
+          invite:
+            subject: Gaia
         registration_mailer:
           confirmation:
-            subject: Zure bileraren erregistroa baieztatu da
+            subject: Zure topaketarako izen-ematea baieztatua izan da
       meetings:
         filters:
           category: Kategoria
@@ -132,19 +148,19 @@ eu:
           no_meetings_warning: Ez dago bilaketa-irizpidearekin bat datorren topaketarik, edo ez dago ezein topaketarik programaturik.
           upcoming_meetings_warning: Orain ez dago topaketarik programaturik, baina aurreko topaketak ikus ditzakezu.
         registration_confirm:
-          cancel: Utzi
+          cancel: Ezeztatu
           confirm: Baieztatu
         show:
           attendees: Bertaratuen kopurua
           contributions: Ekarpen-kopurua
-          going: joatean
-          join: Erregistratu bilera
+          going: Ari da
+          join: Izena eman topaketan
           meeting_report: Topaketaren txostena
-          no_slots_available: Ez dago slotarik erabilgarri
+          no_slots_available: Ez dago leku librerik
           organizations: Bertaratutako erakundeak
           remaining_slots:
-            one: 1 zutoina geratzen da
-            other: "%{count} zutoinak geratzen dira"
+            one: Izen-emate 1 erabilgarri
+            other: "%{count} izen-emate erabilgarri"
       models:
         meeting:
           fields:
@@ -156,15 +172,15 @@ eu:
       read_more: "(geihago irakurri)"
       registration_mailer:
         confirmation:
-          confirmed_html: Zure izen-ematea <a href="%{url}">%{title}</a> topatu da.
-          details: Bilera xehetasunak eranskinetan aurkituko dituzu.
+          confirmed_html: Zure izen-ematea baieztatu da <a href="%{url}">%{title}</a> topaketarako.
+          details: Topaketaren xehetasunak aurkituko dituzu eranskinean.
       registrations:
         create:
-          invalid: Arazo bat izan da bilera honetan.
-          success: Bilera ondo sartu zara.
+          invalid: Arazo bat izan da topaketa honekin bat egitean.
+          success: Topaketan izena ongi eman duzu.
         destroy:
-          invalid: Arazo bat izan da bilera hau utzita.
-          success: Bilera behar bezala utzi duzu.
+          invalid: Arazo bat izan da topaketa honetatik ateratzean.
+          success: Topaketatik ongi atera zara.
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Topaketaren emaitzak:'
@@ -172,3 +188,7 @@ eu:
       proposals_from_meeting:
         meeting_proposals: 'Topaketari dagozkion proposamenak:'
         proposal_meetings: 'Proposamenarekin lotutako topaketak:'
+  devise:
+    mailer:
+      join_meeting:
+        subject: Gaia