decidim-decidim_awesome 0.7.0 → 0.7.2

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -0,0 +1,83 @@
+<%= form_required_explanation %>
+
+<div class="field hashtags__container">
+  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
+</div>
+
+<div class="field hashtags__container">
+  <%= text_editor_for_proposal_body(form) %>
+</div>
+
+<% if @form.component_automatic_hashtags.any? %>
+  <div class="field">
+    <%= form.label :automatic_hashtags %>
+    <div class="checkboxes hashtags">
+      <% @form.component_automatic_hashtags.each do |hashtag| %>
+        <label>
+          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
+        </label>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+
+<% if @form.component_suggested_hashtags.any? %>
+  <div class="field">
+    <%= form.label :suggested_hashtags, nil, for: nil %>
+    <div class="checkboxes hashtags">
+      <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
+        option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
+      end %>
+    </div>
+  </div>
+<% end %>
+
+<% if @form.geocoding_enabled? %>
+  <div class="field">
+    <%= form.check_box :has_address, checked: form_has_address? %>
+  </div>
+
+  <div class="field" id="address_input">
+    <%= form.geocoding_field :address %>
+  </div>
+<% end %>
+
+<% if @form.categories&.any? %>
+  <div class="field">
+    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
+  </div>
+<% end %>
+
+<% if current_component.has_subscopes? %>
+  <div class="field">
+    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
+  </div>
+<% end %>
+
+<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+  <div class="field">
+    <%= user_group_select_field form, :user_group_id %>
+  </div>
+<% end %>
+
+<% if component_settings.attachments_allowed? %>
+  <fieldset>
+    <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
+    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
+      <div class="field">
+        <%= nested_form.text_field :title %>
+      </div>
+
+      <div class="field">
+        <%= nested_form.upload :file, optional: false %>
+        <% if @form.errors[:attachment].present? %>
+          <% @form.errors[:attachment].each do |message| %>
+            <small class="form-error is-visible">
+              <%= message %>
+            </small>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  </fieldset>
+<% end %>

data/app/views/decidim/proposals/collaborative_drafts/show.html.erb

@@ -0,0 +1 @@
+<%= render partial: "#{version_prefix}/decidim/proposals/collaborative_drafts/show" %>

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

@@ -1,3 +1,7 @@
+<% 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">
@@ -8,36 +12,46 @@
       <% if config_enabled?([:allow_images_in_full_editor, :allow_images_in_small_editor, :use_markdown_editor,
 :allow_images_in_markdown_editor]) %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:editors)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.editors", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:editors) %>
