decidim-decidim_awesome 0.10.2 → 0.11.1

data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb

@@ -1,59 +1,72 @@
 <div class="loading-spinner"></div>
 
 <script id="marker-proposal-popup" type="text/x-jsrender">
-  <div class="map-info__content">
-    <h3>{{:title.translation}}</h3>
-    <div id="bodyContent">
-      <div class="description">{{:body.translation}}</div>
-      <div class="map__date-adress">
-        <div class="address card__extra">
-          <div class="address__icon">{{:icon}}</div>
-          <div class="address__details">
-            <span>{{>address}}</span><br>
+  <div class="space-y-6">
+    <div class="card__list">
+      <div class="card__list-content">
+        <a href="{{>link}}" target="proposal">
+          <h3 class="h4 card__list-title">{{:title.translation}}</h3>
+          <div class="card__list-metadata">
+            <span>
+              <%= icon "account-circle-line" %>
+              {{:authorName}}
+            </span>
+            <span>
+              <%= icon "wechat-line" %>
+              {{:totalCommentsCount}}
+            </span>
+            <span>
+              <%= icon "like" %>
+              {{:endorsementsCount}}
+            </span>
+            <span>
+              <span class="label {{:stateClass}}">{{:humanState}}</span>
+            </span>
+            {{if isAmendment() }}
+              <span>
+                <%= icon "other" %>
+                <%= t("activerecord.models.decidim/amendment", count: 1) %>
+              </span>
+            {{/if}}
           </div>
-        </div>
-      </div>
-      <div class="map-info__button">
-        <a href="{{>link}}" class="button button--sc">
-          <%= t("view_proposal", scope: "decidim.decidim_awesome.map_component.map.show") %>
+          <div class="text-sm">{{>address}}</div>
         </a>
+        <div class="description">
+         <div>{{:body.translation}}</div>
+       </div>
       </div>
     </div>
   </div>
 </script>
 
 <script id="marker-meeting-popup" type="text/x-jsrender">
-  <div class="map-info__content">
-    <h3>{{:title.translation}}</h3>
-    <div id="bodyContent">
-      <div class="description">{{:body.translation}}</div>
-      <div class="map__date-adress">
-        <div class="card__datetime">
-          <div class="card__datetime__date">
-            {{>startTimeDay}} <span class="card__datetime__month">{{>startTimeMonth}} {{>startTimeYear}}</span>
-          </div>
-          <div class="card__datetime__time">{{>starTime}}</div>
-        </div>
-        <div class="address card__extra">
-          <div class="address__icon">{{:icon}}</div>
-          <div class="address__details">
-            <strong>{{:location.translation}}</strong><br>
-            <span>{{>address}}</span><br>
-            <span>{{:locationHints.translation}}</span>
+  <div class="space-y-6">
+    <div class="card__list">
+      <div class="card__list-content">
+        <a href="{{>link}}" target="meeting">
+          <h3 class="h4 card__list-title">{{:title.translation}}</h3>
+          <div class="card__list-metadata">
+            <span>
+              <%= icon "calendar-line" %>
+              {{:dateRange}}
+            </span>
+            <span>
+              <%= icon "{{:icon}}", ignore_missing: true %>
+              {{:meetingType}}
+            </span>
           </div>
-        </div>
-      </div>
-      <div class="map-info__button">
-        <a href="{{>link}}" class="button button--sc">
-          <%= t("view_meeting", scope: "decidim.meetings.meetings_map") %>
+          <div class="text-sm">{{>address}}</div>
         </a>
+        <div class="description">
+         {{:body.translation}}
+       </div>
       </div>
     </div>
   </div>
 </script>
 
 <style type="text/css">
-  #awesome-map .google-map, .wrapper #awesome-map .google-map {
+  #awesome-map .dynamic-map {
     height: <%= map_height %>px;
   }
   <% current_categories(categories).each do |category| %>
@@ -65,4 +78,7 @@
 <script>
   window.AwesomeMap = window.AwesomeMap || {};
   window.AwesomeMap.categories = <%= current_categories(categories).to_json.html_safe %>;
+  window.AwesomeMapProposalTexts = <%= Decidim::Proposals::Proposal::STATES.to_h { |state, _| [state, t("decidim.proposals.answers.#{state}")] }.to_json.html_safe %>;
+  window.AwesomeMapMeetingTypes = <%= Decidim::Meetings::Meeting::TYPE_OF_MEETING.to_h { |type, _| [type, Decidim.icons.all[type.to_s]["icon"]] }.to_json.html_safe %>;
+  window.AwesomeMapMeetingTexts = <%= Decidim::Meetings::Meeting::TYPE_OF_MEETING.to_h { |type, _| [type, t("decidim.meetings.meetings.filters.type_values.#{type}")] }.to_json.html_safe %>;
 </script>

data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb

@@ -1,7 +1,16 @@
-<%= render partial: "decidim/shared/component_announcement" %>
+<main class="participatory-space__container">
+  <% announcement = translated_attribute(current_settings.announcement).presence || translated_attribute(component_settings.announcement).presence %>
+  <% if strip_tags(announcement).present? %>
+    <section>
+      <%= cell("decidim/announcement", announcement, local_assigns.merge(callout_class: "editor-content")) %>
+    </section>
+  <% end %>
 
-<%= render partial: "api_ready" %>
+  <%= render partial: "api_ready" %>
 
-<%= awesome_map_for map_components do %>
-  <%= render partial: "map_template", locals: { categories: current_participatory_space.categories, map_height: current_component.settings.map_height } %>
-<% end %>
+  <section id="map-block" class="awesome-iframe layout-main__section">
+    <%= awesome_map_for map_components do %>
+      <%= render partial: "map_template", locals: { categories: current_participatory_space.categories, map_height: current_component.settings.map_height } %>
+    <% end %>
+  </section>
+</main>

data/app/views/decidim/decidim_awesome/voting/voting_cards/_show_vote_button.html.erb

@@ -1,6 +1,3 @@
 <div class="voting-voting_cards">
   <%= cell("decidim/decidim_awesome/voting/voting_cards_proposal", proposal, from_proposals_list: true) %>
-  <% if current_component.settings.voting_cards_show_modal_help %>
-    <%= cell("decidim/decidim_awesome/voting/voting_cards_proposal_modal", proposal) %>
-  <% end %>
 </div>

data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb

@@ -2,21 +2,23 @@
 window.DecidimAwesome = <%= javascript_config_vars %>;
 window.DecidimAwesome.currentLocale = "<%= current_locale %>";
 window.DecidimAwesome.version = "<%= Decidim::DecidimAwesome::VERSION %>";
-window.DecidimAwesome.editor_uploader_path = "<%= decidim_decidim_awesome.editor_images_path %>";
-window.DecidimAwesome.rename_scope_label_path = "<%= decidim_admin_decidim_awesome.rename_scope_label_path %>";
+window.DecidimAwesome.editorUploaderPath = "<%= decidim_decidim_awesome.editor_images_path %>";
+window.DecidimAwesome.renameScopeLabelPath = "<%= decidim_admin_decidim_awesome.rename_scope_label_path %>";
 window.DecidimAwesome.texts = {
-  "drag_and_drop_image": "<%= j t(".drag_and_drop_image") %>",
-  "autosaved_success": "<%= j t(".autosaved_success") %>",
-  "autosaved_error": "<%= j t(".autosaved_error") %>",
-  "autosaved_retrieved": "<%= j t(".autosaved_retrieved") %>",
+  "dragAndDropImage": "<%= j t(".drag_and_drop_image") %>",
+  "autosavedSuccess": "<%= j t(".autosaved_success") %>",
+  "autosavedError": "<%= j t(".autosaved_error") %>",
+  "autosavedRetrieved": "<%= j t(".autosaved_retrieved") %>",
   "categories": "<%= j t(".categories") %>",
   "hashtags": "<%= j t(".hashtags") %>",
   "proposals": "<%= j t(".proposals") %>",
   "meetings": "<%= j t(".meetings") %>",
   "amendments": "<%= j t(".amendments") %>",
   "items": "<%= j t(".items") %>",
-  "select_deselect_all": "<%= j t(".select_deselect_all") %>"
+  "selectDeselectAll": "<%= j t(".select_deselect_all") %>",
+  "officialAuthor": "<%= j t("decidim.blogs.models.post.fields.official_blog_post") %>",
 }
+window.DecidimAwesome.formBuilderLangsLocation = "<%= j Decidim::DecidimAwesome.form_builder_langs_location %>";
 <% if defined?(questionnaire) && questionnaire&.id %>
   window.DecidimAwesome.current_questionnaire = "edit_questionnaire_<%= questionnaire.id %>";
   <% if defined? visitor_already_answered? %>

data/app/views/layouts/decidim/decidim_awesome/_intergram_widget.html.erb

@@ -1,16 +1,19 @@
 <script>
-  window.intergramId = "<%= j (settings[:chat_id]).html_safe %>";
-
-  window.intergramOnOpen = {};
-  window.intergramOnOpen.visitorName = "<%= j current_user&.nickname %>";
+  window.intergramId = "<%= j (settings[:chat_id])&.html_safe %>";
+  window.intergramOnOpen = {
+    visitorName: "<%= j current_user&.nickname %>"
+  };
   window.intergramCustomizations = {
     titleClosed: "<%= j (settings[:title_closed].presence || t("decidim.decidim_awesome.config.intergram.title_closed")).html_safe %>",
     titleOpen: "<%= j (settings[:title_open].presence || t("decidim.decidim_awesome.config.intergram.title_open")).html_safe %>",
     introMessage: "<%= j (settings[:intro_message].presence || t("decidim.decidim_awesome.config.intergram.intro_message")).html_safe %>",
     autoResponse: "<%= j (settings[:auto_response].presence || t("decidim.decidim_awesome.config.intergram.auto_response")).html_safe %>",
     autoNoResponse: "<%= j (settings[:auto_no_response].presence || t("decidim.decidim_awesome.config.intergram.auto_no_response")).html_safe %>",
-    mainColor: "<%= j (settings[:color].presence || "#E91E63").html_safe %>",
+    mainColor: "<%= j (settings[:color].presence || (current_organization.colors && current_organization.colors["primary"]) || "#E91E63").html_safe %>",
     alwaysUseFloatingButton: <%= settings[:use_floating_button] ? "true" : "false" %> // Use the mobile floating button also on large screens
   };
 </script>
-<script id="intergram" type="text/javascript" src="<%= awesome_config[:intergram_url] %>"></script>
+
+<% if settings[:chat_id].present? %>
+  <script id="intergram" type="text/javascript" src="<%= awesome_config[:intergram_url] %>"></script>
+<% end %>

data/app/views/layouts/decidim/decidim_awesome/admin/_base.html.erb

@@ -0,0 +1,12 @@
+<% add_secondary_root_menu(:awesome_admin_menu) %>
+
+<%= append_stylesheet_pack_tag "decidim_admin_decidim_awesome", media: "all" %>
+<%= append_javascript_pack_tag "decidim_admin_decidim_awesome", defer: true %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <%= yield %>
+
+  <div class="pokecode-credits"><%= t("credits", scope: "decidim.decidim_awesome", version: link_to(awesome_version, "https://github.com/decidim-ice/decidim-module-decidim_awesome/"), company: link_to("PokeCode", "https://pokecode.net")).html_safe %></div>
+<% end %>
+
+<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>

data/app/views/layouts/decidim/decidim_awesome/admin/application.html.erb

@@ -1,75 +1,3 @@
-<% def icon_aria_selected_link_to(text, link, icon_name, options = {})
-  aria_selected_link_to(safe_join([icon(icon_name), text]), link, options)
-end %>
-
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav">
-    <div class="secondary-nav__title">
-      <%= t "layouts.decidim.admin.decidim_awesome.title" %>
-    </div>
-
-    <ul>
-      <% if menus[:editors] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:editors)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.editors", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:editors), "text" %>
-        </li>
-      <% end %>
-      <% if menus[:proposals] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposals)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.proposals", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposals), "document" %>
-        </li>
-      <% end %>
-      <% if menus[:surveys] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:surveys)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.surveys", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:surveys), "spreadsheet" %>
-        </li>
-      <% end %>
-      <% if menus[:styles] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:styles)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.styles", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:styles), "brush" %>
-        </li>
-      <% end %>
-      <% if menus[:proposal_custom_fields] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposal_custom_fields)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.proposal_custom_fields", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposal_custom_fields), "layers" %>
-        </li>
-      <% end %>
-      <% if menus[:admins] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:admins)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.admins", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:admins), "people" %>
-        </li>
-      <% end %>
-      <% if menus[:menu_hacks] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.menu_hacks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.menu_hacks_path, "menu" %>
-        </li>
-      <% end %>
-      <% if menus[:custom_redirects] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.custom_redirects_path) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.custom_redirects", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.custom_redirects_path, "share-boxed" %>
-        </li>
-      <% end %>
-      <% if menus[:livechat] %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:livechat)) %> class="is-active" <% end %>>
-          <%= icon_aria_selected_link_to I18n.t("menu.livechat", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:livechat), "chat" %>
-        </li>
-      <% end %>
-      <li <% if is_active_link?(decidim_admin_decidim_awesome.checks_path) %> class="is-active" <% end %>>
-        <%= icon_aria_selected_link_to I18n.t("menu.checks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.checks_path, "pulse" %>
-      </li>
-    </ul>
-  </div>
-<% end %>
-
-<%= render "layouts/decidim/admin/application" do %>
-  <div class="process-title">
-    <div class="process-title-content">
-      <%= link_to t("decidim.admin.menu.decidim_awesome"), decidim_admin_decidim_awesome.config_path(:editors), target: "_blank" %>
-    </div>
-  </div>
-
+<%= render "layouts/decidim/decidim_awesome/admin/base" do %>
   <%= yield %>
-
-<div class="pokecode-credits"><%= t("credits", scope: "decidim.decidim_awesome", version: link_to(awesome_version, "https://github.com/decidim-ice/decidim-module-decidim_awesome/"), company: link_to("PokeCode", "https://pokecode.net")).html_safe %></div>
-
 <% end %>

data/app/views/layouts/decidim/decidim_awesome/admin/maintenance.html.erb

@@ -0,0 +1,19 @@
+<%= render "layouts/decidim/decidim_awesome/admin/base" do %>
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
+      <%= t("layouts.decidim.decidim_awesome.admin.maintenance.title", title: t(current_view, scope: "layouts.decidim.decidim_awesome.admin.maintenance.titles")) %>
+
+      <% available_views.each do |view, parts| %>
+        <% next if view == current_view %>
+
+        <%= link_to parts[:path], class: "button button__secondary button__xs tiny button--title" do %>
+          <%= icon parts[:icon] %>
+          <%= parts[:title] %>
+        <% end %>
+      <% end %>
+    </h2>
+  </div>
+  <div class="card">
+    <%= yield %>
+  </div>
+<% end %>

data/config/assets.rb

@@ -1,46 +1,16 @@
 # frozen_string_literal: true
 
-# This file is located at `config/assets.rb` of your module.
-
-# Define the base path of your module. Please note that `Rails.root` may not be
-# used because we are not inside the Rails environment when this file is loaded.
 base_path = File.expand_path("..", __dir__)
 
-# Register an additional load path for webpack. All the assets within these
-# directories will be available for inclusion within the Decidim assets. For
-# example, if you have `app/packs/src/decidim/foo.js`, you can include that file
-# in your JavaScript entrypoints (or other JavaScript files within Decidim)
-# using `import "src/decidim/foo"` after you have registered the additional path
-# as follows.
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
 
-# Register the entrypoints for your module. These entrypoints can be included
-# within your application using `javascript_pack_tag` and if you include any
-# SCSS files within the entrypoints, they become available for inclusion using
-# `stylesheet_pack_tag`.
 Decidim::Webpacker.register_entrypoints(
+  # override the Decidim entry point for decidim so we can define a custom createEditor method
+  decidim_editor: "#{base_path}/app/packs/entrypoints/decidim_editor.js",
   decidim_decidim_awesome: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome.js",
   decidim_admin_decidim_awesome: "#{base_path}/app/packs/entrypoints/decidim_admin_decidim_awesome.js",
+  decidim_admin_decidim_awesome_global: "#{base_path}/app/packs/entrypoints/decidim_admin_decidim_awesome_global.js",
   decidim_decidim_awesome_map: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome_map.js",
   decidim_decidim_awesome_custom_fields: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome_custom_fields.js",
-  decidim_admin_decidim_awesome_custom_fields: "#{base_path}/app/packs/entrypoints/decidim_admin_decidim_awesome_custom_fields.js",
-  decidim_decidim_awesome_admin_form_exit_warn: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome_admin_form_exit_warn.js",
   decidim_decidim_awesome_iframe: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome_iframe.scss"
 )
-
-# If you want to import some extra SCSS files in the Decidim main SCSS file
-# without adding any extra stylesheet inclusion tags, you can use the following
-# method to register the stylesheet import for the main application.
-# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/decidim_awesome/awesome_application")
-
-# If you want to do the same but include the SCSS file for the admin panel's
-# main SCSS file, you can use the following method.
-# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/admin", group: :admin)
-
-# If you want to override some SCSS variables/settings for Foundation from the
-# module, you can add the following registered import.
-# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/settings", type: :settings)
-
-# If you want to do the same but override the SCSS variables of the admin
-# panel's styles, you can use the following method.
-# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/admin_settings", type: :settings, group: :admin)

data/config/i18n-tasks.yml

@@ -9,12 +9,32 @@ data:
     - "<%= %x[bundle info decidim-admin --path].chomp %>/config/locales/%{locale}.yml"
     - "<%= %x[bundle info decidim-proposals --path].chomp %>/config/locales/%{locale}.yml"
     - "<%= %x[bundle info decidim-meetings --path].chomp %>/config/locales/%{locale}.yml"
+    - "<%= %x[bundle info decidim-blogs --path].chomp %>/config/locales/%{locale}.yml"
 
 ignore_unused:
+  - "decidim.admin.actions.manage"
+  - "decidim.admin.filters.admin_accountability.*"
+  - "decidim.admin.filters.search_placeholder.*"
+  - "activemodel.attributes.constraint.*"
+  - "activemodel.attributes.custom_redirect.*"
   - "decidim.components.decidim_awesome.name"
+  - "decidim.components.awesome_iframe.settings.*"
+  - "decidim.components.awesome_map.settings.*"
+  - "decidim.components.proposals.settings.global.*"
+  - "decidim.components.proposals.settings.step.*"
+  - "decidim.decidim_awesome.admin.config.*"
+  - "decidim.decidim_awesome.admin.admin_accountability.*"
+  - "decidim.decidim_awesome.admin.menu.*"
+  - "decidim.decidim_awesome.admin.menu_hacks.*"
+  - "decidim.decidim_awesome.admin.proposal_custom_fields.*"
+  - "decidim.decidim_awesome.custom_fields.*"
+  - "decidim.decidim_awesome.map_component.map.show.*"
+  - "decidim.decidim_awesome.voting.voting_cards.*"
+  - "decidim.decidim_awesome.content_blocks.*"
+  - "decidim.decidim_awesome.admin_log.*"
+  - "layouts.decidim.decidim_awesome.admin.maintenance.titles.*"
+  - "decidim.proposals.*"
+  - "decidim.meetings.*"
 
 ignore_missing:
   - decidim.participatory_processes.scopes.global
-  # TODO: remove when diching support for 0.26
-  - decidim.proposals.collaborative_drafts.new.add_file
-  - decidim.proposals.collaborative_drafts.new.edit_file

data/config/locales/ca.yml

@@ -3,11 +3,10 @@ ca:
   activemodel:
     attributes:
       config:
-        additional_proposal_sortings: Opcions d'ordenació addicionals actives
-        allow_images_in_full_editor: Permet imatges a l'editor HTML complet
-        allow_images_in_markdown_editor: Permet imatges a l'editor Markdown
+        additional_proposal_sortings: Activa opcions d'ordenació addicionals
+        allow_images_in_editors: Permet imatges a l'editor HTML
         allow_images_in_proposals: Permet imatges a l'editor de propostes
-        allow_images_in_small_editor: Permet imatge a l'editor HTML reduït
+        allow_videos_in_editors: Permet vídeos a l'editor HTML
         auto_save_forms: Desa automàticament els formularis a l'emmagatzematge local
         intergram_auto_no_response: Un missatge que s'envia un minut després que la usuària hagi enviat el seu primer missatge i no s'hagi rebut cap resposta
         intergram_auto_response: Un missatge que s'envia immediatament després que la usuària enviï el seu primer missatge
@@ -22,7 +21,6 @@ ca:
         proposal_custom_fields: 'Camps personalitzats #%{id}'
         scoped_admins: 'Grup d''administradores acotades #%{id}'
         scoped_styles: 'Personalització d''estils #%{id}'
-        use_markdown_editor: Fes servir l'editor Markdown en comptes de l'editor HTML
         validate_body_max_caps_percent: Percentatge màxim de majúscules en el cos de la proposta
         validate_body_max_marks_together: Nombre màxim de símbols consecutius permesos al cos de la proposta
         validate_body_min_length: Nombre de caràcters mínims requerits pel cos de la proposta
@@ -52,6 +50,8 @@ ca:
         proposal_custom_fields: Camps personalitzats
   decidim:
     admin:
+      actions:
+        manage: Configura
       filters:
         admin_accountability:
           admin_role_type:
@@ -78,7 +78,6 @@ ca:
             announcement: Anunci
             iframe: Codi Iframe
             iframe_help: 'Posa el teu codi com a HTML: <iframe width="100%" height="700" frameBorder="0" allowFullscreen src="..."></iframe>. S''eliminarà qualsevol altre element HTML que no sigui l''Iframe. Assegureu-vos de fer servir 100% a l''amplada (width="100%") per tal d''omplir la pantalla.'
-            no_margins: Sense marges entre l'Iframe i la resta de la pàgina
             viewport_width: Limita l'amplada màxima com a la resta de l'aplicació
           step:
             announcement: Anunci
@@ -120,6 +119,7 @@ ca:
               supported_first: Votades per mi primer
               supported_last: Votades últimes per mi
               za: Z-A (ordre alfabètic invers)
+            limit_pending_amendments: Permetre només una esmena pendent a cada proposta.
             sort_orders_enabled: Opcions d'ordenació actives
             voting_cards_box_title: Títol per la cabina de votació
             voting_cards_box_title_help: L'opció per defecte és 'Votar a aquesta proposta'. Utilitzeu '-' per amagar-la.
@@ -227,10 +227,9 @@ ca:
               incorrect_css: 'El CSS de la caixa #%{key} no és vàlid'
               incorrect_json: 'La sintaxi JSON de la caixa #%{key} és invàlida'
             help:
-              allow_images_in_full_editor: Això afegirà un botó per pujar imatges a l'editor HTML complet.
-              allow_images_in_markdown_editor: Això permetrà a l'editor markdown pujar imatges amb "copiar i enganxar" o "arrastrant i deixant anar".
+              allow_images_in_editors: Això afegirà una icona per pujar arxius a l'editor HTML
               allow_images_in_proposals: Això permetrà pujar imatges a l'editor de propostes, disponible per qualsevol usuari
-              allow_images_in_small_editor: Això afegirà un botó per pujar imatges a l'editor HTML mínim.
+              allow_videos_in_editors: Això afegirà una icona per enllaçar vídeos a l'editor HTML
               auto_save_forms: Això farà servir l'emmagatzematge local del navegador per desar automàticament les dades introduïdes pels usuaris a les enquestes i altres formularis mentre les omplen. Les dades es restauraran en una futura visita amb el mateix navegador en cas que no s'enviï el formulari. Si s’envia el formulari, s’eliminaran les dades locals. Si els usuaris eliminen les seves dades del navegador, tampoc es restauraran.
               drag_and_drop_supported: Quan es pugin imatges, es pot fer a través del mètode de "arrossegar i deixar anar". Les imatges seran pujades al servidor i inserides com recursos externs (no es fa servir codificació en línia base64).
               intergram_about: Intergram utilitza el Telegram Messenger per gestionar un widget de xat en viu de suport incrustat a la part inferior de la pàgina.
@@ -242,7 +241,6 @@ ca:
               scoped_admins: Promou usuaries normals a administradores amb accés limitat a certes parts de la web pública (feu servir l'editor de restriccions per això). Noteu que afegir usuaries que ja tenen permisos d'administració no té cap efecte.
               scoped_styles: Crea CSS personalitzats que només s'apliquin a determinades parts de la web pública (per fer-ho, utilitza l'editor de restriccions)
               scoped_styles_variables: 'Pots fer servir les següents variables CSS pels colors personalitzats de l''organització:'
-              use_markdown_editor: Això substituirà l'editor HTML (Quill), en el seu lloc s'utilitzarà un editor Markdown tant a l'admin com a la pàgina pública per processar el text (a la base de dades el text es desarà com a markdown)
               validate_body_max_caps_percent: Zero no permetrà cap majúscula, 100 obligarà a escriure-ho tot en majúscules
               validate_body_max_marks_together: 'Limiteu el nombre de signes d''interrogació i d''exclamació que es poden escriure junts. És a dir: si és 2, aleshores ''!!!'' no es permetrà al text'
               validate_body_min_length: Aquest nombre pot ser zero, això farà que aquest camp no sigui obligatori
@@ -266,7 +264,6 @@ ca:
             sure_to_remove: Estàs segura que vols eliminar aquesta caixa CSS?
           none: "⛔ Mai! - Desactiva qualsevol altra restricció"
           process_groups: Grup de processos
-          rich_text_editor_in_public_views: 'NOTA: "Editor de text enriquit per participants" està habilitat a la configuració general, aquesta opció no aplicarà. Feu servir les modificacions d''editor general per afegir imatges a les propostes.'
           show:
             title: Modificacions per %{setting}
             update: Actualitza la configuració
@@ -365,10 +362,13 @@ ca:
           index:
             confirm_destroy: Confirmes que vols eliminar aquest retoc?
             edit: Editar
+            home_content_block_menu:
+              title: Bloc de menú global a la home
+            menu:
+              title: Menú principal
             new: Nou ítem
             remove: Eliminar addició
             remove_hack: Eliminar retoc
-            title: Menú principal
           new:
             save: Desar
             title: Nou ítem de menú
@@ -376,6 +376,15 @@ ca:
             error: 'Error en actualitzar l''ítem de menú: %{error}'
             success: Ítem de menú actualitzat correctament
           url_exists: Aquesta URL ha estat configurada en un altre ítem de menú, si us plau edita'l en comptes de crear-ne un de nou.
+      amendments:
+        modal:
+          amendment_exists: Una esmena ja existeix
+          current_amendment_html: <p>Podeu <a href="%{amendment_link}">accedir a l'esmena actual aquí</a>.</p>
+          dismiss: D'acord
+          explanation_html: |
+            <p>Actualment, s'està avaluant una altra esmena per a aquesta proposta. Per crear-ne una de nova, heu d'esperar fins que l'actual sigui acceptada o rebutjada.</p>
+            <p>També podeu posar-vos en contacte amb l'autor d'aquesta proposta <a href="%{proposal_link}">deixant un comentari</a> i intentar accelerar la resolució de l'esmena actual.</p>
+        pending_limit_reached: Ho sentim, només hi pot haver una esmena pendent alhora. Si us plau, espereu fins que "%{emendation}" sigui acceptat o rebutjat.
       config:
         intergram:
           auto_no_response: Sembla que no hi ha ningú disponible per a respondre en aquest moment. Si us plau, indica'ns com et podem contactar i ens comunicarem amb tu tan aviat com ens sigui possible.
@@ -437,7 +446,7 @@ ca:
           abstained: "✔ Abstenció"
           change_vote: Canvia el meu vot
           default_box_title: Vota en aquesta proposta
-          default_instructions_html: <p>Llegeix les normes de la votació amb atenció per entendre com s'utilitzarà el teu vot per %{organization}"</p>
+          default_instructions_html: "<p>Llegeix les normes de la votació amb atenció per entendre com s'utilitzarà el teu vot per %{organization}\"</p>"
           modal:
             cancel: Cancel·la
             message: El teu vot es considerarà definitiu el %{date}. Pots canviar-lo fins a aquest moment
@@ -455,6 +464,9 @@ ca:
             weight_2_short: 'G:'
             weight_3: Verd
             weight_3_short: 'V:'
+    meetings:
+      meetings_map:
+        view_meeting: Veure trobada
     proposals:
       proposals:
         orders:
@@ -462,11 +474,10 @@ ca:
           supported_first: Votades per mi primer
           supported_last: Votades últimes per mi
           za: Z-A (ordre alfabètic invers)
+        proposal:
+          view_proposal: Veure proposta
   layouts:
     decidim:
-      admin:
-        decidim_awesome:
-          title: Modificacions a Decidim
       decidim_awesome:
         awesome_config:
           amendments: Esmenes
@@ -479,4 +490,4 @@ ca:
           items: elements
           meetings: Trobades
           proposals: Propostes
-          select_deselect_all: Seleccionar/desseleccionar tot
+          select_deselect_all: Selecciona/Des-selecciona tot