decidim-initiatives 0.28.6 → 0.29.0.rc1

data/app/packs/src/decidim/initiatives/admin/invite_users.js

@@ -5,7 +5,7 @@ $(() => {
 
   if (inviteUsersButton !== null) {
     inviteUsersButton.addEventListener("click", function (event) {
-      let link = document.querySelector("#committee_link"),
+      let link = document.querySelector("div[data-committee_link]"),
           range = document.createRange();
 
       event.preventDefault();

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

@@ -134,8 +134,8 @@ module Decidim
           return unless permission_action.subject == :initiative
 
           case permission_action.action
-          when :print
-            toggle_allow(Decidim::Initiatives.print_enabled && user.admin?)
+          when :read
+            toggle_allow(Decidim::Initiatives.print_enabled)
           when :publish, :discard
             toggle_allow(initiative.validating?)
           when :unpublish

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

@@ -4,8 +4,6 @@ module Decidim
   module Initiatives
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        return permission_action if initiative && !initiative.is_a?(Decidim::Initiative)
-
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Initiatives::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
@@ -21,7 +19,6 @@ module Decidim
         create_initiative?
         edit_public_initiative?
         update_public_initiative?
-        print_initiative?
 
         vote_initiative?
         sign_initiative?
@@ -124,17 +121,6 @@ module Decidim
         )
       end
 
-      def print_initiative?
-        return unless permission_action.action == :print &&
-                      permission_action.subject == :initiative
-
-        toggle_allow(Decidim::Initiatives.print_enabled && (authorship_or_admin? || committee_member?))
-      end
-
-      def committee_member?
-        InitiativesPromoted.by(user).exists?(id: initiative.id)
-      end
-
       def vote_initiative?
         return unless permission_action.action == :vote &&
                       permission_action.subject == :initiative

data/app/serializers/decidim/initiatives/initiative_serializer.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     class InitiativeSerializer < Decidim::Exporters::Serializer
-      # Serializes an inititative
+      # Serializes an initiative
       def serialize
         {
           id: resource.id,

data/app/views/decidim/initiatives/admin/answers/_info_initiative.html.erb

@@ -3,7 +3,7 @@
     <div class="card-divider">
       <h2 class="card-title">
         <%= link_to "#{t ".initiatives"} > ", initiatives_path %>
-        <%= decidim_sanitize translated_attribute(initiative.title) %>
+        <%= decidim_sanitize_translated(initiative.title) %>
       </h2>
     </div>
 

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

@@ -12,7 +12,7 @@
     </div>
 
     <div class="row column">
-      <div class="committee_link" id="committee_link">
+      <div data-committee_link>
         <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>
         <%= icon_link_to "clipboard-line", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %>
       </div>
@@ -56,5 +56,4 @@
   </table>
 </div>
 
-<%= append_stylesheet_pack_tag "decidim_initiatives_admin" %>
 <%= append_javascript_pack_tag "decidim_initiatives_admin" %>

data/app/views/decidim/initiatives/admin/exports/_dropdown.html.erb

@@ -1,4 +1,4 @@
-<span class="exports button button__sm button__secondary button--simple" data-toggle="<%= dropdown_id(collection_ids) %>">
+<span class="exports button button__sm button__secondary" data-toggle="<%= dropdown_id(collection_ids) %>">
   <% if collection_ids.present? %>
     <%= t("actions.export-selection", scope: "decidim.admin") %>
   <% else %>
@@ -15,11 +15,11 @@
      data-close-on-click="true">
   <ul class="vertical menu add-components">
     <% %w(CSV JSON).each do |format| %>
-      <%= link_to export_initiatives_path(format:, collection_ids:) do %>
-        <li class="exports--format--<%= format.downcase %> exports--initiatives">
-          <%= t("decidim.admin.exports.export_as", name: t("decidim.initiatives.admin.exports.initiatives"), export_format: format.upcase) %>
-        </li>
-      <% end %>
+      <li class="exports--format--<%= format.downcase %> exports--initiatives">
+        <%= link_to t("decidim.admin.exports.export_as", name: t("decidim.initiatives.admin.exports.initiatives"),
+                                                         export_format: format.upcase),
+                    export_initiatives_path(format:, collection_ids:) %>
+      </li>
     <% end %>
   </ul>
 </div>

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

@@ -10,52 +10,57 @@
     </h1>
   </div>
   <%= admin_filter_selector(:initiatives) %>
-  <div class="table-scroll">
-    <table class="table-list">
-      <thead>
-      <tr>
-        <th><%= t("models.initiatives.fields.id", scope: "decidim.admin") %></th>
-        <th class="!text-left"><%= t("models.initiatives.fields.title", scope: "decidim.admin") %></th>
-        <th><%= t("models.initiatives.fields.state", scope: "decidim.admin") %></th>
-        <th><%= sort_link(query, :supports_count, t("models.initiatives.fields.supports_count", scope: "decidim.admin"), default_order: :desc) %></th>
-        <th><%= sort_link(query, :created_at, t("models.initiatives.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
-        <th><%= sort_link(query, :published_at, t("models.initiatives.fields.published_at", scope: "decidim.admin"), default_order: :desc) %></th>
-        <th class="actions"><%= t ".actions_title" %></th>
-      </tr>
-      </thead>
-      <tbody>
-      <% @initiatives.each do |initiative| %>
+
+  <% if show_initiative_type_callout? %>
+    <% link = link_to(t("button", scope:"decidim.initiatives.admin.index.initiatives_types"), new_initiatives_type_path, class: "button button__sm button__secondary mt-4") %>
+    <%= cell("decidim/announcement", t("alert_html", scope:"decidim.initiatives.admin.index.initiatives_types", link:), callout_class: "alert") %>
+  <% else %>
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
         <tr>
-          <td><%= initiative.id %></td>
-          <td class="!text-left">
-            <% if allowed_to? :edit, :initiative, initiative: initiative %>
-              <%= link_to translated_attribute(initiative.title),
-                          decidim_admin_initiatives.edit_initiative_path(initiative.to_param) %>
-            <% else %>
-              <%= translated_attribute(initiative.title) %>
-            <% end %>
-          </td>
-          <td><%= humanize_admin_state initiative.state %></td>
-          <td><%= initiative.supports_count %>/<%= initiative.scoped_type.supports_required %></td>
-          <td class="table-list__date"><%= l initiative.created_at, format: :short %></td>
-          <td class="table-list__date"><%= initiative.published_at? ? l(initiative.published_at, format: :short) : "" %></td>
-          <td class="table-list__actions">
-            <% if allowed_to? :edit, :initiative, initiative: initiative %>
-              <%= icon_link_to "pencil-line",
-                               decidim_admin_initiatives.edit_initiative_path(initiative.to_param),
-                               t("actions.configure", scope: "decidim.admin"),
-                               class: "action-icon--edit" %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
+          <th><%= t("models.initiatives.fields.id", scope: "decidim.admin") %></th>
+          <th class="!text-left"><%= t("models.initiatives.fields.title", scope: "decidim.admin") %></th>
+          <th><%= t("models.initiatives.fields.state", scope: "decidim.admin") %></th>
+          <th><%= sort_link(query, :supports_count, t("models.initiatives.fields.supports_count", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :created_at, t("models.initiatives.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :published_at, t("models.initiatives.fields.published_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= t ".actions_title" %></th>
+        </tr>
+        </thead>
+        <tbody>
+        <% @initiatives.each do |initiative| %>
+          <tr>
+            <td><%= initiative.id %></td>
+            <td class="!text-left">
+              <% if allowed_to? :edit, :initiative, initiative: initiative %>
+                <%= link_to translated_attribute(initiative.title),
+                            decidim_admin_initiatives.edit_initiative_path(initiative.to_param) %>
+              <% else %>
+                <%= translated_attribute(initiative.title) %>
+              <% end %>
+            </td>
+            <td><%= humanize_admin_state initiative.state %></td>
+            <td><%= initiative.supports_count %>/<%= initiative.scoped_type.supports_required %></td>
+            <td class="table-list__date"><%= l initiative.created_at, format: :short %></td>
+            <td class="table-list__date"><%= initiative.published_at? ? l(initiative.published_at, format: :short) : "" %></td>
+            <td class="table-list__actions">
+              <% if allowed_to? :edit, :initiative, initiative: initiative %>
+                <%= icon_link_to "pencil-line",
+                                 decidim_admin_initiatives.edit_initiative_path(initiative.to_param),
+                                 t("actions.configure", scope: "decidim.admin"),
+                                 class: "action-icon--edit" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-            <% if allowed_to?(:answer, :initiative, initiative: initiative) %>
-              <%= icon_link_to "chat-1-line", edit_initiative_answer_path(initiative.slug), t("actions.answer", scope: "decidim.initiatives"), class: "action-icon action-icon--answer" %>
-            <% else %>
-              <%= icon "chat-1-line", scope: "decidim.admin", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
-            <% end %>
+              <% if allowed_to?(:answer, :initiative, initiative: initiative) %>
+                <%= icon_link_to "chat-1-line", edit_initiative_answer_path(initiative.slug), t("actions.answer", scope: "decidim.initiatives"), class: "action-icon action-icon--answer" %>
+              <% else %>
+                <%= icon "chat-1-line", scope: "decidim.admin", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
+              <% end %>
 
-              <% if allowed_to? :print, :initiative, initiative: initiative %>
+              <% if allowed_to? :read, :initiative, initiative: initiative %>
                 <%= icon_link_to "printer-line",
                                  decidim_initiatives.print_initiative_path(initiative),
                                  t(".print"),
@@ -66,23 +71,24 @@
                 <span class="action-space icon"></span>
               <% end %>
 
-            <% if allowed_to? :preview, :initiative, initiative: initiative %>
-              <%= icon_link_to "eye-line",
-                               decidim_initiatives.initiative_path(initiative.to_param),
-                               t(".preview"),
-                               class: "action-icon--preview",
-                               target: "_blank",
-                               data: { "external-link": false } %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
+              <% if allowed_to? :preview, :initiative, initiative: initiative %>
+                <%= icon_link_to "eye-line",
+                                 decidim_initiatives.initiative_path(initiative.to_param),
+                                 t(".preview"),
+                                 class: "action-icon--preview",
+                                 target: "_blank",
+                                 data: { "external-link": false } %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-            <%= free_resource_permissions_link(initiative) || content_tag(:span, nil, class: "action-space icon") %>
-          </td>
-        </tr>
-      <% end %>
-      </tbody>
-    </table>
+              <%= free_resource_permissions_link(initiative) || content_tag(:span, nil, class: "action-space icon") %>
+            </td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    <% end %>
   </div>
 </div>
 <%= decidim_paginate @initiatives %>

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

@@ -2,7 +2,7 @@
   <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
-        <%= scopes_select_field form, :decidim_scopes_id, root: nil %>
+        <%= scopes_select_field form, :decidim_scopes_id, root: nil, options: { include_blank: t("decidim.scopes.global") } %>
       </div>
       <div class="row column">
         <%= form.number_field :supports_required, min: 1, step: 1 %>

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

@@ -21,7 +21,7 @@
           <th class="text-right">
             <%= t("models.initiatives_type_scope.fields.supports_required", scope: "decidim.admin") %>
           </th>
-          <th class="actions"></th>
+          <th></th>
         </tr>
         </thead>
         <tbody>

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

@@ -15,7 +15,7 @@
         <tr>
           <th><%= t("models.initiatives_types.fields.title", scope: "decidim.admin") %></th>
           <th><%= t("models.initiatives_types.fields.created_at", scope: "decidim.admin") %></th>
-          <th class="actions"><%= t("initiatives_type.actions.title", scope: "decidim.resources") %></th>
+          <th><%= t("initiatives_type.actions.title", scope: "decidim.resources") %></th>
         </tr>
       </thead>
       <tbody>

data/app/views/decidim/initiatives/committee_requests/new.html.erb

@@ -1,13 +1,12 @@
 <% add_decidim_meta_tags({
-                           image_url: current_initiative.type.attached_uploader(:banner_image).url,
+                           image_url: current_initiative.type.attached_uploader(:banner_image).path,
                            description: translated_attribute(current_initiative.description),
                            title: translated_attribute(current_initiative.title),
-                           url: initiative_url(current_initiative.id),
-                           twitter_handler: current_organization.twitter_handler
+                           url: initiative_url(current_initiative.id)
                          }) %>
 
 <% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
-<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).url %>
+<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).path %>
 
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
   <div class="text-center py-10">

data/app/views/decidim/initiatives/initiative_signatures/fill_personal_data.html.erb

@@ -19,7 +19,7 @@
       <%= f.text_field :postal_code, required: true %>
     </div>
 
-    <div class="pb-s">
+    <div>
       <small>
         <%= strip_tags(translated_attribute(extra_data_legal_information)) %>
       </small>

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

@@ -1,4 +1,4 @@
-<div class="row collapse buttons__row">
+<div class="row collapse">
   <div class="column collapse">
       <%= link_to "#comments", class: "button small compact hollow button--nomargin expanded" do %>
         <%= icon "chat-1-line", class: "icon--small", role: "img", "aria-hidden": true %>

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

@@ -18,7 +18,7 @@
     <% end %>
   <% else %>
     <% content_for(:redirect_after_login) { create_initiative_url(:select_initiative_type) } %>
-    <button type="button" class="title-action__action button button__xl button__secondary w-full" data-dialog-open="loginModal" aria-controls="loginModal" aria-haspopup="dialog" tabindex="0">
+    <button type="button" class="button button__xl button__secondary w-full" data-dialog-open="loginModal" aria-controls="loginModal" aria-haspopup="dialog" tabindex="0">
       <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
       <%= icon "add-fill" %>
     </button>

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

@@ -28,7 +28,7 @@
         <%= unvote_label %>
       <% end %>
     <% else %>
-      <button class='button button__xl w-full button__secondary success light' disabled>
+      <button class='button button__xl w-full button__secondary success' disabled>
         <%= icon "check-line" %>
         <%= unvote_label %>
       </button>

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

@@ -2,10 +2,10 @@
   <div class="pt-10">
     <div class="initiative-letterhead">
       <% if current_organization.logo.present? %>
-        <%= image_tag current_organization.attached_uploader(:logo).variant_url(variant: :medium), title: current_organization.name %>
+        <%= image_tag current_organization.attached_uploader(:logo).path(variant: :medium), title: current_organization_name %>
       <% end %>
 
-      <%= current_organization.name %>
+      <%= current_organization_name %>
     </div>
     <h3 class="print-section-title"><%= t "section", scope: "decidim.initiatives.initiatives.print" %></h3>
     <div class="initiative-print-title">

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

@@ -1,9 +1,8 @@
 <% add_decidim_meta_tags({
-                           image_url: current_initiative.type.attached_uploader(:banner_image).url,
+                           image_url: current_initiative.type.attached_uploader(:banner_image).path,
                            description: translated_attribute(current_initiative.description),
                            title: translated_attribute(current_initiative.title),
-                           url: initiative_url(current_initiative.id),
-                           twitter_handler: current_organization.twitter_handler
+                           url: initiative_url(current_initiative.id)
                          }) %>
 
 <%

data/app/views/layouts/decidim/_initiative_header.html.erb

@@ -1,10 +1,10 @@
 <div class="process-header">
-  <div class="process-header__inner">
-    <div class="row column process-header__main"
-        style="background-image:url('<%= current_participatory_space.type.attached_uploader(:banner_image).url %>');">
+  <div>
+    <div class="row column"
+        style="background-image:url('<%= current_participatory_space.type.attached_uploader(:banner_image).path %>');">
     </div>
-    <div class="process-header__container row collapse column">
-      <div class="columns mediumlarge-8 process-header__info">
+    <div class="row collapse column">
+      <div class="columns">
         <div>
           <h1>
             <%= participatory_space_helpers.translated_attribute(current_participatory_space.title) %>
@@ -13,7 +13,7 @@
         <div>
           <p>
             <% if current_participatory_space.hashtag.present? %>
-              <span class="process-header__hashtag">
+              <span>
                 <%= link_to "##{current_participatory_space.hashtag}", twitter_hashtag_url(current_participatory_space.hashtag), target: "_blank" %>
               </span>
             <% end %>

data/app/views/layouts/decidim/initiative.html.erb

@@ -1,7 +1,7 @@
 <%= append_javascript_pack_tag "decidim_initiatives" %>
 <%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>
 
-<% provide :meta_image_url, current_participatory_space.type.attached_uploader(:banner_image).url %>
+<% provide :meta_image_url, current_participatory_space.type.attached_uploader(:banner_image).path %>
 
 <%= render "layouts/decidim/application" do %>
   <%= render layout: "layouts/decidim/shared/layout_center" do %>
@@ -10,7 +10,7 @@
     </main>
     <% if content_for? :expanded %>
       <div class="expanded">
-        <div class="wrapper wrapper--inner">
+        <div class="wrapper">
           <div class="row">
             <%= yield :expanded %>
           </div>

data/app/views/layouts/decidim/initiative_head.html.erb

@@ -1,7 +1,7 @@
 <%= append_javascript_pack_tag "decidim_initiatives" %>
 <%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>
 
-<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).url %>
+<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).path %>
 
 <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
 

data/config/initializers/wicked_pdf.rb

@@ -10,12 +10,14 @@
 #
 # https://github.com/mileszs/wicked_pdf/blob/master/README.md
 
-WickedPdf.config = {
+WickedPdf.configure do |config|
   # Path to the wkhtmltopdf executable: This usually is not needed if using
   # one of the wkhtmltopdf-binary family of gems.
-  # exe_path: '/usr/local/bin/wkhtmltopdf',
+  #   or
+  # config.exe_path = '/usr/local/bin/wkhtmltopdf',
+  config.exe_path = Gem.bin_path("wkhtmltopdf-binary", "wkhtmltopdf")
 
   # Layout file to be used for all PDFs
   # (but can be overridden in `render :pdf` calls)
-  # layout: 'pdf.html',
-}
+  # config.layout = 'pdf.html'
+end

data/config/locales/ar.yml

@@ -97,7 +97,6 @@ ar:
             initiative_title: عنوان المبادرة
             name_and_surname: اسم ولقب
             postal_code: الكود البريدى
-            scope: نطاق
             time_and_date: الوقت و التاريخ
             timestamp: الطابع الزمني
       titles:
@@ -315,7 +314,6 @@ ar:
           full_name: الاسم الكامل
           initiative:
             description: 'الوصف:'
-          print: طباعة
         result:
           initiative_rejected_reason: تم رفض هذه المبادرة بسبب افتقارها للتوقيعات.
         signatures_count:
@@ -327,7 +325,6 @@ ar:
           other: " التوقيعات"
         vote_cabin:
           already_voted: وقعت بالفعل
-          supports_required: "%{total_supports} التوقيعات المطلوبة"
           verification_required: تحقق من حسابك لتوقيع المبادرة
           vote: إشارة
           votes_blocked: توقيع المعوقين
@@ -361,12 +358,8 @@ ar:
     menu:
       initiatives: المبادرات
     resources:
-      initiative:
-        actions:
-          comment: تعليق
       initiatives_type:
         actions:
-          create: إنشاء
           title: أفعال
           vote: إشارة
   layouts:

data/config/locales/bg.yml

@@ -101,7 +101,7 @@ bg:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Търсете в %{collection} по заглавие, описание, идент. № или име на автора.
       initiatives_settings:
         update:
-          error: Възникна грешка!
+          error: Възникна грешка.
           success: Настройките на инициативите са актуализирани успешно.
       menu:
         attachments: Прикачени файлове
@@ -292,7 +292,6 @@ bg:
         initiatives_types:
           create:
             error: Възникна грешка.
-            success: Успешно е създаден нов тип инициатива.
           destroy:
             success: Типът инициатива беше премахнат успешно.
           edit:
@@ -363,6 +362,7 @@ bg:
         finish:
           back: Назад
           back_to_initiatives: Назад към инициативите
+          callout_text: Поздравления! Гражданската Ви инициатива беше създадена успешно.
           confirm: Ще изпратите инициативата на администратор да я прегледа и публикува. След публикуване няма да можете да го редактирате. Сигурен ли си?
           edit_my_initiative: Редактиране на моята инициатива
           go_to_my_initiatives: Към моите инициативи
@@ -539,7 +539,6 @@ bg:
           other: " подписи"
         vote_cabin:
           already_voted: Вече подписани
-          supports_required: "Необходими са %{total_supports} подписа"
           verification_required: Потвърдете профила си, за да подпишете инициативата
           vote: Подписване
           votes_blocked: Подписването е деактивирано

data/config/locales/ca.yml

@@ -7,7 +7,7 @@ ca:
         answer_url: URL de la resposta
         area_id: Àrea
         decidim_scope_id: Àmbit
-        decidim_user_group_id: Autora
+        decidim_user_group_id: Autoria
         description: Descripció
         hashtag: Etiqueta (hashtag)
         offline_votes: Signatures presencials
@@ -113,7 +113,7 @@ ca:
           see_initiative: Veure la iniciativa
         initiatives_settings: Configuració
         initiatives_submenu:
-          info: Quant a aquesta iniciativa
+          info: Sobre aquesta iniciativa
         initiatives_types: Tipus d'iniciatives
         moderations: Moderacions
       models:
@@ -237,11 +237,11 @@ ca:
               most_recent: Més recents
         exports:
           initiatives: Iniciatives
+        index:
+          initiatives_types:
+            alert_html: "<p>Has de crear com a mínim un tipus d'iniciativa per tal que les participants puguin començar a crear les seves iniciatives.</p><p>%{link}</p>"
+            button: Nou tipus d'iniciativa
         initiatives:
-          accept:
-            success: La iniciativa s'ha acceptat correctament.
-          discard:
-            success: La iniciativa s'ha descartat correctament.
           edit:
             accept: Accepta la iniciativa
             confirm: Segur?
@@ -265,12 +265,6 @@ ca:
             edit: Edita
             new: Nou
             photos: Fotografies
-          publish:
-            success: La iniciativa s'ha publicat correctament.
-          reject:
-            success: La iniciativa s'ha rebutjat correctament.
-          unpublish:
-            success: La iniciativa s'ha despublicat correctament.
           update:
             error: S'ha produït un error.
             success: La iniciativa s'ha actualitzat correctament.
@@ -302,7 +296,7 @@ ca:
         initiatives_types:
           create:
             error: S'ha produït un error.
-            success: S'ha creat correctament un nou tipus d'iniciativa.
+            success: S'ha creat amb èxit un nou tipus d'iniciativa. Has de definir com a mínim un àmbit per aquest tipus d'iniciativa perquè es pugui fer servir.
           destroy:
             success: S'ha eliminat correctament el tipus d'iniciativa.
           edit:
@@ -374,7 +368,7 @@ ca:
           back: Torna
           back_to_initiatives: Torna a iniciatives
           callout_text: Enhorabona! La teva iniciativa s'ha creat correctament.
-          confirm: Estàs a punt d'enviar la iniciativa perquè una administradora la revisi i la publiqui. Un cop publicada no la podràs editar. Segur?
+          confirm: Estàs a punt d'enviar la iniciativa perquè una administradora la revisi i la publiqui. Un cop publicada no la podràs editar. N'estàs segura?
           edit_my_initiative: Editar la meva iniciativa
           go_to_my_initiatives: Ves a les meves iniciatives
           more_information: "(Més informació)"
@@ -531,7 +525,7 @@ ca:
           section: 'Si l''organització ho demana, imprimeix i omple aquest formulari per presentar-lo quan s''indiqui:'
           signature: Signatura
         result:
-          answer_title: S'ha respost aquesta iniciativa
+          answer_title: S'ha respost aquesta iniciativa.
           initiative_rejected_reason: Aquesta iniciativa ha estat rebutjada per falta de signatures.
         show:
           area: Àrea
@@ -550,7 +544,6 @@ ca:
           other: " signatures"
         vote_cabin:
           already_voted: Ja has signat
-          supports_required: "Es requereixen %{total_supports} signatures"
           verification_required: Verifica el teu compte per a signar la iniciativa
           vote: Signar
           votes_blocked: S'ha desactivat la signatura
@@ -611,7 +604,7 @@ ca:
     decidim:
       initiative_creation_header:
         fill_data: Crear
-        finish: Finalitzar
+        finish: Acabar
         promotal_committee: Comissió Promotora
         select_initiative_type: Tria
       initiative_signature_creation_header: