decidim-initiatives 0.28.2 → 0.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9402e2ccd3d11cecca9129ce2f63a68547640abb7699b2e98f23bc47a7b44b
-  data.tar.gz: 841ab41667a8e6391c9dc779028408d38a3bf0dcace1bf31b5bb1999d1b04c00
+  metadata.gz: a8e91ce08c6263f378e54f907db2e4279f1f9038a3891be8275c802601ca9972
+  data.tar.gz: 667cef8493963f2eb7e6ea90e0f2615949356ef95b4cb70b67578ac9ad5d9785
 SHA512:
-  metadata.gz: fb1bc518c0f6be5a2a1f2a1063c726a4f46d5f502ad6a1f6a420140de228db5b367bd1d0e9c61585c90c8acef7594e6d98ae54a4ea634e7af54d2a839e5b455a
-  data.tar.gz: 682efa73c8d37f54e0b2959a4cfff03b542e984cd8cfb2a57c53938e7b524bd302d81982a21e8272f9d9c754824a66fb93bc9c4f6fca9ec9c50d538b4ab6585c
+  metadata.gz: 1d40c358dbb5980cc77be9c27fab453c4408c1f57b325c9549cfd0674394ccf66029a919170e9e6d182eb0e93d1b8e33fe7149d483dcc13ea3ccd3b9dd94c344
+  data.tar.gz: f563e478dab6fcd7610254935ee08304d547cfadf00475ec5e2813296b518d97b43557036f2941d0d7ab51fce72e9a4b0e180352cd3b4237caef61d0df1bc5c4

data/app/cells/decidim/initiatives/initiative_g_cell.rb

@@ -11,16 +11,14 @@ module Decidim
         Decidim::Initiatives::Engine.routes.url_helpers.initiative_path(model)
       end
 
-      def has_image?
-        image.present?
-      end
-
       def image
         @image ||= model.attachments.find(&:image?)
       end
 
-      def resource_image_path
-        image.url if has_image?
+      def resource_image_url
+        return if image.blank?
+
+        image.url
       end
 
       def metadata_cell

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

@@ -32,7 +32,7 @@ module Decidim
           resource: @membership_request.initiative,
           affected_users: [@membership_request.user],
           force_send: true,
-          extra: { author: @membership_request.initiative.author }
+          extra: { author: { id: @membership_request.initiative.author&.id } }
         )
       end
     end

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

@@ -32,7 +32,7 @@ module Decidim
           resource: @membership_request.initiative,
           affected_users: [@membership_request.user],
           force_send: true,
-          extra: { author: @membership_request.initiative.author }
+          extra: { author: { id: @membership_request.initiative.author&.id } }
         )
       end
     end

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

@@ -58,7 +58,7 @@ module Decidim
           resource: initiative,
           affected_users: [initiative.author],
           force_send: true,
-          extra: { applicant: current_user }
+          extra: { applicant: { id: current_user&.id } }
         )
       end
 

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

@@ -65,6 +65,7 @@ module Decidim
 
           PublishInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.publish.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end
@@ -76,6 +77,7 @@ module Decidim
 
           UnpublishInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.unpublish.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end
@@ -86,6 +88,7 @@ module Decidim
           enforce_permission_to :discard, :initiative, initiative: current_initiative
           DiscardInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.discard.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end
@@ -96,6 +99,7 @@ module Decidim
           enforce_permission_to :accept, :initiative, initiative: current_initiative
           AcceptInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.accept.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end
@@ -106,6 +110,7 @@ module Decidim
           enforce_permission_to :reject, :initiative, initiative: current_initiative
           RejectInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.reject.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end

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

@@ -20,6 +20,7 @@ module Decidim
 
         form = Decidim::Initiatives::CommitteeMemberForm
                .from_params(initiative_id: current_initiative.id, user_id: current_user.id, state: "requested")
+               .with_context(current_organization: current_initiative.organization, current_user:)
 
         SpawnCommitteeRequest.call(form, current_user) do
           on(:ok) do

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

@@ -15,11 +15,11 @@
      data-close-on-click="true">
   <ul class="vertical menu add-components">
     <% %w(CSV JSON).each do |format| %>
-      <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>
+      <%= 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 %>
     <% end %>
   </ul>
 </div>

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

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

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

@@ -2,7 +2,7 @@
   <div class="pt-10">
     <div class="initiative-letterhead">
       <% if current_organization.logo.present? %>
-        <%= image_tag current_organization.attached_uploader(:logo).path(variant: :medium), title: current_organization.name %>
+        <%= image_tag current_organization.attached_uploader(:logo).variant_url(variant: :medium), title: current_organization.name %>
       <% end %>
 
       <%= current_organization.name %>

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

@@ -1,5 +1,5 @@
 <% add_decidim_meta_tags({
-                           image_url: current_initiative.type.attached_uploader(:banner_image).path,
+                           image_url: current_initiative.type.attached_uploader(:banner_image).url,
                            description: translated_attribute(current_initiative.description),
                            title: translated_attribute(current_initiative.title),
                            url: initiative_url(current_initiative.id),

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

@@ -1,7 +1,7 @@
 <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).path %>');">
+        style="background-image:url('<%= current_participatory_space.type.attached_uploader(:banner_image).url %>');">
     </div>
     <div class="process-header__container row collapse column">
       <div class="columns mediumlarge-8 process-header__info">

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).path %>
+<% provide :meta_image_url, current_participatory_space.type.attached_uploader(:banner_image).url %>
 
 <%= render "layouts/decidim/application" do %>
   <%= render layout: "layouts/decidim/shared/layout_center" do %>

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).path %>
+<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).url %>
 
 <%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
 

data/config/locales/ca.yml

@@ -113,7 +113,7 @@ ca:
           see_initiative: Veure la iniciativa
         initiatives_settings: Configuració
         initiatives_submenu:
-          info: Sobre aquesta iniciativa
+          info: Quant a aquesta iniciativa
         initiatives_types: Tipus d'iniciatives
         moderations: Moderacions
       models:
@@ -238,6 +238,10 @@ ca:
         exports:
           initiatives: Iniciatives
         initiatives:
+          accept:
+            success: La iniciativa s'ha acceptat correctament.
+          discard:
+            success: La iniciativa s'ha descartat correctament.
           edit:
             accept: Accepta la iniciativa
             confirm: Segur?
@@ -261,6 +265,12 @@ 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.

data/config/locales/cs.yml

@@ -244,6 +244,10 @@ cs:
         exports:
           initiatives: Iniciativy
         initiatives:
+          accept:
+            success: Iniciativa byla úspěšně přijata.
+          discard:
+            success: Iniciativa byla úspěšně zrušena.
           edit:
             accept: Přijmout iniciativu
             confirm: Jste si jisti?
@@ -267,6 +271,12 @@ cs:
             edit: Upravit
             new: Nový
             photos: Fotky
+          publish:
+            success: Iniciativa byla úspěšně publikována.
+          reject:
+            success: Iniciativa byla úspěšně zamítnuta.
+          unpublish:
+            success: Iniciativa byla úspěšně zneveřejněna.
           update:
             error: Došlo k chybě.
             success: Tato iniciativa byla úspěšně aktualizována.

data/config/locales/de.yml

@@ -238,6 +238,10 @@ de:
         exports:
           initiatives: Initiativen
         initiatives:
+          accept:
+            success: Die Initiative wurde erfolgreich akzeptiert.
+          discard:
+            success: Die Initiative wurde erfolgreich gelöscht.
           edit:
             accept: Initiative akzeptieren
             confirm: Sind Sie sich sicher?
@@ -261,6 +265,12 @@ de:
             edit: Bearbeiten
             new: Neu
             photos: Fotos
+          publish:
+            success: Die Initiative wurde erfolgreich veröffentlicht.
+          reject:
+            success: Die Initiative wurde erfolgreich zurückgewiesen.
+          unpublish:
+            success: Die Veröffentlichung der Initiative wurde erfolgreich zurückgezogen.
           update:
             error: Ein Fehler ist aufgetreten.
             success: Die Initiative wurde erfolgreich aktualisiert.

data/config/locales/en.yml

@@ -238,6 +238,10 @@ en:
         exports:
           initiatives: Initiatives
         initiatives:
+          accept:
+            success: The initiative has been successfully accepted.
+          discard:
+            success: The initiative has been successfully discarded.
           edit:
             accept: Accept initiative
             confirm: Are you sure?
@@ -261,6 +265,12 @@ en:
             edit: Edit
             new: New
             photos: Photos
+          publish:
+            success: The initiative has been successfully published.
+          reject:
+            success: The initiative has been successfully rejected.
+          unpublish:
+            success: The initiative has been successfully unpublished.
           update:
             error: An error has occurred.
             success: The initiative has been successfully updated.

data/config/locales/es-MX.yml

@@ -238,6 +238,10 @@ es-MX:
         exports:
           initiatives: Iniciativas
         initiatives:
+          accept:
+            success: La iniciativa se ha aceptado correctamente.
+          discard:
+            success: La iniciativa se ha descartado correctamente.
           edit:
             accept: Aceptar iniciativa
             confirm: '¿Estás seguro?'
@@ -261,6 +265,12 @@ es-MX:
             edit: Editar
             new: Nueva
             photos: Fotos
+          publish:
+            success: La iniciativa se ha publicado correctamente.
+          reject:
+            success: La iniciativa se ha rechazado correctamente.
+          unpublish:
+            success: La iniciativa se ha despublicado correctamente.
           update:
             error: Se ha producido un error.
             success: La iniciativa se ha actualizado correctamente.

data/config/locales/es-PY.yml

@@ -238,6 +238,10 @@ es-PY:
         exports:
           initiatives: Iniciativas
         initiatives:
+          accept:
+            success: La iniciativa se ha aceptado correctamente.
+          discard:
+            success: La iniciativa se ha descartado correctamente.
           edit:
             accept: Aceptar iniciativa
             confirm: '¿Estás seguro?'
@@ -261,6 +265,12 @@ es-PY:
             edit: Editar
             new: Nueva
             photos: Fotos
+          publish:
+            success: La iniciativa se ha publicado correctamente.
+          reject:
+            success: La iniciativa se ha rechazado correctamente.
+          unpublish:
+            success: La iniciativa se ha despublicado correctamente.
           update:
             error: Se ha producido un error.
             success: La iniciativa se ha actualizado correctamente.

data/config/locales/es.yml

@@ -238,6 +238,10 @@ es:
         exports:
           initiatives: Iniciativas
         initiatives:
+          accept:
+            success: La iniciativa se ha aceptado correctamente.
+          discard:
+            success: La iniciativa se ha descartado correctamente.
           edit:
             accept: Aceptar iniciativa
             confirm: '¿Estás seguro?'
@@ -261,6 +265,12 @@ es:
             edit: Editar
             new: Nueva
             photos: Fotos
+          publish:
+            success: La iniciativa se ha publicado correctamente.
+          reject:
+            success: La iniciativa se ha rechazado correctamente.
+          unpublish:
+            success: La iniciativa se ha despublicado correctamente.
           update:
             error: Se ha producido un error.
             success: La iniciativa se ha actualizado correctamente.

data/config/locales/eu.yml

@@ -238,6 +238,10 @@ eu:
         exports:
           initiatives: Ekimenak
         initiatives:
+          accept:
+            success: Ekimena zuzen onartu da.
+          discard:
+            success: Ekimena zuzen baztertu da.
           edit:
             accept: Onartu ekimena
             confirm: Ziur zaude?
@@ -261,6 +265,12 @@ eu:
             edit: Editatu
             new: Beste bat
             photos: Argazkiak
+          publish:
+            success: Ekimena zuzen argitaratu da.
+          reject:
+            success: Ekimena zuzen ukatu da.
+          unpublish:
+            success: Ekimena zuzen desargitaratu da.
           update:
             error: Errore bat egon da.
             success: Ekimena zuzen eguneratu da.
@@ -429,7 +439,7 @@ eu:
         attachment_legend: "(Aukerakoa) Gehitu eranskina"
         edit_documents: Editatu dokumentuak
         edit_image: Editatu irudia
-        image_legend: "(Aukerakoa) Erantsi irudi bat"
+        image_legend: "(Aukerakoa) Gehitu irudi bat"
       index:
         uninitialized: Administratzaile batek oraindik ez ditu ekimenak konfiguratu.
       initiative_signatures:

data/config/locales/fi-plain.yml

@@ -238,6 +238,10 @@ fi-pl:
         exports:
           initiatives: Aloitteet
         initiatives:
+          accept:
+            success: Aloitteen hyväksyminen onnistui.
+          discard:
+            success: Aloitteen peruminen onnistui.
           edit:
             accept: Hyväksy aloite
             confirm: Oletko varma?
@@ -261,6 +265,12 @@ fi-pl:
             edit: Muokkaa
             new: Uusi
             photos: Kuvat
+          publish:
+            success: Aloitteen julkaisu onnistui.
+          reject:
+            success: Aloitteen hylkääminen onnistui.
+          unpublish:
+            success: Aloitteen julkaisun lopetus onnistui.
           update:
             error: Tapahtui virhe.
             success: Aloitteen päivitys onnistui.

data/config/locales/fi.yml

@@ -91,7 +91,7 @@ fi:
             values:
               accepted: Tarpeeksi allekirjoituksia
               created: Luotu
-              discarded: Hylätyt
+              discarded: Perutut
               published: Julkaistut
               rejected: Liian vähän allekirjoituksia
               validating: Teknisessä validoinnissa
@@ -238,11 +238,15 @@ fi:
         exports:
           initiatives: Aloitteet
         initiatives:
+          accept:
+            success: Aloitteen hyväksyminen onnistui.
+          discard:
+            success: Aloitteen peruminen onnistui.
           edit:
             accept: Hyväksy aloite
             confirm: Oletko varma?
             confirm_send_to_technical_validation: Oletko varma?
-            discard: Hylkää aloite
+            discard: Peru aloite
             export_pdf_signatures: Vie allekirjoitukset PDF-asiakirjaan
             export_votes: Lataa allekirjoitukset
             reject: Torju aloite
@@ -261,6 +265,12 @@ fi:
             edit: Muokkaa
             new: Uusi
             photos: Kuvat
+          publish:
+            success: Aloitteen julkaisu onnistui.
+          reject:
+            success: Aloitteen hylkääminen onnistui.
+          unpublish:
+            success: Aloitteen julkaisun lopetus onnistui.
           update:
             error: Tapahtui virhe.
             success: Aloitteen päivitys onnistui.
@@ -314,7 +324,7 @@ fi:
         initiative:
           publish: "%{user_name} julkaisi aloitteen %{resource_name}"
           send_to_technical_validation: "%{user_name} lähetti aloitteen %{resource_name} tekniseen tarkastukseen"
-          unpublish: "%{user_name} hylkäsi aloitteen %{resource_name}"
+          unpublish: "%{user_name} perui aloitteen %{resource_name}"
           update: "%{user_name} päivitti aloitetta %{resource_name}"
         initiatives_settings:
           update: "%{user_name} päivitti aloitteiden asetuksia"
@@ -325,7 +335,7 @@ fi:
       admin_states:
         accepted: Tarpeeksi allekirjoituksia
         created: Luotu
-        discarded: Hylätty
+        discarded: Peruttu
         published: Julkaistu
         rejected: Liian vähän allekirjoituksia
         validating: Teknisessä tarkastuksessa
@@ -363,7 +373,7 @@ fi:
         finish:
           back: Takaisin
           back_to_initiatives: Takaisin aloitteisiin
-          callout_text: Onnittelut! Aloitteesi on luotu onnistuneesti.
+          callout_text: Onnittelut! Aloitteen luominen onnistui.
           confirm: Aloite lähetetään hallintakäyttäjän tarkastettavaksi ja julkaistavaksi. Julkaisun jälkeen et voi enää muokata aloitetta. Haluatko varmasti jatkaa?
           edit_my_initiative: Muokkaa aloitettani
           go_to_my_initiatives: Siirry omiin aloitteisiini
@@ -575,7 +585,7 @@ fi:
         badge_name:
           accepted: Tarpeeksi allekirjoituksia
           created: Luotu
-          discarded: Hylätty
+          discarded: Peruttu
           published: Julkaistu
           rejected: Liian vähän allekirjoituksia
           validating: Teknisessä tarkastuksessa

data/config/locales/ja.yml

@@ -10,8 +10,8 @@ ja:
         decidim_user_group_id: 作成者
         description: 説明
         hashtag: ハッシュタグ
-        offline_votes: In-personal 署名
-        offline_votes_for_scope: '%{scope_name} の In-personal 署名'
+        offline_votes: 対面署名
+        offline_votes_for_scope: '%{scope_name} の 対面署名'
         scope_id: スコープ
         signature_end_date: 署名の収集期間の終了
         signature_start_date: 署名の収集期間の開始
@@ -235,6 +235,10 @@ ja:
         exports:
           initiatives: イニシアチブ
         initiatives:
+          accept:
+            success: イニシアチブは受理されました。
+          discard:
+            success: イニシアチブは破棄されました。
           edit:
             accept: イニシアチブを承認する
             confirm: よろしいですか？
@@ -258,6 +262,12 @@ ja:
             edit: 編集
             new: 新規作成
             photos: 写真
+          publish:
+            success: イニシアチブを公開しました。
+          reject:
+            success: イニシアチブはリジェクトされました。
+          unpublish:
+            success: イニシアチブは非公開になりました。
           update:
             error: エラーが発生しました。
             success: イニシアチブを更新しました。

data/config/locales/pt-BR.yml

@@ -238,6 +238,8 @@ pt-BR:
             edit: Editar
             new: Novo
             photos: Fotos
+          update:
+            error: Ocorreu um erro.
         initiatives_settings:
           form:
             comments: Mais comentado
@@ -247,13 +249,20 @@ pt-BR:
             signatures: Mais assinadas
             title: Configurações de iniciativas
         initiatives_type_scopes:
+          create:
+            error: Ocorreu um erro.
           edit:
             title: Editar o âmbito do tipo de iniciativa
             update: Atualizar
           new:
             create: Criar
             title: Criar âmbito de tipo de iniciativa
+          update:
+            error: Ocorreu um erro.
         initiatives_types:
+          create:
+            error: Ocorreu um erro.
+            success: Um novo tipo de iniciativa foi criado com sucesso.
           edit:
             update: Atualizar
           form:
@@ -266,6 +275,8 @@ pt-BR:
           new:
             create: Criar
             title: Novo tipo de iniciativa
+          update:
+            error: Ocorreu um erro.
       admin_log:
         initiative:
           publish: "%{user_name} publicou a iniciativa %{resource_name}"
@@ -522,6 +533,8 @@ pt-BR:
         accepted: Aceitaram
         expired: Expirado
       unavailable_scope: Escopo não disponível
+      update:
+        error: Ocorreu um erro.
     menu:
       initiatives: Iniciativas
     resources:

data/config/locales/ro-RO.yml

@@ -220,6 +220,10 @@ ro:
         exports:
           initiatives: Inițiative
         initiatives:
+          accept:
+            success: Inițiativa a fost acceptată cu succes.
+          discard:
+            success: Inițiativa a fost anulată cu succes.
           edit:
             accept: Acceptă inițiativa
             confirm: Sigur dorești asta?
@@ -242,6 +246,12 @@ ro:
             edit: Editare
             new: Nou
             photos: Poze
+          publish:
+            success: Inițiativa a fost publicată cu succes.
+          reject:
+            success: Inițiativa a fost respinsă.
+          unpublish:
+            success: Inițiativa a fost ascunsă cu succes.
           update:
             error: A apărut o eroare.
             success: Inițiativa a fost actualizată cu succes.