decidim-conferences 0.23.3 → 0.24.1

data/app/models/decidim/conference_speaker.rb

@@ -14,7 +14,7 @@ module Decidim
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
     belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
     has_many :conference_speaker_conference_meetings, dependent: :destroy
-    has_many :conference_meetings, through: :conference_speaker_conference_meetings, foreign_key: "conference_speaker_id", class_name: "Decidim::ConferenceMeeting"
+    has_many :conference_meetings, through: :conference_speaker_conference_meetings, class_name: "Decidim::ConferenceMeeting"
 
     default_scope { order(full_name: :asc, created_at: :asc) }
 

data/app/models/decidim/conference_speaker_conference_meeting.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   class ConferenceSpeakerConferenceMeeting < ApplicationRecord
-    belongs_to :conference_speaker, foreign_key: "conference_speaker_id", class_name: "Decidim::ConferenceSpeaker"
-    belongs_to :conference_meeting, foreign_key: "conference_meeting_id", class_name: "Decidim::ConferenceMeeting"
+    belongs_to :conference_speaker, class_name: "Decidim::ConferenceSpeaker"
+    belongs_to :conference_meeting, class_name: "Decidim::ConferenceMeeting"
   end
 end

data/app/models/decidim/conferences/conference_meeting_registration_type.rb

@@ -3,8 +3,8 @@
 module Decidim
   module Conferences
     class ConferenceMeetingRegistrationType < ApplicationRecord
-      belongs_to :conference_meeting, foreign_key: "conference_meeting_id", class_name: "Decidim::ConferenceMeeting"
-      belongs_to :registration_type, foreign_key: "registration_type_id", class_name: "Decidim::Conferences::RegistrationType"
+      belongs_to :conference_meeting, class_name: "Decidim::ConferenceMeeting"
+      belongs_to :registration_type, class_name: "Decidim::Conferences::RegistrationType"
     end
   end
 end

data/app/models/decidim/conferences/registration_type.rb

@@ -13,7 +13,7 @@ module Decidim
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       has_many :conference_meeting_registration_types, dependent: :destroy
-      has_many :conference_meetings, through: :conference_meeting_registration_types, foreign_key: "registration_type_id", class_name: "Decidim::ConferenceMeeting"
+      has_many :conference_meetings, through: :conference_meeting_registration_types, class_name: "Decidim::ConferenceMeeting"
       has_many :conference_registrations, foreign_key: "decidim_conference_registration_type_id", class_name: "Decidim::Conferences::ConferenceRegistration", dependent: :destroy
 
       default_scope { order(weight: :asc) }

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

@@ -80,7 +80,7 @@ module Decidim
       def can_decline_invitation?
         return unless conference.presence
         return unless conference.registrations_enabled? &&
-                      conference.conference_invites.where(user: user).exists? &&
+                      conference.conference_invites.exists?(user: user) &&
                       permission_action.action == :decline_invitation &&
                       permission_action.subject == :conference
 

data/app/presenters/decidim/conferences/conference_stats_presenter.rb

@@ -10,7 +10,7 @@ module Decidim
       # Public: Render a collection of primary stats.
       def highlighted
         highlighted_stats = component_stats(priority: StatsRegistry::HIGH_PRIORITY)
-        highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
         highlighted_stats = highlighted_stats.reject(&:empty?)
         highlighted_stats = highlighted_stats.reject { |_manifest, _name, data| data.zero? }
         grouped_highlighted_stats = highlighted_stats.group_by { |stats| stats.first.name }

data/app/views/decidim/conferences/admin/conference_invites/index.html.erb

@@ -39,7 +39,7 @@
 <div class="card" id="conference-invites">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= title %> - <%= t(".invites") %>
+      <%= t(".invites") %>
       <%= link_to t(".invite_attendee"), conference.registrations_enabled ? new_conference_conference_invite_path(conference) : "#", class: "button tiny button--title #{'disabled' unless conference.registrations_enabled && allowed_to?(:invite_attendee, :conference, conference: conference) }" %>
     </h2>
   </div>

data/app/views/decidim/conferences/admin/conference_registrations/index.html.erb

@@ -1,7 +1,7 @@
 <div class="card" id="conference-registrations">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= title %> - <%= t(".registrations") %>
+      <%= t(".registrations") %>
       <% if allowed_to? :export_conference_registrations, :conference, conference: conference %>
         <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">

data/app/views/decidim/conferences/admin/partners/_form.html.erb

@@ -24,7 +24,7 @@
     </div>
 
     <div class="row column">
-      <%= form.upload :logo, optional: false %>
+      <%= form.upload :logo %>
     </div>
   </div>
 </div>

data/app/views/layouts/decidim/admin/conference.html.erb

@@ -13,7 +13,7 @@
           <ul id="components-list">
             <% current_participatory_space.components.each do |component| %>
               <% if component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name) %>
-                <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_conferences.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_conferences.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
+                <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_conferences.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_conferences.edit_component_permissions_path(current_participatory_space, component)) || participatory_space_active_link?(component) %> class="is-active" <% end %>>
                   <%= link_to manage_component_path(component) do %>
                     <%= translated_attribute component.name %>
                     <% if component.primary_stat.present? %>
@@ -101,6 +101,7 @@
           <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.conferences_submenu"), decidim_admin_conferences.moderations_path(current_participatory_space) %>
         </li>
       <% end %>
+      <%= Decidim::Admin.view_hooks.render(:admin_secondary_nav, deep_dup) %>
     </ul>
   </div>
 <% end %>

data/config/locales/ar.yml

@@ -22,6 +22,12 @@ ar:
         slogan: شعار
         slug: سبيكة العنوان الشبكي
         title: عنوان
+      conference_media_link:
+        weight: وزن
+      conference_partner:
+        weight: وزن
+      conference_registration_type:
+        weight: وزن
       conference_speaker:
         full_name: الاسم الكامل
       conference_user_role:
@@ -277,10 +283,6 @@ ar:
       conferences:
         conference_registration:
           confirm: "%{user_name} أكد تسجيل مؤتمر في مؤتمر %{resource_name}"
-        partner:
-          create: "%{user_name} أنشأ %{resource_name} إلى %{space_name} المؤتمر"
-          delete: "%{user_name} أزال المشرف %{resource_name} من المؤتمر %{space_name}"
-          update: "%{user_name} محدث %{resource_name} في المؤتمر %{space_name}"
         registration_type:
           create: "%{user_name} أنشأ نوع التسجيل %{resource_name} في المؤتمر %{space_name}"
           publish: "%{user_name} نشر نوع التسجيل %{resource_name} في المؤتمر %{space_name}"

data/config/locales/ca.yml

@@ -3,6 +3,7 @@ ca:
     attributes:
       conference:
         assemblies_ids: Assemblees relacionades
+        available_slots: Llocs lliures
         banner_image: Imatge de banner
         consultations_ids: Consultes relacionades
         copy_categories: Copiar categories
@@ -10,20 +11,59 @@ ca:
         copy_features: Copiar funcionalitats
         decidim_scope_id: Àmbit
         description: Descripció
+        end_date: Data de fi
         hashtag: Hashtag
         hero_image: Imatge de la pàgina d'inici
+        location: Situació
+        main_logo: Logo principal
+        objectives: Objectius
         participatory_processes_ids: Processos participatius relacionats
         promoted: Destacada
         published_at: Publicat a
+        registration_terms: Condicions d'inscripció
+        registrations_enabled: Inscripcions habilitades
         scope_id: Àmbit
         scopes_enabled: Àmbits habilitats
         short_description: Breu descripció
         show_statistics: Mostrar estadístiques
+        sign_date: Data de signatura
+        signature: Signatura
+        signature_name: nom de la signatura
         slogan: Eslògan
         slug: URL amigable
+        start_date: Data d'inici
+        title: Títol
+      conference_media_link:
+        date: Data
+        link: Enllaç
+        title: Títol
+        weight: Pes
+      conference_partner:
+        link: Enllaç
+        logo: Logo
+        name: Nom
+        partner_type: Tipus de col·laboració
+        weight: Pes
+      conference_registration_invite:
+        email: Correu electrònic
+        name: Nom
+        registration_type_id: Tipus d'inscripció
+        user_id: Usuària
+      conference_registration_type:
+        description: Descripció
+        price: Cost
         title: Títol
+        weight: Pes
       conference_speaker:
+        affiliation: Membre
+        avatar: Imatge de perfil
+        conference_meeting_ids: Trobades relacionades
         full_name: Nom complet
+        personal_url: URL personal
+        position: Càrrec
+        short_bio: Resum biogràfic
+        twitter_handle: Compte de Twitter
+        user_id: Usuària
       conference_user_role:
         email: Correu electrònic
         name: Nom
@@ -267,9 +307,9 @@ ca:
         conference_registration:
           confirm: "%{user_name} ha confirmat la seva inscripció a la jornada %{resource_name}"
         partner:
-          create: "%{user_name} ha creat %{resource_name} a la jornada %{space_name}"
-          delete: "%{user_name} ha eliminat l'administradora %{resource_name} de la jornada %{space_name}"
-          update: "%{user_name} ha actualitzat %{resource_name} a la jornada %{space_name}"
+          create: "%{user_name} ha creat la col·laboradora %{resource_name} a la jornada %{space_name}"
+          delete: "%{user_name} ha eliminat la col·laboradora %{resource_name} a la jornada %{space_name}"
+          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}"
           publish: "%{user_name} ha publicat el tipus d'inscripció %{resource_name} a la jornada %{space_name}"
@@ -402,6 +442,7 @@ ca:
         personal_website: Lloc web personal
         show:
           more_info: més informació
+          speaking_at: Intervé a
       conference_speaker_cell:
         personal_url:
           personal_website: Lloc web personal
@@ -539,6 +580,12 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint la jornada "%{resource_title}". Podeu deixar-la de seguir-a des de l'enllaç anterior.
           email_subject: La jornada "%{resource_title}" s'apropa!
           notification_title: La jornada <a href="%{resource_path}">%{resource_title}</a> començarà en 2 dies.
+    help:
+      participatory_spaces:
+        conferences:
+          contextual: "<p>Una <strong>conferència</strong> és un conjunt de trobades organitzades en un programa, amb un grup de persones convidades com a ponents, i altres camps d'informació típics dels grans congressos o esdeveniments socials (inscripció, llista d'organitzacions que secunden o patrocinen l'esdeveniment, etc.).</p> <p>Exemples: Una conferència pot ser un esdeveniment rellevant per a una organització i els seus membres, o pot tenir lloc com a part d'un procés participatiu o després d'una consulta.</p>"
+          page: "<p>Una <strong>conferència</strong> és un conjunt de trobades organitzades en un programa, amb un grup de persones convidades com a ponents, i altres camps d'informació típics dels grans congressos o esdeveniments socials (inscripció, llista d'organitzacions que secunden o patrocinen l'esdeveniment, etc.).</p> <p>Exemples: Una conferència pot ser un esdeveniment rellevant per a una organització i els seus membres, o pot tenir lloc com a part d'un procés participatiu o després d'una consulta.</p>"
+          title: Què són les conferències?
     log:
       value_types:
         conference_presenter:

data/config/locales/cs.yml

@@ -3,6 +3,7 @@ cs:
     attributes:
       conference:
         assemblies_ids: Související shromáždění
+        available_slots: Dostupné sloty
         banner_image: Obrázek banneru
         consultations_ids: Související konzultace
         copy_categories: Kopírovat kategorie
@@ -10,20 +11,59 @@ cs:
         copy_features: Funkce kopírování
         decidim_scope_id: Oblast působnosti
         description: Popis
+        end_date: Datum ukončení
         hashtag: Hashtag
         hero_image: Obrázek na hlavní stránce
+        location: Lokalita
+        main_logo: Hlavní logo
+        objectives: Cíle
         participatory_processes_ids: Související procesy účasti
         promoted: Propagováno
         published_at: Publikováno v
+        registration_terms: Podmínky registrace
+        registrations_enabled: Registrace povoleny
         scope_id: Oblast působnosti
         scopes_enabled: Oblasti působnosti povoleny
         short_description: Stručný popis
         show_statistics: Zobrazit statistiky
+        sign_date: Datum podpisu
+        signature: Podpis
+        signature_name: podpisové jméno
         slogan: Motto
         slug: URL slug
+        start_date: Datum zahájení
         title: Titul
+      conference_media_link:
+        date: Datum
+        link: Odkaz
+        title: Název
+        weight: Váha
+      conference_partner:
+        link: Odkaz
+        logo: Logo
+        name: Název
+        partner_type: Typ partnera
+        weight: Váha
+      conference_registration_invite:
+        email: E-mail
+        name: Jméno
+        registration_type_id: Typ registrace
+        user_id: Uživatel
+      conference_registration_type:
+        description: Popis
+        price: Cena
+        title: Oslovení
+        weight: Váha
       conference_speaker:
+        affiliation: Příslušnost
+        avatar: Avatar
+        conference_meeting_ids: Související schůzky
         full_name: Celé jméno
+        personal_url: Osobní adresa Url
+        position: Pozice
+        short_bio: Krátký životopis
+        twitter_handle: Twitter účet
+        user_id: Uživatel
       conference_user_role:
         email: E-mail
         name: název
@@ -273,9 +313,9 @@ cs:
         conference_registration:
           confirm: "%{user_name} potvrdil registraci konference na konferenci %{resource_name}"
         partner:
-          create: "%{user_name} vytvořil %{resource_name} na konferenci %{space_name}"
-          delete: "%{user_name} odstranil uživatele %{resource_name} z konference %{space_name}"
-          update: "%{user_name} aktualizoval %{resource_name} v konferenci %{space_name}"
+          create: "%{user_name} vytvořil partnera %{resource_name} na konferenci %{space_name}"
+          delete: "%{user_name} odstranil partnera %{resource_name} z konference %{space_name}"
+          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}"
           publish: "%{user_name} publikoval %{resource_name} typ registrace na %{space_name} konferencích"
@@ -309,7 +349,7 @@ cs:
           index:
             filter:
               accepted: Přijato
-              all: Všechno
+              all: Vše
               rejected: Odmítnuto
               sent: Odesláno
             filter_by: Filtrovat podle
@@ -410,6 +450,7 @@ cs:
         personal_website: Osobní web
         show:
           more_info: více informací
+          speaking_at: Má projev v
       conference_speaker_cell:
         personal_url:
           personal_website: Osobní web
@@ -547,6 +588,12 @@ cs:
           email_outro: Toto upozornění jste obdrželi, protože jste sledovali konferenci "%{resource_title}". Můžete jej odhlásit od předchozího odkazu.
           email_subject: Konference "%{resource_title}" přichází!
           notification_title: Konference <a href="%{resource_path}">%{resource_title}</a> přichází za 2 dny.
+    help:
+      participatory_spaces:
+        conferences:
+          contextual: "<p> <strong>Konference</strong> je několik schůzek uspořádaných v rámci programu s řadou lidí pozvaných jako řečníci, a další informační pole typická pro velké kongresy nebo společenské události (registrace, seznam organizací, které podporují nebo sponzorují událost atd.).</p> <p>Příklady: Konference může být relevantní pro organizaci a její členy, nebo se koná v rámci účastnického procesu, nebo následuje konzultace.</p>\n"
+          page: "<p> <strong>Konference</strong> je několik schůzek uspořádaných v rámci programu s řadou lidí pozvaných jako řečníci, a další informační pole typická pro velké kongresy nebo společenské události (registrace, seznam organizací, které podporují nebo sponzorují událost atd.).</p> <p>Příklady: Konference může být relevantní pro organizaci a její členy, nebo se koná v rámci účastnického procesu, nebo následuje konzultace.</p>\n"
+          title: Co jsou konference?
     log:
       value_types:
         conference_presenter:

data/config/locales/de.yml

@@ -22,6 +22,12 @@ de:
         slogan: Slogan
         slug: URL-Block
         title: Titel
+      conference_media_link:
+        weight: Gewicht
+      conference_partner:
+        weight: Gewicht
+      conference_registration_type:
+        weight: Gewicht
       conference_speaker:
         full_name: Vollständiger Name
       conference_user_role:
@@ -267,9 +273,9 @@ de:
         conference_registration:
           confirm: "%{user_name} hat eine Anmeldung zur Konferenz %{resource_name} bestätigt"
         partner:
-          create: "%{user_name} hat %{resource_name} zur Konferenz %{space_name} hinzugefügt"
-          delete: "%{user_name} hat den Admin %{resource_name} aus der Konferenz %{space_name} entfernt"
-          update: "%{user_name} hat %{resource_name} in der Konferenz %{space_name} aktualisiert"
+          create: "%{user_name} hat den Partner %{resource_name} in der Konferenz %{space_name} erstellt"
+          delete: "%{user_name} hat den Partner %{resource_name} aus der Konferenz %{space_name} entfernt"
+          update: "%{user_name} hat den Partner %{resource_name} in der Konferenz %{space_name} aktualisiert"
         registration_type:
           create: "%{user_name} hat den Registrierungstyp %{resource_name} in der Konferenz %{space_name} erstellt"
           publish: "%{user_name} hat den Registrierungstyp %{resource_name} in der Konferenz %{space_name} veröffentlicht"
@@ -402,6 +408,7 @@ de:
         personal_website: Persönliche Webseite
         show:
           more_info: Mehr Informationen
+          speaking_at: Sprecher bei
       conference_speaker_cell:
         personal_url:
           personal_website: Persönliche Webseite
@@ -539,6 +546,12 @@ de:
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie der Konferenz "%{resource_title}" folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
           email_subject: Die Konferenz "%{resource_title}" kommt!
           notification_title: Die Konferenz <a href="%{resource_path}">%{resource_title}</a> beginnt in 2 Tagen.
+    help:
+      participatory_spaces:
+        conferences:
+          contextual: "<p>Eine <strong>Konferenz</strong> ist eine Sammlung von Meetings, die in einem Programm organisiert werden, mit einer Anzahl von Personen, die als Referenten eingeladen werden und andere Informationsfelder, die für große Kongresse oder gesellschaftliche Veranstaltungen typisch sind (Registrierung, Liste der Organisationen, die die Veranstaltung unterstützen oder sponsern, usw.)..</p> <p>Beispiele: Eine Konferenz kann ein relevantes Ereignis für eine Organisation und ihre Mitglieder sein oder im Rahmen eines partizipatorischen Prozesses oder einer Beratung folgen.</p>\n"
+          page: "<p>Eine <strong>Konferenz</strong> ist eine Sammlung von Meetings, die in einem Programm organisiert werden, mit einer Anzahl von Personen, die als Referenten eingeladen werden und andere Informationsfelder, die für große Kongresse oder gesellschaftliche Veranstaltungen typisch sind (Registrierung, Liste der Organisationen, die die Veranstaltung unterstützen oder sponsern, usw.)..</p> <p>Beispiele: Eine Konferenz kann ein relevantes Ereignis für eine Organisation und ihre Mitglieder sein oder im Rahmen eines partizipatorischen Prozesses oder einer Beratung folgen.</p>\n"
+          title: Was sind Konferenzen?
     log:
       value_types:
         conference_presenter:

data/config/locales/el.yml

@@ -22,6 +22,12 @@ el:
         slogan: Σύνθημα
         slug: Slug διεύθυνσης URL
         title: Τίτλος
+      conference_media_link:
+        weight: Βάρος
+      conference_partner:
+        weight: Βάρος
+      conference_registration_type:
+        weight: Βάρος
       conference_speaker:
         full_name: Ονοματεπώνυμο
       conference_user_role:
@@ -266,10 +272,6 @@ el:
       conferences:
         conference_registration:
           confirm: "Ο χρήστης %{user_name} επιβεβαίωση μια εγγραφή διάσκεψης στη διάσκεψη %{resource_name}"
-        partner:
-          create: "Ο χρήστης %{user_name} δημιούργησε %{resource_name} στη διάσκεψη %{space_name}"
-          delete: "Ο χρήστης %{user_name} κατάργησε τον διαχειριστή %{resource_name} από τη διάσκεψη %{space_name}"
-          update: "Ο χρήστης %{user_name} ενημέρωσε το στοιχείο %{resource_name} στη διάσκεψη %{space_name}"
         registration_type:
           create: "Ο χρήστης %{user_name} δημιούργησε τον τύπο εγγραφής %{resource_name} στη διάσκεψη %{space_name}"
           publish: "Ο χρήστης %{user_name} δημοσίευσε τον τύπο εγγραφής %{resource_name} στη διάσκεψη %{space_name}"

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
     attributes:
       conference:
         assemblies_ids: Related Assemblies
+        available_slots: Available slots
         banner_image: Banner image
         consultations_ids: Related Consultations
         copy_categories: Copy categories
@@ -11,20 +12,59 @@ en:
         copy_features: Copy features
         decidim_scope_id: Scope
         description: Description
+        end_date: End date
         hashtag: Hashtag
         hero_image: Home image
+        location: Location
+        main_logo: Main logo
+        objectives: Objectives
         participatory_processes_ids: Related participatory processes
         promoted: Highlighted
         published_at: Published at
+        registration_terms: Registration terms
+        registrations_enabled: Registrations enabled
         scope_id: Scope
         scopes_enabled: Scopes enabled
         short_description: Short description
         show_statistics: Show statistics
+        sign_date: Sign date
+        signature: Signature
+        signature_name: signature name
         slogan: Slogan
         slug: URL slug
+        start_date: Start date
+        title: Title
+      conference_media_link:
+        date: Date
+        link: Link
+        title: Title
+        weight: Weight
+      conference_partner:
+        link: Link
+        logo: Logo
+        name: Name
+        partner_type: Partner type
+        weight: Weight
+      conference_registration_invite:
+        email: Email
+        name: Name
+        registration_type_id: Registration type
+        user_id: User
+      conference_registration_type:
+        description: Description
+        price: Price
         title: Title
+        weight: Weight
       conference_speaker:
+        affiliation: Affiliation
+        avatar: Avatar
+        conference_meeting_ids: Related meetings
         full_name: Full name
+        personal_url: Personal url
+        position: Position
+        short_bio: Short Bio
+        twitter_handle: Twitter handle
+        user_id: User
       conference_user_role:
         email: Email
         name: Name
@@ -268,9 +308,9 @@ en:
         conference_registration:
           confirm: "%{user_name} confirmed a conference registration in %{resource_name} conference"
         partner:
-          create: "%{user_name} created %{resource_name} to the %{space_name} conference"
-          delete: "%{user_name} removed the admin %{resource_name} from the %{space_name} conference"
-          update: "%{user_name} updated %{resource_name} in the %{space_name} conference"
+          create: "%{user_name} created the partner %{resource_name} in the %{space_name} conference"
+          delete: "%{user_name} removed the partner %{resource_name} from the %{space_name} conference"
+          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"
           publish: "%{user_name} published the %{resource_name} registration type in the %{space_name} conference"
@@ -403,6 +443,7 @@ en:
         personal_website: Personal website
         show:
           more_info: more info
+          speaking_at: Speaking at
       conference_speaker_cell:
         personal_url:
           personal_website: Personal website
@@ -540,6 +581,12 @@ en:
           email_outro: You have received this notification because you are following the "%{resource_title}" conference. You can unfollow it from the previous link.
           email_subject: The "%{resource_title}" conference is coming!
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> conference is coming in 2 days.
+    help:
+      participatory_spaces:
+        conferences:
+          contextual: "<p>A <strong>conference</strong> is a collection of meetings arranged in a programme, with a number of people invited as speakers, and other information fields typical of large congresses or social events (registration, list of organisations that support or sponsor the event, etc.).</p> <p>Examples: A conference can be a relevant event for an organization and its members, or take place as part of a participatory process or follow a consultation.</p>\n"
+          page: "<p>A <strong>conference</strong> is a collection of meetings arranged in a programme, with a number of people invited as speakers, and other information fields typical of large congresses or social events (registration, list of organisations that support or sponsor the event, etc.).</p> <p>Examples: A conference can be a relevant event for an organization and its members, or take place as part of a participatory process or follow a consultation.</p>\n"
+          title: What are conferences?
     log:
       value_types:
         conference_presenter: