decidim-conferences 0.26.9 → 0.27.0.rc1

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("conference_user_roles.index.conference_admins_title", scope: "decidim.admin")) %>
 <div class='card' id="conference_admins">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/conferences/admin/conference_user_roles/new.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("conference_user_roles.new.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, html: { class: "form new_conference_user_role" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("conference_user_roles.new.title", scope: "decidim.admin") } %>
 

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

@@ -32,11 +32,11 @@
     </div>
 
     <div class="row column">
-      <%= form.translated :editor, :description %>
+      <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
     </div>
 
     <div class="row column">
-      <%= form.translated :editor, :objectives %>
+      <%= form.translated :editor, :objectives, toolbar: :full, lines: 25 %>
     </div>
 
     <div class="row column">
@@ -84,7 +84,7 @@
     </div>
 
     <div class="row column" id="conference_registrations_terms">
-      <%= form.translated :editor, :registration_terms, toolbar: :content %>
+      <%= form.translated :editor, :registration_terms %>
     </div>
 
     <div class="row column">

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(translated_attribute(current_conference.title)) %>
 <%= decidim_form_for(@form, html: { class: "form edit_conference conference_form_admin" }) do |f| %>
   <%= render partial: "form", object: f %>
   <div class="button--double form-general-submit">

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("decidim.admin.titles.conferences")) %>
 <div class="card with-overflow" id="conferences">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/conferences/admin/conferences/new.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("conferences.new.title", scope: "decidim.admin")) %>
 <h2 class="conference-title-summary">
   <%= t "conferences.new.title", scope: "decidim.admin" %>
 </h2>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("diplomas.edit.title", scope: "decidim.conferences.admin")) %>
 <%= decidim_form_for(@form, url: conference_diploma_path, html: { class: "form edit_conference_diploma" })  do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("diplomas.edit.title", scope: "decidim.conferences.admin") } %>
 

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_existing_user_to_join_a_conference", invited_by: @invited_by.name, application: @user.organization.name %>
+  <%= t ".invited_you_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_url(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_path(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/decidim/conferences/admin/media_links/edit.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("media_links.edit.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, url: conference_media_link_path(@media_link.conference, @media_link), html: { class: "form edit_media_link" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("media_links.edit.title", scope: "decidim.admin") } %>
 

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("media_links.index.media_links_title", scope: "decidim.admin")) %>
 <div class='card' id="media_links">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/conferences/admin/media_links/new.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("media_links.new.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, html: { class: "form new_media_link" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("media_links.new.title", scope: "decidim.admin") } %>
 

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

@@ -11,7 +11,8 @@
     </div>
 
     <div class="row column">
-     <%= form.select :partner_type, @form.types, { multiple: false, prompt: "" } %>
+      <%= form.label :partner_type %>
+      <%= select :conference_partner, :partner_type, @form.types, include_blank: false %>
     </div>
 
     <div class="row column">

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("partners.edit.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, url: conference_partner_path(@partner.conference, @partner), html: { class: "form edit_partner" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("partners.edit.title", scope: "decidim.admin") } %>
 

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class='card' id="partners">
   <div class="card-divider">
     <h2 class="card-title">
@@ -37,7 +36,9 @@
                 <% end %>
               </td>
               <td>
-                <%= image_tag(partner.attached_uploader(:logo).path(variant: :thumb)) %>
+                <% if partner.attached_uploader(:logo).path %>
+                  <%= image_tag(partner.attached_uploader(:logo).path(variant: :thumb)) %>
+                <% end %>
               </td>
               <td class="table-list__actions">
                 <% if allowed_to? :update, :partner, partner: partner %>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("partners.new.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, html: { class: "form new_partner" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("partners.new.title", scope: "decidim.admin") } %>
 

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("registration_types.edit.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, url: conference_registration_type_path(@registration_type.conference, @registration_type), html: { class: "form edit_registration_type" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("registration_types.edit.title", scope: "decidim.admin") } %>
 

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class='card' id="registration_types">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/conferences/admin/registration_types/new.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t("registration_types.new.title", scope: "decidim.admin")) %>
 <%= decidim_form_for(@form, html: { class: "form new_registration_type" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("registration_types.new.title", scope: "decidim.admin") } %>
 

data/app/views/decidim/conferences/conferences/_promoted_conference.html.erb

@@ -13,7 +13,7 @@
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card--full__image"
-           style="background-image:url('<%= promoted_conference.attached_uploader(:hero_image).path %>')">
+           style="background-image:url(<%= promoted_conference.attached_uploader(:hero_image).path %>)">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to conference_path(promoted_conference), class: "button expanded button--sc" do %>

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

@@ -20,12 +20,12 @@ edit_link(
   <div class="columns mediumlarge-12">
     <section class="section">
       <h3 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h3>
-      <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.short_description) %>
+      <%= decidim_sanitize_editor translated_attribute(current_participatory_space.short_description) %>
     </section>
     <hr class="reset mt-none mb-m">
     <section class="section">
       <h3 class="section-heading"><%= t("conferences.show.details", scope: "decidim") %></h3>
-      <%= decidim_sanitize_editor_admin translated_attribute(current_participatory_space.description) %>
+      <%= decidim_sanitize_editor translated_attribute(current_participatory_space.description) %>
       <div class="row mt-l mb-l">
         <div class="column medium-9 medium-centered">
           <% if current_participatory_space.registrations_enabled? %>

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_user_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.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) %>
 </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>
+<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>
 
 <% 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_existing_user_to_join_a_conference", invited_by: @resource.invited_by.name, application: @resource.organization.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) %>
 
-<%= 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) %>
+<%= 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) %>
 
 <% if @resource.invitation_due_at %>
 <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %>

data/app/views/layouts/decidim/_conference_hero.html.erb

@@ -1,5 +1,5 @@
 <section class="extended hero"
-  style="background-image:url('<%= current_participatory_space.attached_uploader(:banner_image).path %>');">
+  style="background-image:url(<%= current_participatory_space.attached_uploader(:banner_image).path %>);">
   <div class="hero__container">
     <div class="row">
       <div class="columns large-10 text-left">

data/app/views/layouts/decidim/_conferences_nav.html.erb

@@ -16,7 +16,7 @@
       active: is_active_link?(decidim_conferences.conference_conference_speakers_path(current_participatory_space), :inclusive)
     } : nil
   ] + meeting_components.map do |component|
