decidim-conferences 0.26.3 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3be1863152e80c61f8a9ce98a4e160636e06c0382ac892d4a53db1c09efc6fec
-  data.tar.gz: e3c4ed4c9a8a5dbe3b0e0758751572dd3f66700db6a51defa1a8a7b282ebb377
+  metadata.gz: 6575c3f35191e92d5407f36b6c0695fbc26b1171641810e4084b6b418df8d65b
+  data.tar.gz: 6a5d014a01d97c9a6cebc36b81d49f85ac484282eef596c4a288b3ee0b008abf
 SHA512:
-  metadata.gz: 3418410ef443ddbf00dc22e6c070c8c7f1c1104ef6b05ab8c3a2c743969ed49c25da13d761ad1e25fd83caa7924c7ae5d4ae5ed2a4cc2ac16a96cfa633d3b490
-  data.tar.gz: 711445613ff058d730ed0cc0f5c84fb9e55be670f39c67c1a974c2f60a93a3648f1116df6871987da91f92fd9a7abd47b6950f1faf1afbc83bb9191c84781d31
+  metadata.gz: c93478e77107b4b8c316b776d8d522a3f593bcbf8c690aba7061938190b0aff350e791120c12427c849bd69d0a44d05dc7607d55857e36cad861d53c3bcf9680
+  data.tar.gz: fedc5e941a7a16844246650f2cbe5f17daf32f711bdb1453e5a22db25eecd0d65ed09ffac83a20993e62c86d79c9d4fd31f73e56bb9a811232498cd4c4cf5b7c

data/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb

@@ -100,7 +100,7 @@ module Decidim
 
         def invite_user_to_sign_up
           user.skip_reconfirmation!
-          user.invite!(invited_by, invitation_instructions: "join_conference", conference: conference)
+          user.invite!(invited_by, invitation_instructions: "join_conference", conference: conference, registration_type: form.registration_type)
         end
       end
     end

data/app/commands/decidim/conferences/join_conference.rb

@@ -20,6 +20,9 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
+        return broadcast(:invalid) unless can_join_conference?
+        return broadcast(:ok) if already_joined_conference?
+
         conference.with_lock do
           return broadcast(:invalid) unless can_join_conference?
 
@@ -58,6 +61,10 @@ module Decidim
         conference.registrations_enabled? && conference.has_available_slots?
       end
 
+      def already_joined_conference?
+        conference.conference_registrations.where(user: user).any?
+      end
+
       def send_email_pending_validation
         Decidim::Conferences::ConferenceRegistrationMailer.pending_validation(user, conference, @registration_type).deliver_later
       end

data/app/controllers/decidim/conferences/admin/conference_speakers_controller.rb

@@ -6,10 +6,11 @@ module Decidim
       # Controller that allows managing conference speakers.
       #
       class ConferenceSpeakersController < Decidim::Conferences::Admin::ApplicationController
-        helper Decidim::Conferences::Admin::ConferenceSpeakersHelper
         include Concerns::ConferenceAdmin
         include Decidim::Paginable
 
+        helper_method :conference_speaker, :meetings_selected
+
         def index
           enforce_permission_to :index, :conference_speaker
 
@@ -41,17 +42,15 @@ module Decidim
         end
 
         def edit
-          @item = collection.find(params[:id])
-          enforce_permission_to :update, :conference_speaker, speaker: @item
-          @form = form(ConferenceSpeakerForm).from_model(@item)
+          enforce_permission_to :update, :conference_speaker, speaker: conference_speaker
+          @form = form(ConferenceSpeakerForm).from_model(conference_speaker)
         end
 
         def update
-          @conference_speaker = collection.find(params[:id])
-          enforce_permission_to :update, :conference_speaker, speaker: @conference_speaker
+          enforce_permission_to :update, :conference_speaker, speaker: conference_speaker
           @form = form(ConferenceSpeakerForm).from_params(params)
 
-          UpdateConferenceSpeaker.call(@form, @conference_speaker) do
+          UpdateConferenceSpeaker.call(@form, conference_speaker) do
             on(:ok) do
               flash[:notice] = I18n.t("conference_speakers.update.success", scope: "decidim.admin")
               redirect_to conference_speakers_path(current_conference)
@@ -65,10 +64,9 @@ module Decidim
         end
 
         def destroy