+          <%= 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 config_enabled? :allow_images_in_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 config_enabled? :auto_save_forms %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:surveys)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.surveys", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:surveys) %>
+          <%= 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 config_enabled? :scoped_styles %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:styles)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.styles", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:styles) %>
+          <%= 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 config_enabled? :allow_images_in_proposals %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposals)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.proposals", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposals) %>
+      <% if config_enabled? :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 config_enabled?([:intergram_for_admins, :intergram_for_public]) %>
-        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:livechat)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.livechat", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:livechat) %>
+      <% if config_enabled? :scoped_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 config_enabled? :menu %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.menu_hacks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.menu_hacks_path %>
+          <%= 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 config_enabled?([:intergram_for_admins, :intergram_for_public]) %>
+        <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 %>>
-        <%= aria_selected_link_to I18n.t("menu.checks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.checks_path %>
+        <%= icon_aria_selected_link_to I18n.t("menu.checks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.checks_path, "pulse" %>
       </li>
     </ul>
   </div>

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

@@ -1,6 +1,8 @@
 <script>
 window.DecidimAwesome = <%= javascript_config_vars %>;
+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.texts = {
   "drag_and_drop_image": "<%= j t(".drag_and_drop_image") %>",
   "autosaved_success": "<%= j t(".autosaved_success") %>",
@@ -21,3 +23,5 @@ window.DecidimAwesome.texts = {
   <% end %>
 <% end %>
 </script>
+
+<%= javascript_include_tag "decidim/decidim_awesome/proposals/custom_fields" if awesome_proposal_custom_fields %>

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

@@ -1,3 +1,3 @@
 <style media="all">
-  <%= awesome_custom_styles %>
+  <%== awesome_custom_styles.join("\n").html_safe %>
 </style>

data/app/views/v0.23/decidim/proposals/collaborative_drafts/_show.html.erb

@@ -0,0 +1,134 @@
+<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
+<% add_decidim_meta_tags({
+  description: present(@collaborative_draft).body,
+  title: present(@collaborative_draft).title,
+  url: collaborative_draft_url(@collaborative_draft.id)
+}) %>
+
+<% if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+  <div class="row">
+    <div class="columns">
+      <div class="callout secondary"><%= t("info-message", scope:"decidim.proposals.collaborative_drafts.show").html_safe %></div>
+    </div>
+  </div>
+<% end %>
+
+<div class="row column view-header">
+  <div class="m-bottom">
+    <%= link_to collaborative_drafts_path do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t("back", scope:"decidim.proposals.collaborative_drafts.show") %>
+    <% end %>
+  </div>
+
+  <h2 class="heading2">
+    <%= present(@collaborative_draft).title(links: true, html_escape: true) %>
+  </h2>
+
+  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3, context: { current_user: current_user }) %>
+</div>
+
+<div class="row">
+  <div class="columns mediumlarge-8 large-9">
+    <div class="section">
+      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
+
+      <%= render_proposal_body(@collaborative_draft) %>
+
+      <% if component_settings.geocoding_enabled? %>
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
+      <% end %>
+
+      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
+    </div>
+  </div>
+
+  <div class="columns section view-side mediumlarge-4 large-3">
+    <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+      <div class="card text-center" id="collaborative_draft_publish">
+        <div class="card__content">
+          <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
+          <div class="text-small">
+            <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
+            <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+
+    <div class="card text-center">
+      <div class="card__content">
+        <% if @collaborative_draft.published? %>
+          <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
+        <% else %>
+          <div>
+            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
+            <div class="text-medium">
+              <%= resource_version_of(@collaborative_draft.versions_count) %>
+            </div>
+          </div>
+
+          <div>
+            <span class="text-medium">
+              <%= link_to_other_resource_versions(collaborative_draft_versions_path(@collaborative_draft)) %>
+            </span>
+          </div>
+        <% end %>
+
+        <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
+        <% end %>
+
+        <%= render "request_access_form" %>
+
+        <% if @collaborative_draft.requesters.include? current_user %>
+          <button type="button" class="button expanded button--sc mt-s">
+            <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
+          </button>
+        <% end %>
+      </div>
+
+      <div class="card__status">
+        <ul class="card-data">
+          <li class="card-data__item authors_status">
+            <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
+              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
+            <% end %>
+          </li>
+
+          <li class="card-data__item versions_status">
+            <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
+              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
+                <%= icon("pencil", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.count}" %>
+              <% end %>
+            <% end %>
+          </li>
+          <li class="card-data__item">
+            <%= link_to "#comments" do %>
+              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
+                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
+              <% end %>
+            <% end %>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <%= render partial: "collaborator_requests" %>
+
+    <%= resource_reference(@collaborative_draft) %>
+
+    <%= render partial: "decidim/shared/share_modal" %>
+  </div>
+</div>
+
+<%= attachments_for @collaborative_draft %>
+<%= comments_for @collaborative_draft %>
+
+<%=
+  render partial: "decidim/shared/flag_modal", locals: {
+    reportable: @collaborative_draft,
+    form: @report_form,
+    url: decidim.report_path(sgid: @collaborative_draft.to_sgid.to_s)
+  }
+%>

data/app/views/v0.23/layouts/decidim/_head.html.erb

@@ -21,7 +21,7 @@
 <%= stylesheet_link_tag    "application", media: "all" %>
 <%= invisible_captcha_styles %>
 
-<%= stylesheet_link_tag    "decidim/decidim_awesome/application", media: "all" %>
+<%= stylesheet_link_tag    "decidim/decidim_awesome/awesome_application", media: "all" %>
 <%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>
 <%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles %>
 

data/app/views/v0.23/layouts/decidim/admin/_header.html.erb

@@ -8,5 +8,5 @@
 
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
 
-<%= stylesheet_link_tag    "decidim/decidim_awesome/admin", media: "all" %>
+<%= stylesheet_link_tag    "decidim/decidim_awesome/awesome_admin", media: "all" %>
 <%= javascript_include_tag "decidim/decidim_awesome/legacy_admin" %>

data/app/views/v0.24/decidim/proposals/collaborative_drafts/_show.html.erb

@@ -0,0 +1,128 @@
+<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
+<% add_decidim_meta_tags({
+  description: present(@collaborative_draft).body,
+  title: present(@collaborative_draft).title,
+  url: collaborative_draft_url(@collaborative_draft.id)
+}) %>
+
+<% if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+  <div class="row">
+    <div class="columns">
+      <div class="callout secondary"><%= t("info-message", scope:"decidim.proposals.collaborative_drafts.show").html_safe %></div>
+    </div>
+  </div>
+<% end %>
+
+<div class="row column view-header">
+  <div class="m-bottom">
+    <%= link_to collaborative_drafts_path do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t("back", scope:"decidim.proposals.collaborative_drafts.show") %>
+    <% end %>
+  </div>
+
+  <h2 class="heading2">
+    <%= present(@collaborative_draft).title(links: true, html_escape: true) %>
+  </h2>
+
+  <%= cell("decidim/coauthorships", @collaborative_draft, has_actions: true, size: 3, context: { current_user: current_user }) %>
+</div>
+
+<div class="row">
+  <div class="columns mediumlarge-8 large-9">
+    <div class="section">
+      <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
+
+      <%= render_proposal_body(@collaborative_draft) %>
+
+      <% if component_settings.geocoding_enabled? %>
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>
+      <% end %>
+
+      <%= cell "decidim/tags", @collaborative_draft, context: { extra_classes: ["tags--collaborative-draft"] } %>
+    </div>
+  </div>
+
+  <div class="columns section view-side mediumlarge-4 large-3">
+    <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+      <div class="card text-center" id="collaborative_draft_publish">
+        <div class="card__content">
+          <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
+          <div class="text-small">
+            <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
+            <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+
+    <div class="card text-center">
+      <div class="card__content">
+        <% if @collaborative_draft.published? %>
+          <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
+        <% else %>
+          <div>
+            <%= resource_version_number(@collaborative_draft.versions_count, "text-large") %>
+            <div class="text-medium">
+              <%= resource_version_of(@collaborative_draft.versions_count) %>
+            </div>
+          </div>
+
+          <div>
+            <span class="text-medium">
+              <%= link_to_other_resource_versions(collaborative_draft_versions_path(@collaborative_draft)) %>
+            </span>
+          </div>
+        <% end %>
+
+        <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+          <%= link_to t("edit", scope:"decidim.proposals.collaborative_drafts.show"), edit_collaborative_draft_path(@collaborative_draft), class: "button hollow expanded button--sc mt-s", id: "collaborative_draft_edit" %>
+        <% end %>
+
+        <%= render "request_access_form" %>
+
+        <% if @collaborative_draft.requesters.include? current_user %>
+          <button type="button" class="button expanded button--sc mt-s">
+            <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
+          </button>
+        <% end %>
+      </div>
+
+      <div class="card__status">
+        <ul class="card-data">
+          <li class="card-data__item authors_status">
+            <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.authors") do %>
+              <%= icon("people", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.group_by(&:whodunnit).size}" %>
+            <% end %>
+          </li>
+
+          <li class="card-data__item versions_status">
+            <%= link_to collaborative_draft_versions_path(@collaborative_draft) do %>
+              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.contributions") do %>
+                <%= icon("pencil", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.versions.count}" %>
+              <% end %>
+            <% end %>
+          </li>
+          <li class="card-data__item">
+            <%= link_to "#comments" do %>
+              <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
+                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
+              <% end %>
+            <% end %>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <%= render partial: "collaborator_requests" %>
+
+    <%= resource_reference(@collaborative_draft) %>
+
+    <%= render partial: "decidim/shared/share_modal" %>
+  </div>
+</div>
+
+<%= attachments_for @collaborative_draft %>
+<%= comments_for @collaborative_draft %>
+
+<%= cell("decidim/flag_modal", @collaborative_draft) %>

data/app/views/v0.24/layouts/decidim/_head.html.erb

@@ -21,7 +21,7 @@
 <%= stylesheet_link_tag    "application", media: "all" %>
 <%= invisible_captcha_styles %>
 
-<%= stylesheet_link_tag    "decidim/decidim_awesome/application", media: "all" %>
+<%= stylesheet_link_tag    "decidim/decidim_awesome/awesome_application", media: "all" %>
 <%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>
 <%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles %>
 
@@ -36,4 +36,4 @@
 <%= content_for :header_snippets %>
 
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
-<%= javascript_include_tag "decidim/decidim_awesome/application" %>
+<%= javascript_include_tag "decidim/decidim_awesome/awesome_application" %>

data/app/views/v0.24/layouts/decidim/admin/_header.html.erb

@@ -8,5 +8,5 @@
 
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
 
-<%= stylesheet_link_tag    "decidim/decidim_awesome/admin", media: "all" %>
-<%= javascript_include_tag "decidim/decidim_awesome/admin" %>
+<%= stylesheet_link_tag    "decidim/decidim_awesome/awesome_admin", media: "all" %>
+<%= javascript_include_tag "decidim/decidim_awesome/awesome_admin" %>

data/config/locales/ca.yml

@@ -17,7 +17,9 @@ ca:
         intergram_title_closed: Títol del xat tancat
         intergram_title_open: Títol del xat obert
         intergram_use_floating_button: Si està marcat, el xat tancat és sempre un botó en lloc d'un text
-        scoped_styles: 'Estils personalitzats #%{id}'
+        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
       constraint:
         component_id: o específicament a
@@ -30,6 +32,8 @@ ca:
         target: Obre a
         url: URL
         visibility: Visibilitat
+      proposal:
+        proposal_custom_fields: Camps personalitzats
   decidim:
     admin:
       menu:
@@ -84,22 +88,37 @@ ca:
             head_tags: Etiquetes Awesome incloses a la capçalera de l'aplicació
             title: Anàlisi de compatibilitat amb el sistema
         config:
+          caution: 'NOTA: Aquesta funció modifica en gran mesura alguns comportaments predeterminats que podrien provocar resultats inesperats. Utilitzeu-lo amb precaució!'
           constraints:
             add_condition: Afegeix una restricció
             always: Sempre
+            cannot_be_destroyed: Disculpa, però això no es pot eliminar. Aquesta configuració necessita almenys una restricció.
             delete: Esborra
             edit: Edita
             title: 'S''aplica només en aquests casos:'
+          create_proposal_custom_field:
+            error: Error en crear una nova caixa de "camps personalitzats"! %{error}
+            success: 'Caixa de "camps personalitzats" %{key} creada correctament'
+          create_scoped_admin:
+            error: Error en crear una nou grup d'administradores! %{error}
+            success: Grup d'administradores %{key} creat correctament
           create_scoped_style:
             error: Error en crear una nova caixa CSS! %{error}
             success: Caixa CSS %{key} creada correctament
+          destroy_proposal_custom_field:
+            error: Error en eliminar la caixa de "camps personalitzats"! %{error}
+            success: 'Caixa de "camps personalitzats" %{key} eliminada correctament'
+          destroy_scoped_admin:
+            error: Error en eliminar el grup d'administradores! %{error}
+            success: Grup d'administradores %{key} eliminat correctament
           destroy_scoped_style:
             error: Error en eliminar una caixa CSS! %{error}
             success: Caixa CSS %{key} eliminada correctament
-          experimental: Opcions experimentals
           form:
+            edit_label: Canviar el nom de l'etiqueta
             errors:
               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".
@@ -109,13 +128,27 @@ ca:
               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.
               intergram_config: 'Convida a la <a href="https://web.telegram.org/#/im?p=@IntergramBot">@Intergram bot</a> al teu grup o comença un xat amb ella directament. <a href="https://github.com/idoco/intergram#embed-intergram-in-your-website-with-these-2-simple-steps">+ info</a>'
+              proposal_custom_fields: Crea camps personalitzats per a propostes que només s'apliquin a determinades parts de la web pública (per fer-ho, utilitza l'editor de restriccions)
+              proposal_custom_fields_example: Les dades son desades en un objecte XML fent servir atributs compatibles amb HTML (elements DL, DT, DD) que reemplacen el "cos" de la proposat normal.
+              proposal_custom_fields_translations: "Les etiquetes, el text d’ajuda, placeholders i els valors predeterminats poden utilitzar les traduccions personalitzades de la vostra aplicació.\nPer a això, en lloc d'utilitzar un text literal, utilitzeu la clau i18n (ha de contenir almenys un punt).\nPer exemple:\n- \"activemodel.attributes.proposal.title\" en lloc de \"Títol\"\n- \"activemodel.attributes.proposal.address\" en lloc de \"Adreça\"\nO bé utilitzeu les vostres pròpies tecles en combinació amb altres eines per definir traduccions (per exemple, mitjançant el mòdul Personalitzador de termes):\n- \"myapp.custom_fields.bio\" en lloc de \"Biografia\""
+              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)
-          form_styles:
+          form_proposal_custom_fields:
+            new: Afegeix una nova caixa de "camps personalitzats"
+            remove: Elimina aquesta caixa de "camps personalitzats"
+            sure_to_remove: Estàs segura que vols eliminar aquesta caixa de camps personalitzats?
+          form_scoped_admins:
+            new: Afegir un nou grup "d'Administradores acotades"
+            remove: Elimineu aquest grup "d'Administradores acotades"
+            sure_to_remove: Estàs segura que vols eliminar aquest grup "d'Administradores acotades"?
+          form_scoped_styles:
             new: Afegeix una nova caixa CSS
             remove: Elimina aquesta caixa CSS
             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}
@@ -145,10 +178,12 @@ ca:
             error: Error actualitzant la restricció
             success: Restricció actualitzada correctament
         menu:
+          admins: Administradores acotades
           checks: Compatibilitat de sistema
           editors: Modificacions als editors
           livechat: Xat en directe
           menu_hacks: Retocs al menú
+          proposal_custom_fields: Camps personalitzats per propostes
           proposals: Modificacions a propostes
           styles: Estils personalitzats
           surveys: Formularis i enquestes
@@ -193,7 +228,31 @@ ca:
           intro_message: Hola! En què et puc ajudar?
           title_closed: Fes clic per xatejar!
           title_open: Parlem!
+      content_blocks:
+        map:
+          collapse: Inicia amb el menú col·lapsat
+          map_center: Centre del mapa (Latitud, Longitud)
+          map_center_help: 'Utilitza un punt per marcar els decimals (pe: 41.38879, 2.15899). Deixa aquest camp buit per incloure automàticament tots els marcadors'
+          map_height: Alçada del mapa (px)
+          map_settings: Configuració del mapa
+          map_zoom: Zoom (qualsevol nombre entre 0 i 18)
+          map_zoom_help: Només s’aplica si es defineix el punt central del mapa
+          menu_amendments: Mostrar esmenes
+          menu_meetings: Mostrar trobades
+          name: Mapa global
+          show_accepted: Mostra les propostes acceptades
+          show_evaluating: Mostra les propostes en avaluació
+          show_not_answered: Mostra les propostes pendents de contestar
+          show_rejected: Mostra les propostes rebutjades
+          show_withdrawn: Mostra les propostes retirades
+          text_settings: Configuració del text
+          title: Títol
+          truncate: Nombre màxim de caràcters per les descripcions emergents
       credits: Decidim Awesome %{version} · Made with ♥ by Platoniq
+      custom_fields:
+        errors:
+          invalid_fields: No s'ha pogut analitzar el contingut però s'ha assignat al camp '%{field}'
+          invalid_xml: 'No s''ha pogut analitzar el contingut: no s''han trobat els elements DL/DD a l''XML'
       editor_images:
         create:
           error: Error en pujar la imatge!