-    Decidim::Meetings::Meeting.visible_meeting_for(current_user).any? ? {
+    Decidim::Meetings::Meeting.visible_for(current_user).any? ? {
       name: translated_attribute(component.name),
       url: decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id),
       active: is_active_link?(decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id), :inclusive)

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -37,11 +38,13 @@ ar:
         date: التاريخ
         link: الرابط
         title: العنوان
+        weight: وزن
       conference_partner:
         link: الرابط
         logo: الشعار
         name: الإسم
         partner_type: نوع الشريك
+        weight: وزن
       conference_registration_invite:
         email: البريد الإلكتروني
         name: الإسم
@@ -51,6 +54,7 @@ ar:
         description: الوصف
         price: السعر
         title: العنوان
+        weight: وزن
       conference_speaker:
         affiliation: الانتساب
         avatar: الصورة الرمزية
@@ -140,6 +144,8 @@ ar:
         edit:
           title: تحديث مسؤول المؤتمر.
           update: تحديث
+        index:
+          conference_admins_title: مدراء المؤتمر
         new:
           create: إنشاء
           title: مشرف المؤتمر الجديد.
@@ -332,6 +338,9 @@ ar:
         title: مكبرات الصوت
     conferences:
       admin:
+        conference_copies:
+          form:
+            slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذا المؤتمر. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'
         conference_invites:
           create:
             error: حدثت مشكلة أثناء دعوة المشارك للانضمام إلى المؤتمر.
@@ -344,7 +353,9 @@ ar:
             select_user: اختر المشارك
           index:
             filter:
+              accepted: وافقت
               all: الكل
+              rejected: مرفوض
               sent: أرسلت
             filter_by: مصنف بواسطة
             invite_attendee: دعوة مشارك
@@ -375,6 +386,7 @@ ar:
               few: كان هناك %{count} التسجيلات.
               many: كان هناك %{count} التسجيلات.
               other: كان هناك %{count} التسجيلات.
+            slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذا المؤتمر. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'
         diplomas:
           edit:
             save: حفظ
@@ -382,7 +394,7 @@ ar:
         invite_join_conference_mailer:
           invite:
             decline: رفض الدعوة "%{conference_title}"
-            invited_existing_user_to_join_a_conference: "%{invited_by} للانضمام إلى مؤتمر في %{application}. يمكنك رفضه أو قبوله من خلال الروابط أدناه."
+            invited_you_to_join_a_conference: "%{invited_by} للانضمام إلى مؤتمر في %{application}. يمكنك رفضه أو قبوله من خلال الروابط أدناه."
             registration: التسجيل لـ "%{conference_title}"
         partners:
           index:
@@ -414,7 +426,7 @@ ar:
       conference_program:
         program_meeting:
           content: المحتوى
-          location: الموقع
+          location: موقعك
           speakers: مكبرات الصوت
           streaming: تدفق
         show:
@@ -505,6 +517,7 @@ ar:
           highlighted_conferences:
             active_conferences: المؤتمرات النشطة
             conferences_button_title: رابط إلى صفحة المؤتمرات لعرض جميع المؤتمرات
+            see_all_conferences: رؤية جميع المؤتمرات
       photo:
         image:
           attributes:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -28,7 +29,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 +38,13 @@ ca:
         date: Data
         link: Enllaç
         title: Títol
-        weight: Ordre de posició
+        weight: Pes
       conference_partner:
         link: Enllaç
         logo: Logo
         name: Nom
         partner_type: Tipus de col·laboració
-        weight: Ordre de posició
+        weight: Pes
       conference_registration_invite:
         email: Correu electrònic
         name: Nom
@@ -53,7 +54,7 @@ ca:
         description: Descripció
         price: Cost
         title: Títol
-        weight: Ordre de posició
+        weight: Pes
       conference_speaker:
         affiliation: Afiliació
         avatar: Imatge de perfil
@@ -134,7 +135,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,7 +313,6 @@ 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}"
@@ -346,7 +346,7 @@ ca:
               accepted: Acceptada
               all: Totes
               rejected: Rebutjada
-              sent: Enviat
+              sent: Enviada
             filter_by: Filtrar per
             invite_attendee: Convidar participant
             invites: Convida
@@ -380,8 +380,7 @@ ca:
         invite_join_conference_mailer:
           invite:
             decline: Rebutjar la invitació a '%{conference_title}'
-            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ç."
+            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ó."
             registration: Inscripció a '%{conference_title}'
         partners:
           index:
@@ -427,16 +426,14 @@ ca:
         pending_validation:
           confirmation_pending: Rebràs la confirmació en breu
           details: 'La teva inscripció a la jornada és de tipus %{registration_type} amb un cost de %{price} i pots assistir als següents esdeveniments:'
-          pending_html: La teva inscripció a la jornada <a href="%{url}">%{title}</a> està pendent de confirmació.
+          pending_html: La teva inscripció a la jornada <a href="%{url}">%{title}</a> està pendent de confirmación.
       conference_registrations:
         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.
@@ -485,7 +482,7 @@ ca:
           fields:
             email: Correu electrònic
             name: Nom
-            registration_type: Tipus d'inscripció
+            registration_type: Tipus de registre
             sent_at: Enviat a
             status: Estat
           status: