decidim-budgets 0.26.3 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9783071f2f03519467687fece2911d28f77971cc971229a3e478b463445bf59d
-  data.tar.gz: 2ba0b7f432155e01fc61319749d71b5d4addf9dc440adbfbe1e1e9fa564169bf
+  metadata.gz: 2a7eb220680e03c3f8ca012a81217a443c5672804687417251c1dffbec45b0e0
+  data.tar.gz: 49dfd04c441922ca035ba2960af1fa9bcecdc96a714f4ce8c8aa174a0518c6ed
 SHA512:
-  metadata.gz: fecaa1b8879eece732abf6fb6d32a23655a135eeb5e2748cbb5e16ee0c031b23af76a3d61c8a7e7cc377997a31dc875db39a6d621ded6c1977c6bfaa6a567411
-  data.tar.gz: cdad13c11987cebe70b880c927626e85d91938ea0f47523541d2ba41543eec00a6547b5ad3473b990f861333e0190b9d2a9c9bc7ba2dfbed2e9388d1b68b130a
+  metadata.gz: d12adac75f375e11e435c5615036e501597afe8a4e3708f7d7444ebb7c9205748962171e8025f8f5570dc0359a62abdac396c90fca00d869dc1823cd655eaee7
+  data.tar.gz: 3aa335a63d70836da050ef789353eef75cef7e0c1943b055e219d0d2cb7a0e58dc09edf7a09b37a5865b781d2d263e3721d24ea182f773b64922230ca5e57216

data/app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb

@@ -81,7 +81,10 @@ module Decidim
         end
 
         def proposal_already_copied?(original_proposal)
-          original_proposal.linked_resources(:projects, "included_proposals").any? do |project|
+          # Note: we are including also projects from unpublished components
+          # because otherwise duplicates could be created until the component is
+          # published.
+          original_proposal.linked_resources(:projects, "included_proposals", component_published: false).any? do |project|
             project.budget == form.budget
           end
         end

data/app/controllers/decidim/budgets/projects_controller.rb

@@ -28,8 +28,8 @@ module Decidim
       def projects
         return @projects if @projects
 
-        @projects = search.results.page(params[:page]).per(current_component.settings.projects_per_page)
-        @projects = reorder(@projects)
+        @projects = reorder(search.results)
+        @projects = @projects.page(params[:page]).per(current_component.settings.projects_per_page)
       end
 
       def project

data/config/locales/ca.yml

@@ -40,7 +40,7 @@ ca:
       actions:
         attachment_collections: Carpetes
         attachments: Adjunts
-        confirm_destroy: Estàs segura que vols eliminar aquest projecte?
+        confirm_destroy: Segur que vols eliminar aquest projecte?
         destroy: Esborrar
         edit: Editar
         edit_projects: Gestionar projectes

data/config/locales/cs.yml

@@ -257,7 +257,7 @@ cs:
             few: hlasy
             many: hlasů
             other: hlasů
-          you_voted: Hlasovali jste
+          you_voted: Hlasoval jste pro toto
         project_budget_button:
           add: Přidat do vašeho hlasování
           add_descriptive: Přidat k hlasování projekt %{resource_name}

data/config/locales/de.yml

@@ -6,7 +6,7 @@ de:
         description: Beschreibung
         title: Titel
         total_budget: Gesamtbudget
-        weight: Bestellposition
+        weight: Reihenfolge
       project:
         budget_amount: Höhe des Budgets
         decidim_category_id: Kategorie
@@ -245,7 +245,6 @@ de:
           votes:
             one: Abstimmung
             other: Abstimmungen
-          you_voted: Du hast für dieses gestimmt
         project_budget_button:
           add: Zur Abstimmung hinzufügen
           add_descriptive: Projekt %{resource_name} Ihrer Stimme hinzufügen

data/config/locales/el.yml

@@ -217,7 +217,6 @@ el:
           votes:
             one: ψήφος
             other: ψήφοι
-          you_voted: Το ψηφίσατε
         project_budget_button:
           add: Προσθέστε στην ψήφο σας
           add_descriptive: Προσθήκη του έργου %{resource_name} στην ψήφο σας

data/config/locales/en.yml

@@ -250,7 +250,7 @@ en:
           votes:
             one: vote
             other: votes
-          you_voted: You voted this
+          you_voted: You voted for this
         project_budget_button:
           add: Add to your vote
           add_descriptive: Add project %{resource_name} to your vote

data/config/locales/es.yml

@@ -40,7 +40,7 @@ es:
       actions:
         attachment_collections: Carpetas
         attachments: Adjuntos
-        confirm_destroy: '¿Estás segura de que deseas eliminar este proyecto?'
+        confirm_destroy: '¿Seguro que deseas eliminar este proyecto?'
         destroy: Borrar
         edit: Editar
         edit_projects: Gestionar proyectos
@@ -179,7 +179,7 @@ es:
             description: Este proyecto sobrepasa el presupuesto máximo y no se puede añadir. Si lo deseas, puedes eliminar un proyecto que ya hayas seleccionado, o votar de acuerdo a tus preferencias.
             title: Se ha superado el número máximo de proyectos
         budget_summary:
-          are_you_sure: '¿Estás seguro de que deseas cancelar tu voto?'
+          are_you_sure: '¿Seguro que deseas cancelar tu voto?'
           assigned: 'Asignado:'
           cancel_order: eliminar tu voto y empezar de nuevo
           checked_out:

data/config/locales/eu.yml

@@ -13,8 +13,11 @@ eu:
         decidim_scope_id: Esparrua
         description: Descripción
         proposal_ids: Honekin lotutako proposamenak
-        selected: Hautatua inplementatzeko
+        proposals: Proposamenak
+        selected: Ezarpenerako hautatuak
         title: Titulua
+      proposals_import:
+        scope_id: Eremua
   activerecord:
     models:
       decidim/budgets/project:
@@ -26,6 +29,8 @@ eu:
         projects:
           category_id_eq:
             label: Kategoria
+          scope_id_eq:
+            label: Eremua
           selected_at_null:
             label: Hautatua
             values:
@@ -236,7 +241,7 @@ eu:
           votes:
             one: Botoa
             other: botoak
-          you_voted: Hau bozkatu duzu
+          you_voted: Honen aldeko botoa eman duzu
         project_budget_button:
           add: Gehitu zure botoari
           add_descriptive: Gehitu %{resource_name} proiektua zure botoari

data/config/locales/fr-CA.yml

@@ -249,7 +249,7 @@ fr-CA:
           votes:
             one: vote
             other: votes
-          you_voted: Vous avez voté pour
+          you_voted: Vous avez voté pour ceci
         project_budget_button:
           add: Ajouter à votre vote
           add_descriptive: Ajouter le projet %{resource_name} à votre vote

data/config/locales/fr.yml

@@ -249,7 +249,7 @@ fr:
           votes:
             one: vote
             other: votes
-          you_voted: Vous avez voté pour
+          you_voted: Vous avez voté pour ceci
         project_budget_button:
           add: Ajouter à votre vote
           add_descriptive: Ajouter le projet %{resource_name} à votre vote

data/config/locales/gl.yml

@@ -203,7 +203,6 @@ gl:
           votes:
             one: voto
             other: votos
-          you_voted: Votaches isto
         project_budget_button:
           add: Engadir ao teu voto
           add_descriptive: Engadir o proxecto %{resource_name} ao teu voto

data/config/locales/gn-PY.yml

@@ -0,0 +1 @@
+gn:

data/config/locales/it.yml

@@ -226,7 +226,6 @@ it:
           votes:
             one: voto
             other: voti
-          you_voted: Hai votato
         project_budget_button:
           add: Aggiungi al tuo voto
           add_descriptive: Aggiungi progetto %{resource_name} al tuo voto

data/config/locales/ja.yml

@@ -245,7 +245,7 @@ ja:
           view: 表示
           votes:
             other: 投票
-          you_voted: 投票済
+          you_voted: あなたの投票
         project_budget_button:
           add: 投票に追加
           add_descriptive: プロジェクト %{resource_name} をあなたの投票に追加

data/config/locales/ka-GE.yml

@@ -0,0 +1 @@
+ka:

data/config/locales/lb.yml

@@ -209,7 +209,6 @@ lb:
           votes:
             one: Abstimmung
             other: Abstimmungen
-          you_voted: Du hast für dieses gestimmt
         project_budget_button:
           add: Zur Abstimmung hinzufügen
           add_descriptive: Projekt %{resource_name} Ihrer Stimme hinzufügen

data/config/locales/lo-LA.yml

@@ -0,0 +1 @@
+lo:

data/config/locales/lt.yml

@@ -257,7 +257,6 @@ lt:
             few: balsai
             many: balsai
             other: balsai
-          you_voted: Balsavote už
         project_budget_button:
           add: Pridėti prie balsų
           add_descriptive: Pridėti projektą %{resource_name} prie balsų

data/config/locales/nl.yml

@@ -249,7 +249,6 @@ nl:
           votes:
             one: stem
             other: stemmen
-          you_voted: Je stemde hiervoor
         project_budget_button:
           add: Voeg toe aan je stem
           add_descriptive: Voeg project %{resource_name} toe aan je stem

data/config/locales/no.yml

@@ -240,7 +240,6 @@
           votes:
             one: stem
             other: stemmer
-          you_voted: Du stemte dette
         project_budget_button:
           add: Legg til i stemmen din
           add_descriptive: Legg til prosjektet %{resource_name} til din stemme

data/config/locales/pl.yml

@@ -226,7 +226,6 @@ pl:
             few: głosów
             many: głosów
             other: głosów
-          you_voted: Zagłosowałeś na
         project_budget_button:
           add: Dodaj do swojego głosu
           add_descriptive: Dodaj projekt %{resource_name} do swojego głosu

data/config/locales/pt-BR.yml

@@ -217,7 +217,6 @@ pt-BR:
           votes:
             one: voto
             other: votos
-          you_voted: Você votou nisto
         project_budget_button:
           add: Adicione ao seu voto
           add_descriptive: Adicione o projeto %{resource_name} ao seu voto

data/config/locales/pt.yml

@@ -220,7 +220,6 @@ pt:
           votes:
             one: Votações
             other: Votações
-          you_voted: Votou isto
         project_budget_button:
           add: Adicionar à sua votação
           add_descriptive: Adicionar projeto %{resource_name} à sua votação

data/config/locales/ro-RO.yml

@@ -13,8 +13,11 @@ ro:
         decidim_scope_id: Domeniu de interes
         description: Descriere
         proposal_ids: Propuneri asociate
+        proposals: Propuneri
         selected: Selectate pentru implementare
         title: Titlu
+      proposals_import:
+        scope_id: Domeniu de interes
   activerecord:
     models:
       decidim/budgets/project:
@@ -244,7 +247,6 @@ ro:
             one: vot
             few: voturi
             other: voturi
-          you_voted: Ai votat pentru
         project_budget_button:
           add: Adaugă la votul tău
           add_descriptive: Adaugă proiectul %{resource_name} la votul tău

data/config/locales/sv.yml

@@ -6,7 +6,7 @@ sv:
         description: Beskrivning
         title: Titel
         total_budget: Total budget
-        weight: Vikt
+        weight: Ordning
       project:
         budget_amount: Belopp
         decidim_category_id: Kategori
@@ -167,10 +167,13 @@ sv:
           title: Bekräfta röst
         budget_excess:
           budget_excess:
+            description: Detta projekt överstiger den maximala budgeten och kan inte tilläggas. Du måste först ta bort ett projekt innan du lägger till ett nytt.
             title: Maximal budget överskriden
           close: Stäng
+          description: Detta projekt överstiger den maximala budgeten och kan inte tilläggas. Du måste först ta bort ett projekt innan du lägger till ett nytt.
           ok: OK
           projects_excess:
+            description: Du har valt för många projekt. Du måste först ta bort ett projekt innan du lägger till ett nytt.
             title: Maximalt antal projekt överskridet
         budget_summary:
           are_you_sure: Vill du dra tillbaka din röst?
@@ -243,7 +246,6 @@ sv:
           votes:
             one: röst
             other: röster
-          you_voted: Det här är din röst
         project_budget_button:
           add: Lägg till i din röst
           add_descriptive: Lägg till projekt %{resource_name} till din röst

data/config/locales/tr-TR.yml

@@ -209,7 +209,6 @@ tr:
           votes:
             one: oy
             other: oylar
-          you_voted: Buna oy verdin
         project_budget_button:
           add: Oyunuza ekleyin
           add_descriptive: Oyunuza %{resource_name} projesini ekleyin

data/lib/decidim/budgets/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.26.3"
+      "0.26.5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.26.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.26.5
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -245,6 +245,7 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -253,10 +254,12 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
+- config/locales/ka-GE.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
+- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml