decidim-meetings 0.29.2 → 0.30.0.rc2

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

@@ -1,31 +1,48 @@
 <%= render layout: "layouts/decidim/shared/layout_item" do %>
+
+  <%= render partial: "schema_org_event_meeting" %>
+
   <section class="layout-main__section layout-main__heading">
-    <h1 class="h2 decorator"><%= present(meeting).title(links: true, html_escape: true ) %></h1>
-
-    <%= cell "decidim/meetings/dates_and_map", meeting %>
-    <%= render partial: "meeting_poll_actions", locals: { mobile: true } %>
-
-    <div class="layout-author">
-      <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), from: meeting, context_actions: nil, layout: :compact %>
-
-      <% if meeting.private_meeting? %>
-        <span class="<%= meeting_type_badge_css_class("private") %> label">
-          <%= t("private_meeting", scope: "decidim.meetings.types") %>
-        </span>
-      <% end %>
-      <% if meeting.private_meeting? and meeting.transparent? %>
-        <span class="<%= meeting_type_badge_css_class("transparent") %> label">
-          <%= t("transparent", scope: "decidim.meetings.types") %>
-        </span>
-      <% end %>
-      <% if meeting.withdrawn? %>
-        <span class="<%= meeting_type_badge_css_class("withdraw") %> label">
-          <%= t("withdraw", scope: "decidim.meetings.types") %>
-        </span>
-      <% end %>
+      <h1 class="h2 decorator"><%= present(meeting).title(links: true, html_escape: true ) %></h1>
+      <%= cell "decidim/meetings/dates_and_map", meeting %>
+      <div class="block md:hidden">
+        <%= render partial: "meeting_aside", locals: { hide_modal: true } %>
+      </div>
+
+      <%= render partial: "meeting_poll_actions", locals: { mobile: true } %>
+
+    <% if meeting.private_meeting? || meeting.withdrawn? %>
+      <div class="layout-author has_status">
+        <% if meeting.private_meeting? %>
+          <span class="<%= meeting_type_badge_css_class("private") %> label">
+            <%= t("private_meeting", scope: "decidim.meetings.types") %>
+          </span>
+        <% end %>
+        <% if meeting.private_meeting? and meeting.transparent? %>
+          <span class="<%= meeting_type_badge_css_class("transparent") %> label">
+            <%= t("transparent", scope: "decidim.meetings.types") %>
+          </span>
+        <% end %>
+        <% if meeting.withdrawn? %>
+          <span class="<%= meeting_type_badge_css_class("withdraw") %> label">
+            <%= t("withdraw", scope: "decidim.meetings.types") %>
+          </span>
+        <% end %>
+      </div>
+    <% end %>
+
+    <div class="layout-author <%= "has_status" if meeting.private_meeting? || meeting.withdrawn? %>">
+      <div class="relative flex items-center justify-center w-full">
+        <div class="w-10/12 flex items-center gap-4">
+          <%= cell "decidim/author", author_presenter_for(meeting.normalized_author), from: meeting, context_actions: nil, layout: :compact %>
+        </div>
+        <%= render "decidim/shared/resource_actions", resource: meeting do %>
+          <%= render "decidim/meetings/meetings/meeting_actions" %>
+        <% end %>
+      </div>
     </div>
-  </section>
 
+  </section>
   <section class="layout-main__section">
     <div class="editor-content">
       <%= render_meeting_body(@meeting) %>
@@ -52,14 +69,22 @@
     </section>
   <% end %>
 
+  <%= cell("decidim/tags", meeting) %>
+
   <section class="layout-main__section layout-main__buttons" data-buttons>
-    <%= render partial: "actions" %>
+    <%= cell "decidim/comments_button", nil %>
+
+    <div class="ml-auto lg:ml-0">
+      <%= cell "decidim/share_widget", meeting %>
+    </div>
   </section>
 
   <%= pad_iframe_for meeting %>
 
   <% content_for :aside do %>
-    <%= render partial: "meeting_aside" %>
+    <div class="hidden md:block">
+      <%= render partial: "meeting_aside" %>
+    </div>
   <% end %>
 
   <% content_for :item_footer do %>

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

@@ -0,0 +1,34 @@
+<% if allowed_to?(:update, :meeting, meeting: meeting) %>
+  <li role="menuitem">
+    <%= link_to edit_meeting_path(meeting), class: "button button__sm button__text button__text-secondary"  do %>
+      <span><%= t("edit_meeting", scope: "decidim.meetings.meetings.meeting") %></span>
+      <%= icon "pencil-line" %>
+    <% end %>
+  </li>
+<% end %>
+
+<% if allowed_to?(:close, :meeting, meeting: meeting) %>
+  <% caption = meeting.closed? ? t("edit_close_meeting", scope: "decidim.meetings.meetings.meeting") : t("close_meeting", scope: "decidim.meetings.meetings.meeting") %>
+  <li role="menuitem">
+    <%= link_to edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "button button__sm button__text button__text-secondary"  do %>
+      <span><%= caption %></span>
+      <%= icon "lock-line" %>
+    <% end %>
+  </li>
+<% end %>
+
+<% if meeting.withdrawable_by?(current_user) %>
+  <li role="menuitem">
+    <%= action_authorized_link_to(
+          :withdraw,
+          withdraw_meeting_path(meeting),
+          method: :put,
+          class: "button button__sm button__text button__text-secondary" ,
+          title: t("withdraw_btn_hint", scope: "decidim.meetings.meetings.show"),
+          data: { confirm: t("withdraw_confirmation_html", scope: "decidim.meetings.meetings.show") }
+        ) do %>
+      <span><%= t("withdraw_meeting", scope:"decidim.meetings.meetings.show") %></span>
+      <%= icon "arrow-go-back-line" %>
+    <% end %>
+  </li>
+<% end %>

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

@@ -2,40 +2,7 @@
 
 <% if meeting.can_be_joined_by?(current_user) || meeting.on_different_platform? %>
   <section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-sticky-buttons>
-    <%= cell "decidim/meetings/join_meeting_button", meeting, show_remaining_slots: true %>
-  </section>
-<% end %>
-
-<% if allowed_to?(:update, :meeting, meeting: meeting) || allowed_to?(:close, :meeting, meeting: meeting) || meeting.withdrawable_by?(current_user) %>
-  <section class="layout-aside__section layout-aside__buttons">
-    <% if allowed_to?(:update, :meeting, meeting: meeting) %>
-      <%= link_to edit_meeting_path(meeting), class: "button button__sm button__transparent-secondary w-full" do %>
-        <span><%= t("edit_meeting", scope: "decidim.meetings.meetings.meeting") %></span>
-        <%= icon "pencil-line" %>
-      <% end %>
-    <% end %>
-
-    <% if allowed_to?(:close, :meeting, meeting: meeting) %>
-      <% caption = meeting.closed? ? t("edit_close_meeting", scope: "decidim.meetings.meetings.meeting") : t("close_meeting", scope: "decidim.meetings.meetings.meeting") %>
-
-      <%= link_to edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "button button__sm button__transparent-secondary w-full" do %>
-        <span><%= caption %></span>
-        <%= icon "pencil-line" %>
-      <% end %>
-    <% end %>
-
-    <% if meeting.withdrawable_by?(current_user) %>
-      <%= action_authorized_link_to(
-            :withdraw,
-            withdraw_meeting_path(meeting),
-            method: :put,
-            class: "button button__sm button__transparent-secondary w-full",
-            title: t("withdraw_btn_hint", scope: "decidim.meetings.meetings.show"),
-            data: { confirm: t("withdraw_confirmation_html", scope: "decidim.meetings.meetings.show") }
-          ) do %>
-          <span><%= t("withdraw_meeting", scope:"decidim.meetings.meetings.show") %></span>
-      <% end %>
-    <% end %>
+    <%= cell "decidim/meetings/join_meeting_button", meeting, show_remaining_slots: true, hide_modal: local_assigns[:hide_modal] %>
   </section>
 <% end %>
 
@@ -63,37 +30,31 @@
           <% meeting.attending_organizations.split("\n").each do |organizations| %>
           <li><%= organizations %></li>
           <% end %>
-        </ul>
+          </ul>
+        <% end %>
       <% end %>
     <% end %>
-  <% end %>
 
-  <% if registration.present? && registration.meeting.component.settings.registration_code_enabled %>
-    <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "coupon-line" } do %>
-      <h3 class="meeting__aside-block__title"><%= registration_code_help_text %></h3>
-      <div class="meeting__aside-block__large"><%= registration.code %></div>
-      <% if registration.validated? %>
-        <div class="label success"><%= t("validated", scope: "decidim.meetings.meetings.show.registration_state") %></div>
-        <% else %>
-        <div class="label warning"><%= t("validation_pending", scope: "decidim.meetings.meetings.show.registration_state") %></div>
+    <% if registration.present? && registration.meeting.component.settings.registration_code_enabled %>
+      <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "coupon-line" } do %>
+        <h3 class="meeting__aside-block__title"><%= registration_code_help_text %></h3>
+        <div class="meeting__aside-block__large"><%= registration.code %></div>
+        <% if registration.validated? %>
+          <div class="label success"><%= t("validated", scope: "decidim.meetings.meetings.show.registration_state") %></div>
+          <% else %>
+          <div class="label warning"><%= t("validation_pending", scope: "decidim.meetings.meetings.show.registration_state") %></div>
+        <% end %>
       <% end %>
     <% end %>
-  <% end %>
 
-  <% if meeting.services.any? %>
-    <% meeting.services.each do |service| %>
-      <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "star-line" } do %>
-        <h3 class="meeting__aside-block__title"><%= translated_attribute(service["title"]) %></h3>
-        <div class="meeting__aside-block__text"><%= translated_attribute(service["description"]) %></div>
+    <% if meeting.services.any? %>
+      <% meeting.services.each do |service| %>
+        <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "star-line" } do %>
+          <h3 class="meeting__aside-block__title"><%= translated_attribute(service["title"]) %></h3>
+          <div class="meeting__aside-block__text"><%= translated_attribute(service["description"]) %></div>
+        <% end %>
       <% end %>
     <% end %>
-  <% end %>
-</section>
+    <%= cell "decidim/meetings/cancel_registration_meeting_button", meeting, hide_modal: local_assigns[:hide_modal] %>
+  </section>
 <% end %>
-
-<section class="layout-aside__section actions__secondary">
-  <%= cell "decidim/meetings/cancel_registration_meeting_button", meeting %>
-  <%= follow_button_for(meeting) %>
-  <%= cell "decidim/share_button", nil %>
-  <%= cell "decidim/report_button", meeting %>
-</section>

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

@@ -1,11 +1,8 @@
 <% extra_classes = local_assigns.fetch(:mobile, false) ? " block md:hidden" : " hidden md:block" %>
 <% if meeting.poll&.has_questions? %>
   <section class="layout-aside__section layout-aside__buttons<%= extra_classes %>">
-    <%= action_authorized_link_to :reply_poll, meeting_polls_answers_path(meeting), class: "button button__xl button__secondary w-full", data: { "redirect_url" => meeting_polls_answers_path(meeting) }, resource: meeting do %>
-      <span>
-        <%= meeting.poll.has_open_questions? ? t("reply_poll", scope: "decidim.meetings.meetings.meeting") : t("view_poll", scope: "decidim.meetings.meetings.meeting") %>
-      </span>
-    <% end %>
+    <% reply_text = meeting.poll.has_open_questions? ? t("reply_poll", scope: "decidim.meetings.meetings.meeting") : t("view_poll", scope: "decidim.meetings.meetings.meeting") %>
+    <%= action_authorized_link_to :reply_poll, reply_text, meeting_polls_answers_path(meeting), class: "button button__xl button__secondary w-full", data: { "redirect_url" => meeting_polls_answers_path(meeting) }, resource: meeting %>
     <% if !allowed_to?(:reply_poll, :meeting, meeting:) && allowed_to?(:update, :poll, meeting:) %>
       <%= link_to admin_meeting_polls_answers_path(meeting), class: "button button__sm button__transparent-secondary w-full" do %>
         <span><%= t("administrate", scope: "decidim.meetings.polls.answers.index") %></span>

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

@@ -0,0 +1,3 @@
+<script type="application/ld+json">
+<%== render_schema_org_event_meeting(meeting) %>
+</script>

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

@@ -1,3 +1,12 @@
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_component.participatory_space.try(:description)),
+  title: t("decidim.components.pagination.page_title",
+           component_name: translated_attribute(current_component.name),
+           current_page: meetings.current_page,
+           total_pages: meetings.total_pages ),
+  url: meetings_url,
+  resource: current_component) %>
+
 <%= render partial: "decidim/meetings/shared/index", locals: {
       display_map: Decidim::Map.available?(:geocoding, :dynamic) && current_component.settings.maps_enabled? && search.result.not_online.exists?,
       display_announcement: true,
@@ -6,8 +15,7 @@
       filter_options: {
         date: !@forced_past_meetings,
         type: true,
-        scopes: current_component.has_subscopes?,
-        categories: current_component.categories.any?,
+        taxonomies: true,
         origin: component_settings.creation_enabled_for_participants?,
         space_type: false,
         activity: current_user.present?

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

@@ -1,10 +1,10 @@
 <% provide(:title, present(meeting).title) %>
 
-<% add_decidim_meta_tags({
-                           title: present(meeting).title,
-                           description: present(meeting).description,
-                           url: meeting_url(meeting.id)
-                         }) %>
+<% add_decidim_meta_tags(
+  title: present(meeting).title,
+  description: present(meeting).description,
+  url: meeting_url(meeting.id),
+  resource: meeting) %>
 
 <%
 edit_link(

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

@@ -1,8 +1,8 @@
-<% add_decidim_meta_tags({
-                           title: present(meeting).title,
-                           description: present(meeting).description,
-                           url: meeting_url(meeting.id)
-                         }) %>
+<% add_decidim_meta_tags(
+  title: present(meeting).title,
+  description: present(meeting).description,
+  url: meeting_url(meeting.id),
+  resource: meeting) %>
 
 <%= append_javascript_pack_tag "decidim_meetings" %>
 <%= append_stylesheet_pack_tag "decidim_meetings" %>

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

@@ -1,16 +1,4 @@
-<% filter_sections = [].tap do |f|
-    f.append(method: :with_any_date, collection: filter_date_values, label_scope: "decidim.meetings.meetings.filters", id: "date", type: :radio_buttons) if filter_options[:date]
-    f.append(method: :with_any_type, collection: filter_type_values, label_scope: "decidim.meetings.meetings.filters", id: "type") if filter_options[:type]
-    f.append(method: :with_any_scope, collection: filter_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope") if filter_options[:scopes]
-    f.append(method: :with_any_scope, collection: filter_global_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope") if filter_options[:directory_scopes]
-    f.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.meetings.meetings.filters", id: "category") if filter_options[:categories]
-    f.append(method: :with_any_global_category, collection: directory_filter_categories_values, label_scope: "decidim.meetings.meetings.filters", id: "category") if filter_options[:directory_categories]
-    f.append(method: :with_any_origin, collection: filter_origin_values, label_scope: "decidim.meetings.meetings.filters", id: "origin") if filter_options[:origin]
-    f.append(method: :with_any_space, collection: directory_meeting_spaces_values, label_scope: "decidim.meetings.directory.meetings.index", id: "space_type") if filter_options[:space_type]
-    f.append(method: :activity, collection: activity_filter_values, label_scope: "decidim.meetings.meetings.filters", id: "activity", type: :radio_buttons) if filter_options[:activity]
-  end %>
-
-<%= render layout: "decidim/shared/filters", locals: { filter_sections:, search_variable:, skip_to_id: "meetings" } do %>
+<%= render layout: "decidim/shared/filters", locals: { filter_sections: filter_sections(**filter_options), search_variable:, skip_to_id: "meetings" } do %>
   <%= render partial: "decidim/meetings/calendar_modal", locals: {
         path: short_url(
           route_name: "calendar",

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

@@ -10,7 +10,7 @@
 <%= render layout: "layouts/decidim/shared/layout_two_col" do %>
   <% if display_map %>
     <div class="meeting-list__map">
-      <%= cell "decidim/meetings/meetings_map", search.result %>
+      <%= cell "decidim/map", search.result, metadata_card: "decidim/meetings/meeting_card_metadata" %>
     </div>
   <% end %>
 

data/app/views/decidim/meetings/shared/_index.js.erb

@@ -7,9 +7,10 @@ $urlCalendarUrl.val("<%= short_url(route_name: "calendar", params: { filter: par
 var $map = $("#map");
 var controller = $map.data("map-controller");
 if (controller) {
-  var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result).to_json.html_safe %>');
+  var markerData = JSON.parse('<%= escape_javascript cell("decidim/map", search.result, metadata_card: "decidim/meetings/meeting_card_metadata").geocoded_data.to_json.html_safe %>');
   controller.clearMarkers();
-  if (markerData.length > 0){
+
+  if (markerData.length > 0) {
     controller.addMarkers(markerData);
   }
 }

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

@@ -5,8 +5,8 @@
   <h2 class="title-decorator"><%= t("decidim.components.meetings.name") %></h2>
 <% end %>
 
-<% if try(:component_settings) && component_settings&.creation_enabled_for_participants? && current_component.participatory_space.can_participate?(current_user) %>
-  <%= action_authorized_link_to :create, new_meeting_path, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_meeting_path } do %>
+<% if allowed_to?(:create, :meeting) %>
+  <%= action_authorized_link_to :create, new_meeting_path, permissions_holder: current_component, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_meeting_path } do %>
     <span><%= t("new_meeting", scope: "decidim.meetings.meetings.index") %></span>
     <%= icon "add-line" %>
   <% end %>

data/app/views/decidim/participatory_spaces/_conference_venues.html.erb

@@ -15,7 +15,7 @@
           <% end %>
         <% end %>
       </div>
-      <%= cell "decidim/meetings/meetings_map", meetings_geocoded %>
+      <%= cell "decidim/map", meetings_geocoded, metadata_card: "decidim/meetings/meeting_card_metadata" %>
     </div>
   </section>
 <% end %>

data/config/locales/ar.yml

@@ -2,6 +2,8 @@
 ar:
   activemodel:
     attributes:
+      answer:
+        add_documents: أضف مستندات
       close_meeting:
         attendees_count: عدد الحضور
         attending_organizations: قائمة المنظمات التي حضرت
@@ -85,8 +87,6 @@ ar:
     admin:
       filters:
         meetings:
-          category_id_eq:
-            label: الفئة
           closed_at_present:
             label: الحالة
             values:
@@ -97,8 +97,6 @@ ar:
             values:
               'false': السابق
               'true': القادم
-          scope_id_eq:
-            label: نطاق
           with_any_origin:
             label: الأصل
             values:
@@ -135,8 +133,6 @@ ar:
             maps_enabled: تم تمكين الخرائط
             registration_code_enabled: تم تمكين رمز التسجيل
             resources_permissions_enabled: يمكن تعيين أذونات الإجراءات لكل اجتماع
-            scope_id: نطاق
-            scopes_enabled: النطاقات مفعلة
             terms_and_conditions_url_for_meeting_creators: أحكام وشروط عناوين URL لمنشئي الاجتماع
           step:
             announcement: إعلان
@@ -193,7 +189,7 @@ ar:
       badges:
         attended_meetings:
           conditions:
-            - سجل للاجتماعات التي تريد حضورها
+          - سجل للاجتماعات التي تريد حضورها
           description: تُمنح هذه الشارة عند حضور العديد من الاجتماعات المباشرة.
           description_another: حضر هذا المشارك %{score} جلسة.
           description_own: لقد حضرت %{score} اجتماع.
@@ -205,7 +201,6 @@ ar:
         attachment_collections: المجلدات
         attachments: مرفقات
         close: قريب
-        destroy: حذف
         edit: تعديل
         invalid_destroy:
           proposals_count:
@@ -273,10 +268,10 @@ ar:
             close: قريب
             title: اجتماع قريب
         meetings:
+          component:
+            unlink: إلغاء الربط
           create:
             success: تم إنشاء الاجتماع بنجاح. لاحظ أن هذا غير منشور حتى الآن، تحتاج إلى نشره بنفسك.
-          destroy:
-            success: تم حذف الاجتماع بنجاح
           edit:
             title: تعديل الاجتماعات
             update: تحديث
@@ -290,7 +285,18 @@ ar:
             select_a_registration_type: الرجاء تحديد نوع التسجيل
             select_an_iframe_access_level: الرجاء تحديد مستوى الوصول إلى iframe
           index:
+            linked_meeting_warning_html: يجب تعديل هذا الاجتماع من <br><a href="%{href}">%{name}</a>
             title: اجتماعات
+          linked_spaces:
+            assign: تعيين
+            link_a_space: اربط مساحة
+            private_meeting_warning: لم يتم تطبيق المساحات المربوطة إذا كان الاجتماع خاص وغير شفاف.
+            private_space_warning: لم يتم تطبيق المساحات المربوطة إذا كان الاجتماع ينتمي إلى مساحه خاصة وغير شفافه.
+            select: اختر مساحه
+            table:
+              actions: الإجراءات
+              component: مساحات مربوطة
+            title: مساحات مربوطة
           new:
             create: إنشاء
             title: إنشاء اجتماع
@@ -350,8 +356,6 @@ ar:
         questionnaire:
           update: "قام %{user_name} بتحديث الاستبيان للاجتماع %{meeting_name}"
       application_helper:
-        filter_category_values:
-          all: الكل
         filter_meeting_space_values:
           all: الكل
       calendar_modal:
@@ -454,7 +458,6 @@ ar:
           location_hints_help: 'توضيح حول الموقع: معلومات إضافية. على سبيل المثال: إدراج طابق المبنى في حال كان الاجتماع شخصيا، أو كلمة مرور الاجتماع إذا كان اجتماعا على الإنترنت يحتوي على تقييد الدخول.'
           online_meeting_url_help: 'الرابط: السماح للمشاركين بالاتصال مباشرة باجتماعك'
           registration_url_help: 'الرابط: يتيح للمشاركين استخدام الخدمة الخارجية التي تستخدمها للتسجيل'
-          select_a_category: يُرجى اختيار فئة
           select_a_meeting_type: الرجاء تحديد نوع الاجتماع
           select_a_registration_type: الرجاء تحديد نوع التسجيل
           select_an_iframe_access_level: الرجاء تحديد مستوى الوصول إلى iframe
@@ -464,9 +467,6 @@ ar:
           see_all: عرض كافة الاجتماعات
           see_all_withdrawn: عرض جميع الاجتماعات المسحوبة
           text_banner: أنت تستعرض قائمة الاجتماعات التي تم سحبها من قبل مؤلفيها. %{go_back_link}.
-        meeting:
-          close_meeting: اجتماع قريب
-          edit_meeting: تعديل الاجتماعات
         meetings:
           upcoming_meetings_warning: حاليًا ، لا توجد اجتماعات مجدولة ، ولكن يمكنك هنا العثور على جميع الاجتماعات السابقة المدرجة.
         new:
@@ -489,6 +489,7 @@ ar:
           micro_camera_permissions_warning: عند النقر على الزر أدناه، سيتم طلب أذونات الميكروفون و/أو الكاميرا، وسوف تنضم إلى مؤتمر الفيديو
           no_slots_available: لا فتحات المتاحة
           organizations: حضور المنظمات
+          redirect_notice: هذا الاجتماع جزء من مساحة أخرى، لذلك تم نقلك إلى %{current_space_name}. <br>إذا كنت تفضل، يمكنك العودة إلى <a href="%{previous_space_url}">%{previous_space_name}</a>.
           registration_code_help_text: رمز التسجيل الخاص بك
           registration_state:
             validated: التحقق من صحة
@@ -503,7 +504,6 @@ ar:
           visit_finished: عرض الاجتماع السابق
           withdraw_btn_hint: يمكن أن تسحب اجتماعك اذا غيرت رأيك. لا يتم إلغاء الاجتماع بل سيظهر في قائمة الاجتماعات المسحوبة.
           withdraw_confirmation_html: هل أنت متأكد من أنك تريد سحب هذا الاجتماع؟<br><br><strong>لا يمكن إلغاء هذا الإجراء!</strong>
-          withdraw_meeting: سحب الاجتماع
         update:
           invalid: طرأت مشكلة خلال تحديث الاجتماع.
           success: لقد قمت بتحديث الاجتماع بنجاح.

data/config/locales/bg.yml

@@ -97,8 +97,6 @@ bg:
             'false': Не се приема
             'true': Прието
         meetings:
-          category_id_eq:
-            label: Категория
           closed_at_present:
             label: Състояние
             values:
@@ -109,8 +107,6 @@ bg:
             values:
               'false': Минали
               'true': Предстоящо
-          scope_id_eq:
-            label: Обхват
           with_any_origin:
             label: Произход
             values:
@@ -160,8 +156,6 @@ bg:
             maps_enabled: Картите са активирани
             registration_code_enabled: Регистрационният код е активиран
             resources_permissions_enabled: Разрешенията за действия могат да се задават за всяка среща
-            scope_id: Обхват
-            scopes_enabled: Обхватите са активирани
             terms_and_conditions_url_for_meeting_creators: URL адрес за правила и условия за създатели на срещи
           step:
             announcement: Обявление
@@ -221,7 +215,7 @@ bg:
       badges:
         attended_meetings:
           conditions:
-            - Регистрирайте се за срещите, които искате да посетите
+          - Регистрирайте се за срещите, които искате да посетите
           description: Тази значка се предоставя, когато посетите няколко срещи на живо.
           description_another: Този участник е посетил %{score} срещи.
           description_own: Посетили сте %{score} срещи.
@@ -235,7 +229,6 @@ bg:
         attachment_collections: Папки
         attachments: Прикачени файлове
         close: Затвори
-        destroy: Изтрий
         edit: Редактирай
         invalid_destroy:
           proposals_count:
@@ -313,12 +306,6 @@ bg:
           create:
             invalid: Възникна проблем при създаването на тази среща.
             success: Срещата е създадена успешно. Забележете, че това все още не е публикувано, трябва да го публикувате ръчно.
-          destroy:
-            invalid:
-              proposals_count:
-                one: Срещата не може да бъде премахната, понеже има %{count} участник свързан с нея.
-                other: Срещата не може да бъде премахната, понеже има %{count} участника свързани с нея.
-            success: Срещата беше изтрита успешно
           edit:
             title: Редактиране на срещата
             update: Актуализация
@@ -366,10 +353,10 @@ bg:
         poll:
           form:
             announcement_html:
-              - Когато даден въпрос получи отговори или бъде публикуван/затворен, той вече не може да бъде редактиран.
-              - Можете да добавите въпрос по всяко време.
-              - Анкетата ще бъде затворена, когато резултатите от всички създадени въпроси бъдат публикувани.
-              - Посетете <a href='%{admin_link}'>страницата за администриране на анкетата</a>, за да изпратите въпроси и да публикувате резултати.
+            - Когато даден въпрос получи отговори или бъде публикуван/затворен, той вече не може да бъде редактиран.
+            - Можете да добавите въпрос по всяко време.
+            - Анкетата ще бъде затворена, когато резултатите от всички създадени въпроси бъдат публикувани.
+            - Посетете <a href='%{admin_link}'>страницата за администриране на анкетата</a>, за да изпратите въпроси и да публикувате резултати.
         registrations:
           edit:
             save: Запази
@@ -410,8 +397,6 @@ bg:
         questionnaire:
           update: "%{user_name} актуализира въпросника за срещата %{meeting_name}"
       application_helper:
-        filter_category_values:
-          all: Всички
         filter_meeting_space_values:
           all: Всички
       calendar:
@@ -521,7 +506,6 @@ bg:
           location_hints_help: 'Съвети за местоположение: допълнителна информация. Пример: етажът на сградата, ако е лична среща, или паролата за среща, ако е онлайн среща с ограничен достъп.'
           online_meeting_url_help: 'Връзка: позволява на участниците да се свързват директно с вашата среща'
           registration_url_help: 'Линк: позволете на участниците да отидат на външната услуга, която използвате за регистрации'
-          select_a_category: Моля, изберете категория
           select_a_meeting_type: Моля, изберете тип среща
           select_a_registration_type: Моля, изберете тип регистрация
           select_an_iframe_access_level: Моля, изберете ниво на достъп до iframe
@@ -532,9 +516,7 @@ bg:
           see_all_withdrawn: Вижте всички оттеглени срещи
           text_banner: Разглеждате списъка с оттеглени от авторите срещи. %{go_back_link}.
         meeting:
-          close_meeting: Затваряне на срещата
           edit_close_meeting: Редактиране на отчета за срещата
-          edit_meeting: Редактиране на срещата
           join_meeting: Присъединяване към срещата
           reply_poll: Отговор на анкета
           view_poll: Вижте анкетата
@@ -571,7 +553,6 @@ bg:
           visit_finished: Вижте миналата среща
           withdraw_btn_hint: Можете да отмените срещата си, ако промените решението си. Срещата не се изтрива, тя ще се появи в списъка с оттеглени срещи.
           withdraw_confirmation_html: Сигурни ли сте, че искате да отмените тази среща?<br><br><strong>Това действие не може да бъде отменено!</strong>
-          withdraw_meeting: Оттегляне на срещата
         update:
           invalid: Възникна проблем при актуализирането на срещата.
           success: Актуализирахте успешно срещата.
@@ -663,7 +644,6 @@ bg:
         transparent: Прозрачно
         withdraw: Оттеглено
       withdraw:
-        error: Възникна грешка при оттеглянето на срещата.
         success: Срещата е оттеглена успешно.
     metrics:
       meetings: