decidim-initiatives 0.27.2 → 0.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cebe3b555577f60826745d07d1707be967fc0101603903101d454ddbf78f9fbe
-  data.tar.gz: 39f12e28a9376474caed11a343a841f7d8ac94544f8ce841f495fe80424e92b7
+  metadata.gz: 59d295e16fde2eada468ccb94da312ecf5a2b48154627275645bd2f4f20943fa
+  data.tar.gz: 86e6dc47360ed063ef296422bf44c61a141ce82f68d33fbe49a0ed0fff5d1a11
 SHA512:
-  metadata.gz: 3716c21e58e656d2dd33b3611938dbc812131a11dc30a2528278e894cd3a50000eff5493732c3bb836795955762177e879576a14f0bd84e0be63d5ea3a57724e
-  data.tar.gz: 1b99d0de7dd9109f71e548542177f420e900061029af1762f1dc8dbf98711107207c80db2c925680db3f44f57eaad1f08c7f170b42eb29c8be7001b525beb238
+  metadata.gz: 5c4f7bde0ad8c721a92012e4a4a30847dbb6e92c0ade84334db0e0d3250b018bdec64024bcb68a593b9f80333c1e931f2ff4b8d8d5065d9e006bcd1b740db168
+  data.tar.gz: 837ab0a2cda44e0e9b673bc2812e565c5bb8ef53cc7eeedd3b6921259eb71ed7305481b02df5ce06957c9846d10a5a0829053a8724f42ab91e303ec086627864

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -73,7 +73,8 @@ module Decidim
           area: area,
           signature_type: form.signature_type,
           signature_end_date: signature_end_date,
-          state: "created"
+          state: "created",
+          hashtag: form.hashtag
         )
       end
 
@@ -105,7 +106,7 @@ module Decidim
             participatory_space: initiative
           )
 
-          initialize_pages(component) if component_name == :pages
+          initialize_pages(component) if component_name.in? ["pages", :pages]
         end
       end
 

data/app/controllers/decidim/initiatives/admin/committee_requests_controller.rb

@@ -41,7 +41,7 @@ module Decidim
         private
 
         def membership_request
-          @membership_request ||= InitiativesCommitteeMember.find(params[:id])
+          @membership_request ||= InitiativesCommitteeMember.where(initiative: current_participatory_space).find(params[:id])
         end
       end
     end

data/app/controllers/decidim/initiatives/admin/exports_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # This controller allows exporting things.
+      # It is targeted for customizations for exporting things that lives under
+      # a participatory process.
+      class ExportsController < Decidim::Admin::ExportsController
+        include InitiativeAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/initiatives/admin/initiatives_controller.rb

@@ -14,7 +14,7 @@ module Decidim
 
         helper ::Decidim::Admin::ResourcePermissionsHelper
         helper Decidim::Initiatives::InitiativeHelper
-        helper Decidim::Initiatives::CreateInitiativeHelper
+        helper Decidim::Initiatives::SignatureTypeOptionsHelper
 
         # GET /admin/initiatives
         def index

data/app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb

@@ -69,7 +69,7 @@ module Decidim
         private
 
         def current_initiative_type_scope
-          @current_initiative_type_scope ||= InitiativesTypeScope.find(params[:id])
+          @current_initiative_type_scope ||= InitiativesTypeScope.joins(:type).where(decidim_initiatives_types: { organization: current_organization }).find(params[:id])
         end
 
         def initiative_type_scope_form

data/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb

@@ -84,7 +84,7 @@ module Decidim
         private
 
         def current_initiative_type
-          @current_initiative_type ||= InitiativesType.find(params[:id])
+          @current_initiative_type ||= InitiativesType.where(organization: current_organization).find(params[:id])
         end
 
         def initiative_type_form

data/app/controllers/decidim/initiatives/application_controller.rb

@@ -11,6 +11,13 @@ module Decidim
                            ::Decidim::Admin::Permissions,
                            ::Decidim::Permissions)
 
+      before_action do
+        if Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).all.empty?
+          flash[:alert] = t("index.uninitialized", scope: "decidim.initiatives")
+          redirect_to(decidim.root_path)
+        end
+      end
+
       def permissions_context
         super.merge(
           current_participatory_space: try(:current_participatory_space)

data/app/controllers/decidim/initiatives/committee_requests_controller.rb

@@ -70,7 +70,7 @@ module Decidim
       private
 
       def membership_request
-        @membership_request ||= InitiativesCommitteeMember.find(params[:id])
+        @membership_request ||= InitiativesCommitteeMember.where(initiative: current_participatory_space).find(params[:id])
       end
     end
   end

data/app/controllers/decidim/initiatives/create_initiative_controller.rb

@@ -16,6 +16,8 @@ module Decidim
 
       helper Decidim::Admin::IconLinkHelper
       helper InitiativeHelper
+      helper SignatureTypeOptionsHelper
+
       helper_method :similar_initiatives
       helper_method :scopes
       helper_method :areas
@@ -23,6 +25,8 @@ module Decidim
       helper_method :initiative_type
       helper_method :promotal_committee_required?
 
+      before_action :authenticate_user!
+
       steps :select_initiative_type,
             :previous_form,
             :show_similar_initiatives,
@@ -30,6 +34,8 @@ module Decidim
             :promotal_committee,
             :finish
 
+      before_action :ensure_type_exists, only: :show
+
       def show
         enforce_permission_to :create, :initiative
         send("#{step}_step", initiative: session_initiative)
@@ -42,6 +48,15 @@ module Decidim
 
       private
 
+      def ensure_type_exists
+        destination_step = single_initiative_type? ? :previous_form : :select_initiative_type
+
+        return if step == destination_step
+        return if initiative_type_id.present? && initiative_type.present?
+
+        redirect_to wizard_path(destination_step)
+      end
+
       def select_initiative_type_step(_parameters)
         @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).instance
         session[:initiative] = {}
@@ -148,11 +163,11 @@ module Decidim
       end
 
       def current_initiative
-        Initiative.find(session_initiative[:id]) if session_initiative.has_key?(:id)
+        Initiative.where(organization: current_organization).find_by(id: session_initiative[:id]) if session_initiative.has_key?(:id)
       end
 
       def initiative_type
-        @initiative_type ||= InitiativesType.find(initiative_type_id)
+        @initiative_type ||= InitiativesType.where(organization: current_organization).find_by(id: initiative_type_id)
       end
 
       def initiative_type_id

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -18,6 +18,8 @@ module Decidim
       helper Decidim::ResourceReferenceHelper
       helper PaginateHelper
       helper InitiativeHelper
+      helper SignatureTypeOptionsHelper
+
       include InitiativeSlug
       include FilterResource
       include Paginable
@@ -86,6 +88,7 @@ module Decidim
         enforce_permission_to :update, :initiative, initiative: current_initiative
 
         params[:id] = params[:slug]
+        params[:type_id] = current_initiative.type&.id
         @form = form(Decidim::Initiatives::InitiativeForm)
                 .from_params(params, initiative_type: current_initiative.type, initiative: current_initiative)
 

data/app/controllers/decidim/initiatives/initiatives_type_scopes_controller.rb

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def initiative_type
-        @initiative_type ||= InitiativesType.find(params[:type_id])
+        @initiative_type ||= InitiativesType.where(organization: current_organization).find(params[:type_id])
       end
     end
   end

data/app/controllers/decidim/initiatives/initiatives_type_signature_types_controller.rb

@@ -14,7 +14,7 @@ module Decidim
       private
 
       def allowed_signature_types_for_initiatives
-        @allowed_signature_types_for_initiatives ||= InitiativesType.find(params[:type_id]).allowed_signature_types_for_initiatives
+        @allowed_signature_types_for_initiatives ||= InitiativesType.where(organization: current_organization).find(params[:type_id]).allowed_signature_types_for_initiatives
       end
     end
   end

data/app/forms/decidim/initiatives/initiative_form.rb

@@ -39,6 +39,9 @@ module Decidim
       def map_model(model)
         self.type_id = model.type.id
         self.scope_id = model.scope&.id
+        self.signature_type = model.signature_type
+        self.title = translated_attribute(model.title)
+        self.description = translated_attribute(model.description)
       end
 
       def signature_type_updatable?

data/app/helpers/decidim/initiatives/{create_initiative_helper.rb → signature_type_options_helper.rb}

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Helper methods for the create initiative wizard.
-    module CreateInitiativeHelper
+    module SignatureTypeOptionsHelper
       def signature_type_options(initiative_form)
         return all_signature_type_options unless initiative_form.signature_type_updatable?
 

data/app/permissions/decidim/initiatives/admin/permissions.rb

@@ -163,6 +163,7 @@ module Decidim
 
         def initiative_export_action?
           allow! if permission_action.subject == :initiatives && permission_action.action == :export
+          allow! if permission_action.action == :export && permission_action.subject == :component_data
         end
 
         def initiatives_settings_action?

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

@@ -9,7 +9,7 @@
     </div>
 
     <div class="row column">
-      <%= form.translated :editor, :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+      <%= form.translated :editor, :description, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
     </div>
 
     <div class="row column">

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

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

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

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

data/app/views/decidim/initiatives/admin/initiatives_settings/edit.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("decidim.initiatives.admin.initiatives_settings.form.title")) %>
+
 <%= decidim_form_for(@form, html: { class: "form edit_initiatives_settings" }, url: initiatives_setting_path, method: :put) do |f| %>
   <%= render partial: "form", object: f %>
   <div class="button--double form-general-submit">

data/app/views/decidim/initiatives/admin/initiatives_type_scopes/edit.html.erb

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

data/app/views/decidim/initiatives/admin/initiatives_type_scopes/new.html.erb

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

data/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb

@@ -9,12 +9,12 @@
     </div>
 
     <div class="row column">
-      <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
+      <%= form.translated :editor, :description %>
     </div>
 
     <div class="row">
       <div class="columns xlarge-6">
-        <%= form.upload :banner_image, optional: false %>
+        <%= form.upload :banner_image, required: true %>
       </div>
     </div>
   </div>

data/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb

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

data/app/views/decidim/initiatives/admin/initiatives_types/index.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("decidim.admin.titles.initiatives_types")) %>
+
 <div class="card" id="initiative-types">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/initiatives/admin/initiatives_types/new.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <h2 class="process-title-summary">
   <%= t ".title" %>
 </h2>

data/app/views/decidim/initiatives/create_initiative/_finish_help.html.erb

@@ -1,2 +1,2 @@
 <p><%== t ".publish_helper_text" %>
-<p><%== t ".access_reminder", link: link_to(t("myself", scope: "decidim.initiatives.initiatives.filters"), decidim_initiatives.initiatives_path(filter: { author: "myself", state: "" })) %></p>
+<p><%== t ".access_reminder", link: link_to(t("myself", scope: "decidim.initiatives.initiatives.filters"), decidim_initiatives.initiatives_path(filter: { author: "myself", with_any_state: "" })) %></p>

data/app/views/decidim/initiatives/create_initiative/fill_data.html.erb

@@ -20,12 +20,23 @@
       <div class="card__content">
         <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form new_initiative_form" }) do |f| %>
           <%= form_required_explanation %>
-          <%= f.hidden_field :type_id %>
           <div class=section>
-            <% unless single_initiative_type? %>
+            <% if single_initiative_type? %>
+              <%= f.hidden_field :type_id %>
+            <% else %>
               <div class="field">
-                <label for="type_description"><%= t ".initiative_type" %></label>
-                <%= text_field_tag :type_description, strip_tags(translated_attribute(initiative_type.title)), readonly: true %>
+                <%= f.select :type_id,
+                                initiative_type_options,
+                                {},
+                                {
+                                  disabled: !@form.signature_type_updatable?,
+                                  "data-scope-selector": "initiative_decidim_scope_id",
+                                  "data-scope-id": f.object.scope_id.to_s,
+                                  "data-scope-search-url": decidim_initiatives.initiative_type_scopes_search_url,
+                                  "data-signature-types-selector": "initiative_signature_type",
+                                  "data-signature-type": current_initiative&.signature_type,
+                                  "data-signature-types-search-url": decidim_initiatives.initiative_type_signature_types_search_url
+                                } %>
               </div>
             <% end %>
 
@@ -34,7 +45,11 @@
             </div>
 
             <div class="field">
-              <%= text_editor_for(f, :description, lines: 8, toolbar: :full) %>
+              <%= text_editor_for(f, :description, lines: 8, toolbar: :content) %>
+            </div>
+
+            <div class="field">
+              <%= f.text_field :hashtag %>
             </div>
 
             <% signature_type_options = signature_type_options(f.object) %>
@@ -46,6 +61,12 @@
               </div>
             <% end %>
 
+            <% if initiative_type.custom_signature_end_date_enabled? %>
+              <div class="field">
+                <%= f.date_field :signature_end_date %>
+              </div>
+            <% end %>
+
             <% if scopes.length == 1 %>
               <%= f.hidden_field :scope_id, value: scopes.first.scope&.id %>
             <% else %>
@@ -57,12 +78,6 @@
               </div>
             <% end %>
 
-            <% if initiative_type.custom_signature_end_date_enabled? %>
-              <div class="field">
-                <%= f.date_field :signature_end_date %>
-              </div>
-            <% end %>
-
             <% if initiative_type.area_enabled? %>
               <div class="field">
                 <%= f.areas_select :area_id, areas_for_select(current_organization), prompt: t(".select_area") %>
@@ -73,7 +88,7 @@
               <div class="field">
                 <%= f.select :decidim_user_group_id,
                              Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |g| [g.name, g.id] },
-                             include_blank: current_user.name %>
+                             include_blank: current_user.name, help_text: t(".decidim_user_group_id_help") %>
               </div>
             <% end %>
 

data/app/views/decidim/initiatives/create_initiative/finish.html.erb

@@ -28,7 +28,7 @@
                         data: { confirm: t(".confirm") } %>
           <% end %>
           <%= link_to t(".edit_my_initiative"), edit_initiative_path(current_initiative), class: "button expanded light secondary" %>
-          <%= link_to t(".go_to_my_initiatives"), decidim_initiatives.initiatives_path(filter: { author: "myself", state: "" }), class: "button expanded" %>
+          <%= link_to t(".go_to_my_initiatives"), decidim_initiatives.initiatives_path(filter: { author: "myself", with_any_state: "" }), class: "button expanded" %>
           <%= link_to t(".back_to_initiatives"), initiatives_path, class: "button white-button expanded" %>
         </div>
       </div>

data/app/views/decidim/initiatives/create_initiative/previous_form.html.erb

@@ -27,7 +27,7 @@
           </div>
 
           <div class="field">
-            <%= text_editor_for(f, :description, lines: 8, toolbar: :full) %>
+            <%= text_editor_for(f, :description, lines: 8, toolbar: :content) %>
           </div>
 
           <div class="actions">

data/app/views/decidim/initiatives/initiatives/_form.html.erb

@@ -1,24 +1,5 @@
 <%= form_required_explanation %>
 
-<div class="field">
-  <%= form.text_field :title, autofocus: true, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative), value: translated_attribute(@form.title) %>
-</div>
-
-<div class="field">
-  <%= text_editor_for(form, :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative), value: translated_attribute(@form.description)) %>
-</div>
-
-<div class="field">
-  <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
-</div>
-
-<div class="field">
-  <%= form.select :state,
-                  Decidim::Initiative.states.keys.map { |state| [I18n.t(state, scope: "decidim.initiatives.admin_states"), state] },
-                  {},
-                  { disabled: !@form.state_updatable? } %>
-</div>
-
 <% unless single_initiative_type? %>
   <div class="field">
     <%= form.select :type_id,
@@ -37,17 +18,38 @@
 <% end %>
 
 <div class="field">
-  <%= form.select :scope_id,
-                @form.available_scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id] },
-                { disabled: !@form.state_updatable? } %>
+  <%= form.text_field :title, autofocus: true, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative), value: translated_attribute(@form.title) %>
 </div>
 
+<div class="field">
+  <%= text_editor_for(form, :description, toolbar: :content, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative), value: translated_attribute(@form.description)) %>
+</div>
+
+<div class="field">
+  <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+</div>
+
+<% signature_type_options = signature_type_options(form.object) %>
+<% if signature_type_options.length == 1 %>
+  <%= form.hidden_field :signature_type %>
+<% else %>
+  <div class="field">
+    <%= form.select :signature_type, signature_type_options, {}, { disabled: !@form.signature_type_updatable? } %>
+  </div>
+<% end %>
+
 <% if can_edit_custom_signature_end_date?(current_initiative) %>
   <div class="row column">
     <%= form.date_field :signature_end_date, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
   </div>
 <% end %>
 
+<div class="field">
+  <%= form.select :scope_id,
+                @form.available_scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id] },
+                { disabled: !@form.state_updatable? } %>
+</div>
+
 <% if current_initiative.area_enabled? %>
   <div class="field">
     <%= form.areas_select :area_id,
@@ -61,8 +63,12 @@
 <% end %>
 
 <div class="field">
-  <%= form.select :signature_type, [], {}, { disabled: !@form.signature_type_updatable? } %>
+  <%= form.select :state,
+                  Decidim::Initiative.states.keys.map { |state| [I18n.t(state, scope: "decidim.initiatives.admin_states"), state] },
+                  {},
+                  { disabled: !@form.state_updatable? } %>
 </div>
+
 <% if current_initiative.type.attachments_enabled? %>
   <fieldset class="attachments_container">
     <legend><%= t("attachment_legend", scope: "decidim.initiatives.form") %></legend>

data/app/views/decidim/initiatives/initiatives/_tags.html.erb

@@ -1,7 +1,7 @@
 <ul class="tags tags--initiative">
-  <li><%= link_to translated_attribute(resource.type.title), initiatives_path(filter: { type: [resource.type.id] }) %></li>
-  <li><%= link_to translated_attribute(resource.scope_name), initiatives_path(filter: { scope_id: [resource.scope&.id] }) %></li>
+  <li><%= link_to translated_attribute(resource.type.title), initiatives_path(filter: { with_any_type: [resource.type.id] }) %></li>
+  <li><%= link_to translated_attribute(resource.scope_name), initiatives_path(filter: { with_any_scope: [resource.scope&.id] }) %></li>
   <% if resource.area %>
-    <li><%= link_to translated_attribute(resource.area_name), initiatives_path(filter: { area_id: [resource.area.id] }) %></li>
+    <li><%= link_to translated_attribute(resource.area_name), initiatives_path(filter: { with_any_area: [resource.area.id] }) %></li>
   <% end %>
 </ul>

data/app/views/decidim/initiatives/initiatives/print.html.erb

@@ -60,7 +60,7 @@
 
       <div class="print-table-cell">
         <div class="cell-header"><%= t ".email" %></div>
-        <div class="cell-content"><%= current_initiative.author.email %></div>
+        <div class="cell-content"></div>
       </div>
     </div>
   </div>

data/config/locales/ar.yml

@@ -232,6 +232,8 @@ ar:
         published: نشرت
         validating: المصادقة الفنية
       application_helper:
+        filter_area_values:
+          all: الكل
         filter_scope_values:
           all: الكل
         filter_state_values:
@@ -253,7 +255,6 @@ ar:
         fill_data:
           back: الى الخلف
           continue: استمر
-          initiative_type: نوع المبادرة
           more_information: "(معلومات اكثر)"
           select_scope: حدد النطاق
         finish:
@@ -293,6 +294,8 @@ ar:
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_nickname}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
           email_subject: المبادرة التي أقرتها %{author_nickname}
           notification_title: تمت الموافقة على مبادرة <a href="%{resource_path}">%{resource_title}</a> من قبل <a href="%{author_path}">%{author_name} %{author_nickname}</a>.
+      form:
+        delete_attachment: حذف
       index:
         title: المبادرات
       initiative_signatures:
@@ -333,6 +336,8 @@ ar:
             few: و %{count} المزيد من الناس
             many: و %{count} المزيد من الناس
             other: و %{count} المزيد من الناس
+        committee_members:
+          revoke: سحب
         count:
           title:
             zero: "%{count} مبادرات"
@@ -372,6 +377,7 @@ ar:
           recent: الأحدث
         print:
           city: مدينة
+          full_name: الاسم الكامل
           initiative:
             description: 'الوصف:'
         result:
@@ -414,13 +420,9 @@ ar:
         status_change_for: لقد غيرت المبادرة %{title} حالتها
       last_activity:
         new_initiative: مبادرة جديدة
-      pages:
-        home:
-          highlighted_initiatives:
-            active_initiatives: المبادرات النشطة
-            see_all_initiatives: رؤية جميع المبادرات
       show:
         badge_name:
+          accepted: ما يكفي من التوقيعات
           validating: تحقق تقني
       states:
         accepted: وافقت

data/config/locales/ca.yml

@@ -334,7 +334,7 @@ ca:
         validating: Validació tècnica
       application_helper:
         filter_area_values:
-          all: Totes
+          all: Tots
         filter_scope_values:
           all: Tots
         filter_state_values:
@@ -363,8 +363,8 @@ ca:
         fill_data:
           back: Torna
           continue: Continua
+          decidim_user_group_id_help: No és possible canviar l'autoria de la iniciativa després de crear-la
           fill_data_help: "<ul> <li>Revisa el contingut de la teva iniciativa. El títol és fàcil d'entendre? L'objectiu de la teva iniciativa és clar?</li> <li>Has d'escollir el tipus de signatura. Presencial, digital o una combinació de totes dues.</li> <li>Quin és l'àmbit geogràfic de la iniciativa?</li> </ul>"
-          initiative_type: Tipus d'iniciativa
           more_information: "(Més informació)"
           select_area: Selecciona una àrea
           select_scope: Selecciona un àmbit d'aplicació
@@ -442,9 +442,10 @@ ca:
       form:
         add_attachments: Documents
         attachment_legend: "(Opcional) Afegir un fitxer adjunt"
-        delete_attachment: Esborrar
+        delete_attachment: Suprimeix
       index:
         title: Iniciatives
+        uninitialized: Les iniciatives no han estat configurades encara des de l'administració.
       initiative_signatures:
         fill_personal_data:
           continue: Continua
@@ -603,8 +604,8 @@ ca:
       signature_interval:
         title: Període de recollida de signatures
       states:
-        accepted: Acceptat
-        expired: Vençut
+        accepted: Acceptada
+        expired: Vençuda
       unavailable_scope: Àmbit no disponible
       update:
         error: S'ha produït un error
@@ -625,7 +626,7 @@ ca:
   layouts:
     decidim:
       initiative_creation_header:
-        back: Tornar
+        back: Torna
         fill_data: Crear
         finish: Acabar
         previous_form: Començar