decidim-meetings 0.28.0.rc5 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d2e2fb699ba2144390022c28308729df22f5b8394b4dab2ddbb988ad703d10
-  data.tar.gz: 5a7670d74f16eba4abf620bb9cecc44f9e3a7e63359e1515eec685219221b8dd
+  metadata.gz: 2938d2f32497611f571869b77a695164b51a47bcac475980697e0fb05b5ee681
+  data.tar.gz: 7eeb90d0095cfd435bc7e1a27bfebff6d9d48eacfb98fa3fcf12fa7f72d6a46e
 SHA512:
-  metadata.gz: 69af369fbf457167d713ff1a29599c4df80e1e6ff7d0fa99dc2bd652693614e00d58d8afcac4c8fa60d57145396020c3f880335cada49076f0ee1f89f576c237
-  data.tar.gz: a181026621f948cdc8051f1f44414745ebddef520ce91114646effa4765b4b898c8855128fcc43c712a684d2eaad62152a9323757f6164229439f12e9c2babc9
+  metadata.gz: 4bd4972aefef8559a1b546210dd95d71d1db90e64406ab796ad6314a3d92a8c6dfbde876394fe68b62194a492f1a4374687b1ae50325cd131e37ef600c5e0076
+  data.tar.gz: 9d2d4b400fb87da7ee84d7d8ef1c39e78a8882be1b53465b72c76adbf551af0590fabb312a458235fcf953a5b4f0e3d6b7191e4c8a0a38a0aae2489e92ccaf9d

data/app/cells/decidim/meetings/dates_and_map/show.erb

@@ -10,10 +10,8 @@
       <span class="meeting__calendar-separator"><%= "-" if !same_day? || !same_month? %></span>
       <span><%= l(end_time, format: "%d") if !same_day? || !same_month? %></span>
     </div>
-    <div class="meeting__calendar-time">
-      <time datetime="<%= start_time.iso8601 %>"><%= l(start_time, format: "%H:%M") %></time>
-      <span class="meeting__calendar-separator"><%= "-" %></span>
-      <time datetime="<%= end_time.iso8601 %>"><%= l(end_time, format: "%H:%M") %></time>
+    <div class="meeting__calendar-year">
+      <span><%= year %></span>
     </div>
   </div>
 

data/app/cells/decidim/meetings/dates_and_map_cell.rb

@@ -17,6 +17,10 @@ module Decidim
         return render :static_map if display_map?
       end
 
+      def year
+        l model.start_time, format: "%Y"
+      end
+
       private
 
       def same_month?

data/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb

@@ -4,7 +4,7 @@
 
 <div class="content-block__title">
   <h2 class="h2 decorator">
-    <%= single_component? ? translated_attribute(model.name) : t("decidim.components.meetings.name") %>
+    <%= single_component? ? decidim_escape_translated(model.name) : t("decidim.components.meetings.name") %>
   </h2>
   <div class="label text-lg"><%= meetings_count %></div>
   <% if see_all_path.present? %>

data/app/cells/decidim/meetings/meeting_card_metadata_cell.rb

@@ -23,7 +23,7 @@ module Decidim
       private
 
       def meeting_items
-        [type, duration_item, comments_count_item, category_item, withdrawn_item]
+        [start_date_item, type, comments_count_item, category_item, withdrawn_item]
       end
 
       def meeting_items_for_map

data/app/cells/decidim/meetings/meeting_l/image.erb

@@ -1,5 +1,5 @@
 <time class="card__calendar" datetime="<%= meeting.start_time.iso8601 %>">
   <div class="card__calendar-month"><%= l(meeting.start_time, format: "%b") %></div>
   <div class="card__calendar-day"><%= l(meeting.start_time, format: "%d") %></div>
-  <div class="card__calendar-time"><%= l(meeting.start_time, format: "%H:%M") %></div>
+  <div class="card__calendar-year"><%= l(meeting.start_time, format: "%Y") %></div>
 </time>

data/app/cells/decidim/meetings/online_meeting_link/show.erb

@@ -16,6 +16,6 @@
       <p><%= t("micro_camera_permissions_warning", scope: "decidim.meetings.meetings.show") %></p>
     <% end %>
 
-     <%= link_to t("join_meeting", scope: "decidim.meetings.meetings.meeting"), live_event_url, target: "_blank", class: "button button__xl button__secondary", data: { "external-link": false } %>
+     <%= link_to t("join_meeting", scope: "decidim.meetings.meetings.meeting"), live_event_url, target: "_blank", class: "button button__xl button__secondary", data: { external_link: "text-only", external_domain_link: false } %>
   <% end %>
 </div>

data/app/packs/src/decidim/meetings/poll.component.js

@@ -1,5 +1,8 @@
 /* eslint id-length: ["error", { "exceptions": ["$"] }] */
 
+import createOptionAttachedInputs from "src/decidim/forms/option_attached_inputs.component"
+import createMaxChoicesAlertComponent from "src/decidim/forms/max_choices_alert.component"
+
 /**
  * A plain Javascript component that handles questions from polls in meetings:
  *   - fetches them via Ajax
@@ -75,6 +78,7 @@ export default class PollComponent {
       this._updateCounter();
       this._setQuestionsState(this.$element);
       this._pollQuestions();
+      this._addValidations();
     });
   }
 
@@ -163,4 +167,27 @@ export default class PollComponent {
       this.$counter.html(`(${questionsCount})`);
     }
   }
+
+  _addValidations() {
+    $(".js-radio-button-collection, .js-check-box-collection").each((idx, el) => {
+      createOptionAttachedInputs({
+        wrapperField: $(el),
+        controllerFieldSelector: "input[type=radio], input[type=checkbox]",
+        dependentInputSelector: "input[type=text], input[type=hidden]"
+      });
+    });
+
+    $.unique($(".js-check-box-collection").parents(".answer")).each((idx, el) => {
+      const maxChoices = $(el).data("max-choices");
+      if (maxChoices) {
+        createMaxChoicesAlertComponent({
+          wrapperField: $(el),
+          controllerFieldSelector: "input[type=checkbox]",
+          controllerCollectionSelector: ".js-check-box-collection",
+          alertElement: $(el).find(".max-choices-alert"),
+          maxChoices: maxChoices
+        });
+      }
+    });
+  }
 }

data/app/packs/stylesheets/decidim/meetings/_item.scss

@@ -13,7 +13,7 @@
     }
 
     &-container {
-      @apply grid grid-cols-[auto_1fr] md:grid-cols-[auto_1fr_1fr] items-center gap-0 md:gap-x-5 border-4 border-background rounded md:h-[120px] overflow-hidden;
+      @apply grid grid-cols-[auto_1fr] md:grid-cols-[auto_1fr_1fr] items-center gap-0 md:gap-x-5 border-4 border-background rounded md:h-[140px] overflow-hidden;
 
       > *:nth-child(2) {
         @apply p-4 md:p-0;
@@ -28,7 +28,7 @@
       }
 
       > *:nth-child(3) {
-        @apply order-1 md:order-2 h-[116px] md:h-full;
+        @apply order-1 md:order-2 h-[135px] md:h-full;
       }
     }
 
@@ -40,13 +40,13 @@
       @apply text-black text-2xl font-bold;
     }
 
-    &-time {
+    &-year {
       @apply text-black text-xs;
     }
 
     &-month,
     &-day,
-    &-time {
+    &-year {
       @apply inline-flex items-center justify-evenly empty:[&>span]:hidden;
     }
 
@@ -55,7 +55,7 @@
     }
 
     &__lg {
-      @apply w-fit justify-center [&>*]:px-2;
+      @apply w-fit justify-center [&>*]:px-2 min-w-24 h-[8.5rem];
     }
 
     &__lg &-month {
@@ -66,7 +66,7 @@
       @apply text-5xl;
     }
 
-    &__lg &-time {
+    &__lg &-year {
       @apply text-md pb-2;
     }
   }

data/app/views/decidim/meetings/admin/agenda/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".invite_attendee")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".invite_attendee") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/meetings/admin/meeting_closes/edit.html.erb

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("meeting_copies.new.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("meeting_copies.new.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t(".title") %>
       <%= export_dropdowns(query) %>
       <%= link_to t("actions.new_meeting", scope: "decidim.meetings"), new_meeting_path, class: "button button__sm button__secondary" if allowed_to? :create, :meeting %>
       <%= render partial: "decidim/admin/components/resource_action" %>
-    </h2>
+    </h1>
   </div>
 
   <%= admin_filter_selector(:meetings) %>
@@ -17,7 +17,7 @@
           <th>
             <%= sort_link(query, :id, t("models.meeting.fields.id", scope: "decidim.meetings"), default_order: :desc ) %>
           </th>
-          <th>
+          <th class="!text-left">
             <%= sort_link(query, :translated_title, t("models.meeting.fields.title", scope: "decidim.meetings"), default_order: :desc ) %>
           </th>
           <th>
@@ -46,7 +46,7 @@
             <td>
               <%= meeting.id %><br>
             </td>
-            <td>
+            <td class="!text-left">
               <% if allowed_to? :update, :meeting, meeting: meeting %>
                 <%= link_to present(meeting).title(html_escape: true), edit_meeting_path(meeting) %>
               <% else %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/meetings/admin/poll/edit.html.erb

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(edit_questionnaire_title) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= edit_questionnaire_title %>
     <% if questionnaire.answers.any? %>
       <div class="button--title">
@@ -9,7 +9,7 @@
     <% else %>
       <button class="button button__sm button__secondary" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
     <% end %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("title", scope: "decidim.meetings.admin.registrations.form")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("title", scope: "decidim.meetings.admin.registrations.form") %>
     <div class="flex items-center gap-x-4 ml-auto">
       <%= link_to t("invites", scope: "decidim.meetings.admin.registrations.form"), meeting_registrations_invites_path(meeting), class: "button button__sm button__secondary #{"disabled" unless allowed_to? :read_invites, :meeting, meeting: meeting}" %>
@@ -19,7 +19,7 @@
       <% end %>
       <%= link_to t("registration_form" , scope: "decidim.meetings.admin.registrations.form"), edit_meeting_registrations_form_path(meeting_id: meeting.id), class: "button button__sm button__secondary" %>
     </div>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/meetings/layouts/live_event.html.erb

@@ -32,7 +32,7 @@
 
       <div class="flex gap-10">
         <% if current_user %>
-          <%= link_to current_user.name, decidim.account_path, target: "_blank", class: "button button__sm button__text-secondary", data: { "external-link": false }, "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name) %>
+          <%= link_to current_user.name, decidim.account_path, target: "_blank", class: "button button__sm button__text-secondary", data: { "external-link": "text-only" }, "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name) %>
         <% end %>
 
         <%= link_to meeting_path(meeting), class: "button button__sm button__text-secondary", "aria-label": t("close", scope: "decidim.meetings.layouts.live_event") do %>

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

@@ -10,7 +10,7 @@
         <%= link_to t("apple", scope: "decidim.meetings.meetings.calendar_modal"), ics_url, class: "text-secondary underline" %>
       </li>
       <li>
-        <%= link_to t("google", scope: "decidim.meetings.meetings.calendar_modal"), google_url, target: "_blank", class: "text-secondary underline", data: { "external-link": false } %>
+        <%= link_to t("google", scope: "decidim.meetings.meetings.calendar_modal"), google_url, target: "_blank", class: "text-secondary underline", data: { "external-link": "text-only" } %>
       </li>
     </ul>
   </div>

data/app/views/decidim/meetings/polls/answers/_multiple_option.html.erb

@@ -1,13 +1,17 @@
-<% question.answer_options.each_with_index do |answer_option, idx| %>
-  <% choice = answer.choices.find { |choice| choice.decidim_answer_option_id == answer_option.id } if answer %>
+<div class="answer-questionnaire__single-option js-check-box-collection">
+  <% question.answer_options.each_with_index do |answer_option, idx| %>
+    <% choice = answer.choices.find { |choice| choice.decidim_answer_option_id == answer_option.id } if answer %>
 
-  <%= label_tag do %>
-    <%= check_box_tag "answer[choices][#{idx}][body]",
-                      translated_attribute(answer_option.body),
-                      choice.present?, disabled: %>
+    <div class="js-collection-input">
+      <%= label_tag do %>
+        <%= check_box_tag "answer[choices][#{idx}][body]",
+                          translated_attribute(answer_option.body),
+                          choice.present?, disabled: %>
 
-    <%= translated_attribute(answer_option.body) %>
+        <%= translated_attribute(answer_option.body) %>
 
-    <%= hidden_field_tag "answer[choices][#{idx}][answer_option_id]", answer_option.id, disabled: %>
+        <%= hidden_field_tag "answer[choices][#{idx}][answer_option_id]", answer_option.id, disabled: %>
+      <% end %>
+    </div>
   <% end %>
-<% end %>
+</div>

data/app/views/decidim/meetings/polls/answers/_single_option.html.erb

@@ -4,14 +4,14 @@
   <% choice_id = "#{field_id}_choices_#{idx}" %>
 
   <%= label_tag "#{choice_id}_body" do %>
-    <%= radio_button_tag "answer[choices][#{idx}][body]",
+    <%= radio_button_tag "answer[choices][#{question.id}][body]",
                          translated_attribute(answer_option.body),
                          answer_option.id == choice.try(:decidim_answer_option_id),
                          id: "#{choice_id}_body", disabled: %>
 
     <%= translated_attribute(answer_option.body) %>
 
-    <%= hidden_field_tag "answer[choices][#{idx}][answer_option_id]",
+    <%= hidden_field_tag "answer[choices][#{question.id}][answer_option_id]",
                          answer_option.id,
                          id: "#{choice_id}_answer_option",
                          disabled: %>

data/app/views/decidim/meetings/polls/questions/_published_question.html.erb

@@ -6,12 +6,12 @@
   <% @form = form || Decidim::Meetings::AnswerForm.new(question_id: question.id, current_user:) %>
   <%= decidim_form_for(@form, url: meeting_polls_answers_path(meeting), method: :post, remote: true, html: { class: "form-defaults mt-4" }, data: { "safe-path" => meeting_live_event_path(meeting) }) do |form| %>
     <div class="answer question" data-max-choices="<%= question.max_choices %>">
+      <p class="form-error max-choices-alert mt-0 mb-4"><%= t(".max_choices_alert") %></p>
+
       <%= render partial: "decidim/meetings/polls/answers/#{question.question_type}", locals: { answer: @form.answer, question:, answer_form: form, disabled: question.answered_by?(current_user), field_id: question.id } %>
 
       <%= form.hidden_field :question_id %>
 
-      <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
-
       <% @form.errors.full_messages.each do |msg| %>
         <small class="form-error is-visible mt-1"><%= msg %></small>
       <% end %>

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

@@ -11,7 +11,7 @@
 <% if meetings.length.zero? %>
   <%= cell("decidim/announcement", t("decidim.meetings.meetings.meetings.no_meetings_warning"), callout_class: "warning" ) %>
 <% else %>
-  <h2 class="h5 md:h3 decorator"><%= t("meetings_count", scope: "decidim.meetings.meetings.count", count: meetings.length) %></h2>
+  <h2 class="h5 md:h3 decorator"><%= t("meetings_count", scope: "decidim.meetings.meetings.count", count: meetings.total_count) %></h2>
 
   <%= cell("decidim/announcement", t("decidim.meetings.meetings.meetings.upcoming_meetings_warning"), callout_class: "warning" ) if @forced_past_meetings %>
 

data/config/locales/ar.yml

@@ -268,9 +268,7 @@ ar:
             select_user: اختر المشارك
           index:
             filter:
-              accepted: وافقت
               all: الكل
-              rejected: مرفوض
               sent: أرسلت
             invite_attendee: دعوة الحضور
             invites: تدعو

data/config/locales/ca.yml

@@ -166,14 +166,14 @@ ca:
         meeting_created:
           button_text: Inscriu-te a la trobada
           email_intro: S'ha afegit la trobada "%{resource_title}" a l'espai "%{participatory_space_title}" que estàs seguint.
-          email_outro: Has rebut aquesta notificació perquè estàs seguint "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
           email_subject: Nova trobada afegida a  %{participatory_space_title}
           notification_title: S'ha afegit la trobada <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}
         meeting_registration_confirmed:
           notification_title: S'ha confirmat el teu registre per a la trobada <a href="%{resource_url}">%{resource_title}</a>. El teu codi de registre és %{registration_code}.
         meeting_registrations_over_percentage:
           email_intro: Les inscripcions per la trobada "%{resource_title}" superen el %{percentage}%.
-          email_outro: Has rebut aquesta notificació perquè ets administradora de l'espai participatiu de la trobada.
+          email_outro: Has rebut aquesta notificació perquè administres l'espai participatiu de la trobada.
           email_subject: Les inscripcions per la trobada "%{resource_title}" superen el %{percentage}%
           notification_title: Les inscripcions per la trobada <a href="%{resource_path}">%{resource_title}</a> superen el %{percentage}%.
         meeting_updated:
@@ -283,10 +283,10 @@ ca:
             select_user: Selecciona la participant
           index:
             filter:
-              accepted: Acceptat
+              accepted: Acceptada
               all: Totes
-              rejected: Rebutjades
-              sent: Enviades
+              rejected: Rebutjada
+              sent: Enviat
             invite_attendee: Convidar assistent
             invites: Invitacions
             registrations_disabled: No pots convidar a cap persona perquè les inscripcions estan inhabilitades.
@@ -413,7 +413,7 @@ ca:
           body: La trobada <a href="%{meeting_path}">"%{meeting_title}"</a> està pendent de tancar-se. Si us plau, afegiu un informe de la reunió fent servir el botó "Tancar trobada".
           greetings: Hola,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: Hola %{username},
-          subject: Ara pots tancar la trobada amb un informe a la plataforma %{organization_name}
+          subject: Està pendent tancar la trobada amb un informe a la plataforma %{organization_name}
       conference_venues: Seus de les jornades
       content_blocks:
         upcoming_meetings:

data/config/locales/de.yml

@@ -9,7 +9,7 @@ de:
         closing_report: Protokoll
         closing_visible: Ist sichtbar
         contributions_count: Anzahl der Beiträge
-        proposal_ids: An der Sitzung entstandene Vorschläge
+        proposal_ids: Vorschläge aus der Veranstaltung
         video_url: Video-URL
       meeting:
         address: Adresse
@@ -29,7 +29,7 @@ de:
         online_meeting_url: Online Meeting URL
         organizer_gid: Erstellt als
         organizer_id: Veranstalter
-        private_meeting: Private Sitzung
+        private_meeting: Privates Treffen
         registration_email_custom_content: Angepasster Inhalt des Registrierungs-E-Mails
         registration_form_enabled: Anmeldeformular aktiviert
         registration_terms: Registrierungsbedingungen
@@ -283,7 +283,7 @@ de:
             select_user: Nutzer wählen
           index:
             filter:
-              accepted: Akzeptiert
+              accepted: Angenommen
               all: Alle
               rejected: Abgelehnt
               sent: Geschickt

data/config/locales/el.yml

@@ -276,9 +276,7 @@ el:
             select_user: Επιλέξτε συμμετέχοντα
           index:
             filter:
-              accepted: Έγινε αποδοχή
               all: Όλα
-              rejected: Απορρίφθηκε
               sent: Στάλθηκε
             invite_attendee: Πρόσκληση συμμετέχοντα
             invites: Προσκλήσεις

data/config/locales/es-MX.yml

@@ -283,10 +283,10 @@ es-MX:
             select_user: Seleccionar usuario
           index:
             filter:
-              accepted: Aceptado
+              accepted: Aceptada
               all: Todas
-              rejected: Rechazadas
-              sent: Expedidas
+              rejected: Rechazada
+              sent: Expedida
             invite_attendee: Invitar a un asistente
             invites: Invitaciones
             registrations_disabled: No puedes invitar a nadie porque las inscripciones están deshabilitadas.

data/config/locales/es.yml

@@ -155,7 +155,7 @@ es:
         meeting_closed:
           affected_user:
             email_intro: 'Tu encuentro "%{resource_title}" se ha cerrado. Puedes leer las conclusiones desde su página:'
-            email_outro: Has recibido esta notificación porque has organizaco el encuentro "%{resource_title}".
+            email_outro: Has recibido esta notificación porque organizaste el encuentro "%{resource_title}".
             email_subject: Se ha cerrado el encuentro "%{resource_title}"
             notification_title: El encuentro <a href="%{resource_path}">%{resource_title}</a> ha sido cerrada.
           follower:
@@ -166,14 +166,14 @@ es:
         meeting_created:
           button_text: Inscribirse en el encuentro
           email_intro: Se ha añadido el encuentro "%{resource_title}" al espacio "%{participatory_space_title}" que estás siguiendo.
-          email_outro: Has recibido esta notificación porque sigues "%{participatory_space_title}". Puedes dejar de seguirlo en el enlace anterior.
+          email_outro: Has recibido esta notificación porque sigues el espacio "%{participatory_space_title}". Puedes dejar de seguirlo en el enlace anterior.
           email_subject: Nuevo encuentro añadido en %{participatory_space_title}
           notification_title: Se ha añadido el encuentro <a href="%{resource_path}">%{resource_title}</a> en %{participatory_space_title}
         meeting_registration_confirmed:
           notification_title: Tu inscripción al encuentro <a href="%{resource_url}">%{resource_title}</a> ha sido confirmada. Tu código de registro es %{registration_code}.
         meeting_registrations_over_percentage:
           email_intro: Las inscripciones para el encuentro "%{resource_title}" superan el %{percentage}%.
-          email_outro: Has recibido esta notificación porque eres administradora del espacio participativo del encuentro.
+          email_outro: Has recibido esta notificación porque administras el espacio participativo del encuentro.
           email_subject: Las inscripciones para el encuentro "%{resource_title}" superan el %{percentage}%
           notification_title: Las inscripciones para el encuentro <a href="%{resource_path}">%{resource_title}</a> superan el %{percentage}%.
         meeting_updated:
@@ -283,10 +283,10 @@ es:
             select_user: Seleccionar participante
           index:
             filter:
-              accepted: Aceptado
-              all: Todas
-              rejected: Rechazadas
-              sent: Enviades
+              accepted: Aceptada
+              all: Todos
+              rejected: Rechazada
+              sent: Enviado
             invite_attendee: Invitar asistente
             invites: Invitaciones
             registrations_disabled: No puedes invitar a nadie porque las inscripciones están deshabilitadas.
@@ -413,7 +413,7 @@ es:
           body: El encuentro <a href="%{meeting_path}">"%{meeting_title}"</a> está pendiente de cerrarse. Por favor, agrega un informe de la reunión usando el botón "Cerrar encuentro".
           greetings: Hola,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: Hola %{username},
-          subject: Ahora puedes cerrar el encuentro con un informe en la plataforma %{organization_name}
+          subject: Está pendiente cerrar el encuentro con un informe en la plataforma %{organization_name}
       conference_venues: Sedes de las jornadas
       content_blocks:
         upcoming_meetings:

data/config/locales/eu.yml

@@ -283,10 +283,10 @@ eu:
             select_user: Hautatu parte-hartzailea
           index:
             filter:
-              accepted: Onartuta
-              all: Guztiak
-              rejected: Baztertuta
-              sent: Bidalita
+              accepted: Onartua
+              all: Denak
+              rejected: Baztertua
+              sent: Bidalia
             invite_attendee: Gonbidatu
             invites: Gonbidapenak
             registrations_disabled: Ezin duzu inor gonbidatu izen-emateak desgaituta daudelako.

data/config/locales/fi.yml

@@ -401,7 +401,7 @@ fi:
           read_more: Lue lisää tästä tapaamisesta
       calendar_modal:
         calendar_url: Kalenterin URL
-        copy_calendar_url: Kopio
+        copy_calendar_url: Kopioi
         copy_calendar_url_clarification: Kopioi kalenterin URL-osoite leikepöydälle
         copy_calendar_url_copied: Kopioitu!
         copy_calendar_url_description: Näet kaikki julkaistut tapaamiset oman palveluntarjoajasi kalenteriohjelmassa. Kopioi ja liitä tämä URL-osoite kalenteriisi käyttämällä "Lisää uusi kalenteri URL-osoitteesta" -toimintoa.