-          @conference_speaker = collection.find(params[:id])
-          enforce_permission_to :destroy, :conference_speaker, speaker: @conference_speaker
+          enforce_permission_to :destroy, :conference_speaker, speaker: conference_speaker
 
-          DestroyConferenceSpeaker.call(@conference_speaker, current_user) do
+          DestroyConferenceSpeaker.call(conference_speaker, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("conference_speakers.destroy.success", scope: "decidim.admin")
               redirect_to conference_speakers_path(current_conference)
@@ -78,6 +76,14 @@ module Decidim
 
         private
 
+        def meetings_selected
+          @meetings_selected ||= @conference_speaker.conference_meetings.pluck(:id) if @conference_speaker.present?
+        end
+
+        def conference_speaker
+          @conference_speaker ||= collection.find(params[:id])
+        end
+
         def collection
           @collection ||= Decidim::ConferenceSpeaker.where(conference: current_conference)
         end

data/app/controllers/decidim/conferences/conference_registrations_controller.rb

@@ -4,6 +4,8 @@ module Decidim
   module Conferences
     # Exposes the registration resource so users can join and leave conferences.
     class ConferenceRegistrationsController < Decidim::Conferences::ApplicationController
+      before_action :ensure_signed_in
+
       def create
         enforce_permission_to :join, :conference, conference: conference
 
@@ -54,6 +56,20 @@ module Decidim
 
       private
 
+      def ensure_signed_in
+        return if user_signed_in?
+
+        case action_name
+        when "create"
+          flash[:alert] = t("conference_registrations.create.unauthorized", scope: "decidim.conferences")
+        when "decline_invitation"
+          flash[:alert] = t("conference_registrations.decline_invitation.unauthorized", scope: "decidim.conferences")
+        else
+          raise Decidim::ActionForbidden
+        end
+        redirect_to(user_has_no_permission_referer || user_has_no_permission_path)
+      end
+
       def conference
         @conference ||= Conference.find_by(slug: params[:conference_slug])
       end
@@ -65,6 +81,7 @@ module Decidim
       def redirect_after_path
         referer = request.headers["Referer"]
         return redirect_to(conference_path(conference)) if referer =~ /invitation_token/
+        return redirect_to(conference_path(conference)) if referer =~ %r{users/sign_in}
 
         redirect_back fallback_location: conference_path(conference)
       end

data/app/permissions/decidim/conferences/permissions.rb

@@ -77,6 +77,7 @@ module Decidim
       end
 
       def can_decline_invitation?
+        return unless user
         return unless conference.presence
         return unless conference.registrations_enabled? &&
                       conference.conference_invites.exists?(user: user) &&

data/app/views/decidim/conferences/admin/conference_speakers/edit.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: conference_speaker_path(@item.conference, @item), html: { class: "form edit_conference_speaker" }) do |f| %>
+<%= decidim_form_for(@form, url: conference_speaker_path(conference_speaker.conference, conference_speaker), html: { class: "form edit_conference_speaker" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("conference_speakers.edit.title", scope: "decidim.admin") } %>
 
   <div class="button--double form-general-submit">

data/app/views/decidim/conferences/admin/invite_join_conference_mailer/invite.html.erb

@@ -1,12 +1,12 @@
 <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t ".invited_you_to_join_a_conference", invited_by: @invited_by.name, application: @user.organization.name %>
+  <%= t ".invited_existing_user_to_join_a_conference", invited_by: @invited_by.name, application: @user.organization.name %>
 </p>
 
 <p class="email-button email-button__cta cta-decline">
-  <%= link_to t(".decline", conference_title: translated_attribute(@conference.title)),routes.decline_invitation_conference_registration_type_conference_registration_path(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
+  <%= link_to t(".decline", conference_title: translated_attribute(@conference.title)), routes.decline_invitation_conference_registration_type_conference_registration_url(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
 </p>
 <p class="email-button email-button__cta cta-accept">
-  <%= link_to t(".registration", conference_title: translated_attribute(@conference.title)),routes.conference_registration_type_conference_registration_url(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
+  <%= link_to t(".registration", conference_title: translated_attribute(@conference.title)), routes.conference_registration_type_conference_registration_url(conference_slug: @conference.slug, registration_type_id: @registration_type.id) %>
 </p>

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

@@ -1,10 +1,10 @@
 <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
 
 <p class="email-instructions">
-  <%= t("decidim.conferences.admin.invite_join_conference_mailer.invite.invited_you_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+  <%= t("decidim.conferences.admin.invite_join_conference_mailer.invite.invited_user_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
 </p>
 
-<p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:conference]).conference_conference_registration_path(conference_slug: @opts[:conference]), host: @resource.organization.host) %></p>
+<p class="email-button email-button__cta"><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:conference]).conference_registration_type_conference_registration_path(conference_slug: @opts[:conference], registration_type_id: @opts[:registration_type]), host: @resource.organization.host) %></p>
 
 <% if @resource.invitation_due_at %>
   <p class="email-small"><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>

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

@@ -1,8 +1,8 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
 
-<%= t("decidim.conferences.admin.invite_join_conference_mailer.invite.invited_you_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+<%= t("decidim.conferences.admin.invite_join_conference_mailer.invite.invited_existing_user_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
 
-<%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:conference]).conference_conference_registration_path(conference_slug: @opts[:conference]), host: @resource.organization.host) %>
+<%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: Decidim::EngineRouter.main_proxy(@opts[:conference]).conference_registration_type_conference_registration_path(conference_slug: @opts[:conference], registration_type_id: @opts[:registration_type]), 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)) %>

data/config/locales/ar.yml

@@ -28,7 +28,6 @@ ar:
         show_statistics: عرض الإحصائيات
         sign_date: تاريخ التوقيع
         signature: التوقيع
-        signature_name: اسم التوقيع
         slogan: شعار
         slug: سبيكة العنوان الشبكي
         start_date: تاريخ البداية
@@ -37,13 +36,11 @@ ar:
         date: التاريخ
         link: الرابط
         title: العنوان
-        weight: وزن
       conference_partner:
         link: الرابط
         logo: الشعار
         name: الإسم
         partner_type: نوع الشريك
-        weight: وزن
       conference_registration_invite:
         email: البريد الإلكتروني
         name: الإسم
@@ -53,7 +50,6 @@ ar:
         description: الوصف
         price: السعر
         title: العنوان
-        weight: وزن
       conference_speaker:
         affiliation: الانتساب
         avatar: الصورة الرمزية
@@ -143,8 +139,6 @@ ar:
         edit:
           title: تحديث مسؤول المؤتمر.
           update: تحديث
-        index:
-          conference_admins_title: مدراء المؤتمر
         new:
           create: إنشاء
           title: مشرف المؤتمر الجديد.
@@ -393,7 +387,7 @@ ar:
         invite_join_conference_mailer:
           invite:
             decline: رفض الدعوة "%{conference_title}"
-            invited_you_to_join_a_conference: "%{invited_by} للانضمام إلى مؤتمر في %{application}. يمكنك رفضه أو قبوله من خلال الروابط أدناه."
+            invited_existing_user_to_join_a_conference: "%{invited_by} للانضمام إلى مؤتمر في %{application}. يمكنك رفضه أو قبوله من خلال الروابط أدناه."
             registration: التسجيل لـ "%{conference_title}"
         partners:
           index:
@@ -425,7 +419,7 @@ ar:
       conference_program:
         program_meeting:
           content: المحتوى
-          location: موقعك
+          location: الموقع
           speakers: مكبرات الصوت
           streaming: تدفق
         show:

data/config/locales/ca.yml

@@ -28,7 +28,7 @@ ca:
         show_statistics: Mostrar estadístiques
         sign_date: Data de signatura
         signature: Signatura
-        signature_name: nom de la signatura
+        signature_name: Nom de la signatura
         slogan: Eslògan
         slug: URL amigable
         start_date: Data d'inici
@@ -37,13 +37,13 @@ ca:
         date: Data
         link: Enllaç
         title: Títol
-        weight: Pes
+        weight: Ordre de posició
       conference_partner:
         link: Enllaç
         logo: Logo
         name: Nom
         partner_type: Tipus de col·laboració
-        weight: Pes
+        weight: Ordre de posició
       conference_registration_invite:
         email: Correu electrònic
         name: Nom
@@ -53,7 +53,7 @@ ca:
         description: Descripció
         price: Cost
         title: Títol
-        weight: Pes
+        weight: Ordre de posició
       conference_speaker:
         affiliation: Afiliació
         avatar: Imatge de perfil
@@ -134,7 +134,7 @@ ca:
           title: Actualitzar administradora de la jornada.
           update: Actualitzar
         index:
-          conference_admins_title: administradores de la jornada
+          conference_admins_title: Administradores de la jornada
         new:
           create: Crear
           title: Nova administradora de jornada.
@@ -312,6 +312,7 @@ ca:
           update: "%{user_name} ha actualitzat la col·laboradora %{resource_name} a la jornada %{space_name}"
         registration_type:
           create: "%{user_name} ha creat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
+          delete: "%{user_name} ha eliminat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
           publish: "%{user_name} ha publicat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
           unpublish: "%{user_name} ha despublicat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
           update: "%{user_name} ha actualitzat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
@@ -379,7 +380,8 @@ ca:
         invite_join_conference_mailer:
           invite:
             decline: Rebutjar la invitació a '%{conference_title}'
-            invited_you_to_join_a_conference: "%{invited_by} t'ha convidat a unir-te a una conferència a l'%{application}. Pots rebutjar o acceptar a través dels enllaços a continuació."
+            invited_existing_user_to_join_a_conference: "%{invited_by} t'ha convidat a unir-te a una conferència a l'%{application}. Pots rebutjar o acceptar a través dels enllaços a continuació."
+            invited_user_to_join_a_conference: "%{invited_by} t'ha convidat a unir-te a una conferència a %{application}. Pots acceptar-la a través del següent enllaç."
             registration: Inscripció a '%{conference_title}'
         partners:
           index:
@@ -430,9 +432,11 @@ ca:
         create:
           invalid: S'ha produït un error en inscriure't a aquesta jornada.
           success: T'has inscrit a la jornada correctament.
+          unauthorized: Cal que iniciïs la teva sessió abans d'inscriure't a la jornada.
         decline_invitation:
           invalid: S'ha produït un error en rebutjar la invitació.
           success: Has rebutjat la invitació correctament.
+          unauthorized: Cal que iniciïs la teva sessió abans de rebutjar la invitació.
         destroy:
           invalid: S'ha produït un error en abandonar aquesta jornada.
           success: Has abandonat la jornada correctament.

data/config/locales/cs.yml

@@ -28,7 +28,7 @@ cs:
         show_statistics: Zobrazit statistiky
         sign_date: Datum podpisu
         signature: Podpis
-        signature_name: podpisové jméno
+        signature_name: Podpisové jméno
         slogan: Motto
         slug: URL slug
         start_date: Datum zahájení
@@ -37,13 +37,13 @@ cs:
         date: Datum
         link: Odkaz
         title: Název
-        weight: Váha
+        weight: Pozice v řazení
       conference_partner:
         link: Odkaz
         logo: Logo
         name: Název
         partner_type: Typ partnera
-        weight: Váha
+        weight: Pozice v řazení
       conference_registration_invite:
         email: E-mail
         name: Jméno
@@ -53,7 +53,7 @@ cs:
         description: Popis
         price: Cena
         title: Oslovení
-        weight: Váha
+        weight: Pozice v řazení
       conference_speaker:
         affiliation: Příslušnost
         avatar: Avatar
@@ -140,7 +140,7 @@ cs:
           title: Aktualizovat uživatele konference.
           update: Aktualizace
         index:
-          conference_admins_title: administrátoři konference
+          conference_admins_title: Administrátoři konference
         new:
           create: Vytvořit
           title: Nový administrátor konference.
@@ -318,6 +318,7 @@ cs:
           update: "%{user_name} aktualizoval partnera %{resource_name} na konferenci %{space_name}"
         registration_type:
           create: "%{user_name} vytvořil typ registrace %{resource_name} na konferenci %{space_name}"
+          delete: "%{user_name} odstranil typ registrace %{resource_name} z konference %{space_name}"
           publish: "%{user_name} publikoval %{resource_name} typ registrace na %{space_name} konferencích"
           unpublish: "%{user_name} nepublikováno %{resource_name} typ registrace na %{space_name} konferencích"
           update: "%{user_name} aktualizoval typ registrace %{resource_name} na konferenci %{space_name}"
@@ -387,7 +388,8 @@ cs:
         invite_join_conference_mailer:
           invite:
             decline: Odmítnout pozvánku '%{conference_title}'
-            invited_you_to_join_a_conference: "%{invited_by} vás zve na konferenci na %{application}. Můžete jej odmítnout nebo přijmout prostřednictvím níže uvedených odkazů."
+            invited_existing_user_to_join_a_conference: "%{invited_by} vás zve na konferenci na %{application}. Můžete jej odmítnout nebo přijmout prostřednictvím níže uvedených odkazů."
+            invited_user_to_join_a_conference: "%{invited_by} vás pozval, abyste se připojili ke konferenci v %{application}. Můžete ji přijmout prostřednictvím níže uvedeného odkazu."
             registration: Registrace pro "%{conference_title}"
         partners:
           index:
@@ -419,7 +421,7 @@ cs:
       conference_program:
         program_meeting:
           content: Obsah
-          location: Umístění
+          location: Lokalita
           speakers: Řečníci
           streaming: Streamování
         show:
@@ -438,9 +440,11 @@ cs:
         create:
           invalid: Do této konference došlo k problému.
           success: Do konference jste se úspěšně připojili.
+          unauthorized: Před registrací na konferenci se musíte přihlásit.
         decline_invitation:
           invalid: Došlo k potížím s odmítnutím pozvánky.
           success: Odmítli jste pozvánku úspěšně.
+          unauthorized: Před odmítnutím pozvání se musíte přihlásit.
         destroy:
           invalid: Při této konferenci došlo k problému.
           success: Konference jste úspěšně opustili.

data/config/locales/de.yml

@@ -28,7 +28,6 @@ de:
         show_statistics: Zeige Statistiken
         sign_date: Unterzeichnungsdatum
         signature: Unterschrift
-        signature_name: Signaturname
         slogan: Slogan
         slug: URL-Block
         start_date: Startdatum
@@ -37,13 +36,13 @@ de:
         date: Datum
         link: Link
         title: Titel
-        weight: Gewicht
+        weight: Reihenfolge
       conference_partner:
         link: Link
         logo: Logo
         name: Name
         partner_type: Partnertyp
-        weight: Gewicht
+        weight: Reihenfolge
       conference_registration_invite:
         email: E-Mail
         name: Name
@@ -53,7 +52,7 @@ de:
         description: Beschreibung
         price: Preis
         title: Titel
-        weight: Gewicht
+        weight: Reihenfolge
       conference_speaker:
         affiliation: Zugehörigkeit
         avatar: Profilbild
@@ -133,8 +132,6 @@ de:
         edit:
           title: Aktualisieren Sie den Konferenzbenutzer.
           update: Aktualisieren
-        index:
-          conference_admins_title: Konferenzbenutzer
         new:
           create: Erstellen
           title: Neuer Konferenzbenutzer
@@ -246,7 +243,7 @@ de:
             price: Preis
             registrations_count: Registrierungen zählen
             title: Titel
-            weight: Bestellposition
+            weight: Reihenfolge
           name: Registrierungstyp
       partners:
         create:
@@ -379,7 +376,7 @@ de:
         invite_join_conference_mailer:
           invite:
             decline: Einladung '%{conference_title}' ablehnen
-            invited_you_to_join_a_conference: "%{invited_by} hat Sie eingeladen, an einer Konferenz um %{application}teilzunehmen. Sie können dies über die unten stehenden Links ablehnen oder akzeptieren."
+            invited_existing_user_to_join_a_conference: "%{invited_by} hat Sie eingeladen, an einer Konferenz um %{application}teilzunehmen. Sie können dies über die unten stehenden Links ablehnen oder akzeptieren."
             registration: Registrierung für '%{conference_title}'
         partners:
           index:

data/config/locales/el.yml

@@ -28,7 +28,6 @@ el:
         show_statistics: Εμφάνιση στατιστικών
         sign_date: Ημερομηνία υπογραφής
         signature: Υπογραφή
-        signature_name: όνομα υπογραφής
         slogan: Σύνθημα
         slug: Slug διεύθυνσης URL
         start_date: Ημερομηνία έναρξης
@@ -37,13 +36,11 @@ el:
         date: Ημερομηνία
         link: Σύνδεσμος
         title: Τίτλος
-        weight: Βάρος
       conference_partner:
         link: Σύνδεσμος
         logo: Λογότυπο
         name: Όνομα
         partner_type: Τύπος εταίρου
-        weight: Βάρος
       conference_registration_invite:
         name: Όνομα
         registration_type_id: Τύπος εγγραφής
@@ -52,7 +49,6 @@ el:
         description: Περιγραφή
         price: Τιμή
         title: Τίτλος
-        weight: Βάρος
       conference_speaker:
         affiliation: Δεσμός
         avatar: Εικόνα Χρήστη
@@ -130,8 +126,6 @@ el:
         edit:
           title: Ενημέρωση διαχειριστή διάσκεψης.
           update: Ενημέρωση
-        index:
-          conference_admins_title: διαχειριστές διάσκεψης
         new:
           create: Δημιουργία
           title: Νέος διαχειριστής διάσκεψης.
@@ -376,7 +370,7 @@ el:
         invite_join_conference_mailer:
           invite:
             decline: Απόρριψη πρόσκλησης «%{conference_title}»
-            invited_you_to_join_a_conference: "Ο χρήστης %{invited_by} σάς προσκάλεσε να συμμετάσχετε σε μια διάσκεψη στην εφαρμογή %{application}. Μπορείτε να την απορρίψετε ή να την αποδεχτείτε μέσω των παρακάτω συνδέσμων."
+            invited_existing_user_to_join_a_conference: "Ο χρήστης %{invited_by} σάς προσκάλεσε να συμμετάσχετε σε μια διάσκεψη στην εφαρμογή %{application}. Μπορείτε να την απορρίψετε ή να την αποδεχτείτε μέσω των παρακάτω συνδέσμων."
             registration: Εγγραφή για τη διάσκεψη «%{conference_title}»
         partners:
           index:

data/config/locales/en.yml

@@ -29,7 +29,7 @@ en:
         show_statistics: Show statistics
         sign_date: Sign date
         signature: Signature
-        signature_name: signature name
+        signature_name: Signature name
         slogan: Slogan
         slug: URL slug
         start_date: Start date
@@ -38,13 +38,13 @@ en:
         date: Date
         link: Link
         title: Title
-        weight: Weight
+        weight: Order position
       conference_partner:
         link: Link
         logo: Logo
         name: Name
         partner_type: Partner type
-        weight: Weight
+        weight: Order position
       conference_registration_invite:
         email: Email
         name: Name
@@ -54,7 +54,7 @@ en:
         description: Description
         price: Price
         title: Title
-        weight: Weight
+        weight: Order position
       conference_speaker:
         affiliation: Affiliation
         avatar: Avatar
@@ -135,7 +135,7 @@ en:
           title: Update conference admin.
           update: Update
         index:
-          conference_admins_title: conference admins
+          conference_admins_title: Conference admins
         new:
           create: Create
           title: New conference admin.
@@ -313,6 +313,7 @@ en:
           update: "%{user_name} updated the partner %{resource_name} in the %{space_name} conference"
         registration_type:
           create: "%{user_name} created the %{resource_name} registration type in the %{space_name} conference"
+          delete: "%{user_name} removed the %{resource_name} registration type from the %{space_name} conference"
           publish: "%{user_name} published the %{resource_name} registration type in the %{space_name} conference"
           unpublish: "%{user_name} unpublished the %{resource_name} registration type in the %{space_name} conference"
           update: "%{user_name} updated the %{resource_name} registration type in the %{space_name} conference"
@@ -380,7 +381,8 @@ en:
         invite_join_conference_mailer:
           invite:
             decline: Decline invitation '%{conference_title}'
-            invited_you_to_join_a_conference: "%{invited_by} has invited you to join a conference at %{application}. You can decline or accept it through the links below."
+            invited_existing_user_to_join_a_conference: "%{invited_by} has invited you to join a conference at %{application}. You can decline or accept it through the links below."
+            invited_user_to_join_a_conference: "%{invited_by} has invited you to join a conference at %{application}. You can accept it through the link below."
             registration: Registration for '%{conference_title}'
         partners:
           index:
@@ -431,9 +433,11 @@ en:
         create:
           invalid: There was a problem joining this conference.
           success: You have successfully joined the conference.
+          unauthorized: You need to sign in before registering to the conference.
         decline_invitation:
           invalid: There was a problem declining the invitation.
           success: You have successfully declined the invitation.
+          unauthorized: You need to sign in before declining the invitation.
         destroy:
           invalid: There was a problem leaving this conference.
           success: You have successfully left the conference.