decidim-proposals 0.29.2 → 0.29.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb +0 -12
- data/app/commands/decidim/proposals/admin/import_proposals.rb +7 -65
- data/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb +7 -0
- data/app/controllers/decidim/proposals/admin/proposals_imports_controller.rb +2 -2
- data/app/controllers/decidim/proposals/versions_controller.rb +1 -1
- data/app/forms/decidim/proposals/admin/proposal_answer_form.rb +0 -15
- data/app/helpers/decidim/proposals/application_helper.rb +1 -0
- data/app/helpers/decidim/proposals/proposals_helper.rb +1 -3
- data/app/jobs/decidim/proposals/admin/import_proposals_job.rb +91 -0
- data/app/mailers/decidim/proposals/admin/import_proposals_mailer.rb +30 -0
- data/app/models/decidim/proposals/collaborative_draft.rb +2 -3
- data/app/models/decidim/proposals/proposal.rb +0 -5
- data/app/services/decidim/proposals/proposal_builder.rb +1 -0
- data/app/views/decidim/proposals/admin/import_proposals_mailer/notify_failure.html.erb +1 -0
- data/app/views/decidim/proposals/admin/import_proposals_mailer/notify_success.html.erb +2 -0
- data/app/views/decidim/proposals/admin/proposals/_form.html.erb +1 -1
- data/app/views/decidim/proposals/admin/proposals/show.html.erb +4 -4
- data/app/views/decidim/proposals/proposals/_proposals.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/index.html.erb +8 -1
- data/config/locales/ar.yml +7 -3
- data/config/locales/bg.yml +0 -5
- data/config/locales/bs-BA.yml +0 -2
- data/config/locales/ca-IT.yml +945 -0
- data/config/locales/ca.yml +22 -7
- data/config/locales/cs.yml +14 -3
- data/config/locales/de.yml +20 -5
- data/config/locales/el.yml +2 -4
- data/config/locales/en.yml +18 -3
- data/config/locales/es-MX.yml +21 -6
- data/config/locales/es-PY.yml +21 -6
- data/config/locales/es.yml +24 -9
- data/config/locales/eu.yml +94 -79
- data/config/locales/fi-plain.yml +18 -3
- data/config/locales/fi.yml +18 -3
- data/config/locales/fr-CA.yml +16 -4
- data/config/locales/fr.yml +16 -4
- data/config/locales/ga-IE.yml +2 -1
- data/config/locales/gl.yml +2 -0
- data/config/locales/hu.yml +2 -6
- data/config/locales/id-ID.yml +3 -1
- data/config/locales/is-IS.yml +5 -0
- data/config/locales/it.yml +24 -3
- data/config/locales/ja.yml +19 -3
- data/config/locales/lt.yml +2 -5
- data/config/locales/lv.yml +2 -2
- data/config/locales/nl.yml +4 -4
- data/config/locales/no.yml +2 -2
- data/config/locales/pl.yml +0 -5
- data/config/locales/pt-BR.yml +0 -3
- data/config/locales/pt.yml +2 -2
- data/config/locales/ro-RO.yml +18 -2
- data/config/locales/ru.yml +5 -0
- data/config/locales/sk.yml +2 -2
- data/config/locales/sr-CS.yml +0 -2
- data/config/locales/sv.yml +7 -5
- data/config/locales/tr-TR.yml +2 -2
- data/config/locales/uk.yml +5 -0
- data/config/locales/zh-CN.yml +2 -2
- data/config/locales/zh-TW.yml +2 -4
- data/lib/decidim/proposals/version.rb +1 -1
- data/lib/tasks/proposals/upgrade/decidim_proposals_upgrade_tasks.rake +22 -0
- metadata +25 -20
data/config/locales/sv.yml
CHANGED
@@ -12,6 +12,8 @@ sv:
|
|
12
12
|
state: Status
|
13
13
|
title: Titel
|
14
14
|
user_group_id: Skapa gemensamt utkast som
|
15
|
+
import_participatory_text:
|
16
|
+
document: Dokument
|
15
17
|
proposal:
|
16
18
|
address: Adress
|
17
19
|
answer: Svar
|
@@ -22,6 +24,8 @@ sv:
|
|
22
24
|
decidim_proposals_proposal_state_id: Status
|
23
25
|
decidim_scope_id: Indelning
|
24
26
|
has_address: Har adress
|
27
|
+
latitude: Latitud
|
28
|
+
longitude: Longitud
|
25
29
|
scope_id: Indelning
|
26
30
|
state: Status
|
27
31
|
suggested_hashtags: Föreslagna hashtags
|
@@ -48,6 +52,8 @@ sv:
|
|
48
52
|
proposals_copy:
|
49
53
|
copy_proposals: Jag förstår att det här importerar alla förslag från den valda komponenten till den aktuella komponenten och att det inte går att ångra.
|
50
54
|
origin_component_id: Komponent att kopiera förslagen från
|
55
|
+
proposals_file_import:
|
56
|
+
file: Fil
|
51
57
|
proposals_import:
|
52
58
|
import_proposals: Importera förslag
|
53
59
|
keep_answers: Behåll status och svar
|
@@ -377,7 +383,6 @@ sv:
|
|
377
383
|
title: Röster
|
378
384
|
participatory_spaces:
|
379
385
|
highlighted_proposals:
|
380
|
-
last: Senaste förslagen
|
381
386
|
see_all: Visa alla förslag
|
382
387
|
proposals:
|
383
388
|
actions:
|
@@ -515,7 +520,6 @@ sv:
|
|
515
520
|
index:
|
516
521
|
actions: Åtgärder
|
517
522
|
assign_to_valuator: Tilldela till handläggare
|
518
|
-
assign_to_valuator_button: Tilldela
|
519
523
|
cancel: Avbryt
|
520
524
|
change_category: Ändra kategori
|
521
525
|
change_scope: Ändra indelning
|
@@ -531,7 +535,6 @@ sv:
|
|
531
535
|
statuses: Statusar
|
532
536
|
title: Förslag
|
533
537
|
unassign_from_valuator: Ta bort tilldelning till handläggare
|
534
|
-
unassign_from_valuator_button: Ta bort tilldelning
|
535
538
|
update: Uppdatera
|
536
539
|
update_scope_button: Uppdatera indelning
|
537
540
|
new:
|
@@ -572,7 +575,6 @@ sv:
|
|
572
575
|
proposals_imports:
|
573
576
|
create:
|
574
577
|
invalid: Det gick inte att importera förslagen.
|
575
|
-
success: "%{number} förslag har importerats."
|
576
578
|
new:
|
577
579
|
create: Importera förslag
|
578
580
|
no_components: Det finns inga andra förslagskomponenter i detta deltagarutrymme att importera förslagen från.
|
@@ -812,7 +814,7 @@ sv:
|
|
812
814
|
text_banner: Du visar förslag som dragits tillbaka av sin författare. %{go_back_link}.
|
813
815
|
new:
|
814
816
|
send: Fortsätt
|
815
|
-
title: Skapa
|
817
|
+
title: Skapa ett nytt förslag
|
816
818
|
orders:
|
817
819
|
label: 'Ordna förslag efter:'
|
818
820
|
most_commented: Mest kommenterade
|
data/config/locales/tr-TR.yml
CHANGED
@@ -275,6 +275,8 @@ tr:
|
|
275
275
|
description: Teklif sayısı
|
276
276
|
object: teklifler
|
277
277
|
title: Teklifler
|
278
|
+
votes:
|
279
|
+
title: Oylar
|
278
280
|
participatory_spaces:
|
279
281
|
highlighted_proposals:
|
280
282
|
see_all: Tüm teklifleri görün
|
@@ -371,7 +373,6 @@ tr:
|
|
371
373
|
index:
|
372
374
|
actions: Eylemler
|
373
375
|
assign_to_valuator: Bilirkişiye ata
|
374
|
-
assign_to_valuator_button: Ata
|
375
376
|
cancel: İptal Et
|
376
377
|
change_category: Kategoriyi değiştir
|
377
378
|
change_scope: Kapsamı değiştir
|
@@ -386,7 +387,6 @@ tr:
|
|
386
387
|
statuses: Durumlar
|
387
388
|
title: Teklifler
|
388
389
|
unassign_from_valuator: Bilirkişinin atamasını kaldır
|
389
|
-
unassign_from_valuator_button: Atamayı kaldır
|
390
390
|
update: Güncelle
|
391
391
|
update_scope_button: Kapsamı Güncelle
|
392
392
|
new:
|
data/config/locales/uk.yml
CHANGED
@@ -108,6 +108,11 @@ uk:
|
|
108
108
|
email_intro: 'Ви можете голосувати щодо пропозицій у %{participatory_space_title}! Почніть брати участь зі сторінки:'
|
109
109
|
email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
|
110
110
|
notification_title: Тепер в <a href="%{participatory_space_url}">%{participatory_space_title}</a> відкрилась можливість <a href="%{resource_path}">голосувати щодо пропозицій</a>
|
111
|
+
metrics:
|
112
|
+
proposals:
|
113
|
+
title: Пропозиції
|
114
|
+
votes:
|
115
|
+
title: Голоси
|
111
116
|
proposals:
|
112
117
|
actions:
|
113
118
|
import: Запозичити з іншої складової
|
data/config/locales/zh-CN.yml
CHANGED
@@ -238,6 +238,8 @@ zh-CN:
|
|
238
238
|
description: 建议数
|
239
239
|
object: 提议
|
240
240
|
title: 建议
|
241
|
+
votes:
|
242
|
+
title: 所得票数
|
241
243
|
participatory_spaces:
|
242
244
|
highlighted_proposals:
|
243
245
|
see_all: 查看所有建议
|
@@ -307,7 +309,6 @@ zh-CN:
|
|
307
309
|
index:
|
308
310
|
actions: 行动
|
309
311
|
assign_to_valuator: 分配给值器
|
310
|
-
assign_to_valuator_button: 分配
|
311
312
|
cancel: 取消
|
312
313
|
change_category: 更改类别
|
313
314
|
change_scope: 更改范围
|
@@ -321,7 +322,6 @@ zh-CN:
|
|
321
322
|
split_button: 拆分
|
322
323
|
title: 建议
|
323
324
|
unassign_from_valuator: 取消分配给值
|
324
|
-
unassign_from_valuator_button: 取消分配
|
325
325
|
update: 更新
|
326
326
|
update_scope_button: 更新范围
|
327
327
|
new:
|
data/config/locales/zh-TW.yml
CHANGED
@@ -303,6 +303,8 @@ zh-TW:
|
|
303
303
|
description: 提案總數
|
304
304
|
object: 提案
|
305
305
|
title: 提案
|
306
|
+
votes:
|
307
|
+
title: 投票
|
306
308
|
participatory_spaces:
|
307
309
|
highlighted_proposals:
|
308
310
|
see_all: 檢視所有提案
|
@@ -415,7 +417,6 @@ zh-TW:
|
|
415
417
|
index:
|
416
418
|
actions: 操作
|
417
419
|
assign_to_valuator: 分配給評估人員
|
418
|
-
assign_to_valuator_button: 指派
|
419
420
|
cancel: 取消
|
420
421
|
change_category: 變更類別
|
421
422
|
change_scope: 變更範圍
|
@@ -429,7 +430,6 @@ zh-TW:
|
|
429
430
|
split_button: 拆分
|
430
431
|
title: 提案
|
431
432
|
unassign_from_valuator: 取消分派給評估者
|
432
|
-
unassign_from_valuator_button: 取消分配
|
433
433
|
update: 更新
|
434
434
|
update_scope_button: 更新範圍
|
435
435
|
new:
|
@@ -466,7 +466,6 @@ zh-TW:
|
|
466
466
|
proposals_imports:
|
467
467
|
create:
|
468
468
|
invalid: 匯入提案時發生問題.
|
469
|
-
success: "%{number} 個提案成功匯入."
|
470
469
|
new:
|
471
470
|
create: 匯入提案
|
472
471
|
no_components: 這個參與空間中沒有其他的提案元件可以匯入提案。
|
@@ -684,7 +683,6 @@ zh-TW:
|
|
684
683
|
text_banner: 您正在查看由其作者撤回的提案列表。%{go_back_link}。
|
685
684
|
new:
|
686
685
|
send: 繼續
|
687
|
-
title: 創建你的提案
|
688
686
|
orders:
|
689
687
|
label: '依順序排序提案:'
|
690
688
|
most_commented: 最多評論
|
@@ -15,6 +15,28 @@ namespace :decidim_proposals do
|
|
15
15
|
end
|
16
16
|
end
|
17
17
|
|
18
|
+
desc "Fix proposal states created by import from other component bug"
|
19
|
+
task fix_state: :environment do
|
20
|
+
states_ids_for_reset = []
|
21
|
+
Decidim::Proposals::Proposal.unscoped.includes(:proposal_state).where.not(decidim_proposals_proposal_state_id: nil).find_each(batch_size: 100) do |proposal|
|
22
|
+
next if proposal.decidim_component_id == proposal.proposal_state.decidim_component_id
|
23
|
+
|
24
|
+
states_ids_for_reset.push(proposal.proposal_state.id)
|
25
|
+
new_state = Decidim::Proposals::ProposalState.where(component: proposal.component, token: proposal.proposal_state.token).first
|
26
|
+
if new_state.present?
|
27
|
+
states_ids_for_reset.push(new_state.id)
|
28
|
+
proposal.update_columns(decidim_proposals_proposal_state_id: new_state.id) # rubocop:disable Rails/SkipsModelValidations
|
29
|
+
else
|
30
|
+
# if the state is not found on the proposal component, the state is custom and should be removed
|
31
|
+
proposal.update_columns(decidim_proposals_proposal_state_id: nil) # rubocop:disable Rails/SkipsModelValidations
|
32
|
+
end
|
33
|
+
end
|
34
|
+
states_ids_for_reset.uniq.each do |state_id|
|
35
|
+
Decidim::Proposals::ProposalState.reset_counters(state_id, :proposals)
|
36
|
+
end
|
37
|
+
puts "FINISHED"
|
38
|
+
end
|
39
|
+
|
18
40
|
desc "Removes all proposal valuator records of which the role assignment does not exists"
|
19
41
|
task remove_valuator_orphan_records: :environment do
|
20
42
|
if Decidim.module_installed?("participatory_processes")
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-proposals
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.29.
|
4
|
+
version: 0.29.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Josep Jaume Rey Peroy
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2025-
|
13
|
+
date: 2025-04-29 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: decidim-comments
|
@@ -18,28 +18,28 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - '='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.29.
|
21
|
+
version: 0.29.3
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
requirements:
|
26
26
|
- - '='
|
27
27
|
- !ruby/object:Gem::Version
|
28
|
-
version: 0.29.
|
28
|
+
version: 0.29.3
|
29
29
|
- !ruby/object:Gem::Dependency
|
30
30
|
name: decidim-core
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
32
32
|
requirements:
|
33
33
|
- - '='
|
34
34
|
- !ruby/object:Gem::Version
|
35
|
-
version: 0.29.
|
35
|
+
version: 0.29.3
|
36
36
|
type: :runtime
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
40
|
- - '='
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 0.29.
|
42
|
+
version: 0.29.3
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: doc2text
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
@@ -80,98 +80,98 @@ dependencies:
|
|
80
80
|
requirements:
|
81
81
|
- - '='
|
82
82
|
- !ruby/object:Gem::Version
|
83
|
-
version: 0.29.
|
83
|
+
version: 0.29.3
|
84
84
|
type: :development
|
85
85
|
prerelease: false
|
86
86
|
version_requirements: !ruby/object:Gem::Requirement
|
87
87
|
requirements:
|
88
88
|
- - '='
|
89
89
|
- !ruby/object:Gem::Version
|
90
|
-
version: 0.29.
|
90
|
+
version: 0.29.3
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: decidim-assemblies
|
93
93
|
requirement: !ruby/object:Gem::Requirement
|
94
94
|
requirements:
|
95
95
|
- - '='
|
96
96
|
- !ruby/object:Gem::Version
|
97
|
-
version: 0.29.
|
97
|
+
version: 0.29.3
|
98
98
|
type: :development
|
99
99
|
prerelease: false
|
100
100
|
version_requirements: !ruby/object:Gem::Requirement
|
101
101
|
requirements:
|
102
102
|
- - '='
|
103
103
|
- !ruby/object:Gem::Version
|
104
|
-
version: 0.29.
|
104
|
+
version: 0.29.3
|
105
105
|
- !ruby/object:Gem::Dependency
|
106
106
|
name: decidim-budgets
|
107
107
|
requirement: !ruby/object:Gem::Requirement
|
108
108
|
requirements:
|
109
109
|
- - '='
|
110
110
|
- !ruby/object:Gem::Version
|
111
|
-
version: 0.29.
|
111
|
+
version: 0.29.3
|
112
112
|
type: :development
|
113
113
|
prerelease: false
|
114
114
|
version_requirements: !ruby/object:Gem::Requirement
|
115
115
|
requirements:
|
116
116
|
- - '='
|
117
117
|
- !ruby/object:Gem::Version
|
118
|
-
version: 0.29.
|
118
|
+
version: 0.29.3
|
119
119
|
- !ruby/object:Gem::Dependency
|
120
120
|
name: decidim-conference
|
121
121
|
requirement: !ruby/object:Gem::Requirement
|
122
122
|
requirements:
|
123
123
|
- - '='
|
124
124
|
- !ruby/object:Gem::Version
|
125
|
-
version: 0.29.
|
125
|
+
version: 0.29.3
|
126
126
|
type: :development
|
127
127
|
prerelease: false
|
128
128
|
version_requirements: !ruby/object:Gem::Requirement
|
129
129
|
requirements:
|
130
130
|
- - '='
|
131
131
|
- !ruby/object:Gem::Version
|
132
|
-
version: 0.29.
|
132
|
+
version: 0.29.3
|
133
133
|
- !ruby/object:Gem::Dependency
|
134
134
|
name: decidim-dev
|
135
135
|
requirement: !ruby/object:Gem::Requirement
|
136
136
|
requirements:
|
137
137
|
- - '='
|
138
138
|
- !ruby/object:Gem::Version
|
139
|
-
version: 0.29.
|
139
|
+
version: 0.29.3
|
140
140
|
type: :development
|
141
141
|
prerelease: false
|
142
142
|
version_requirements: !ruby/object:Gem::Requirement
|
143
143
|
requirements:
|
144
144
|
- - '='
|
145
145
|
- !ruby/object:Gem::Version
|
146
|
-
version: 0.29.
|
146
|
+
version: 0.29.3
|
147
147
|
- !ruby/object:Gem::Dependency
|
148
148
|
name: decidim-meetings
|
149
149
|
requirement: !ruby/object:Gem::Requirement
|
150
150
|
requirements:
|
151
151
|
- - '='
|
152
152
|
- !ruby/object:Gem::Version
|
153
|
-
version: 0.29.
|
153
|
+
version: 0.29.3
|
154
154
|
type: :development
|
155
155
|
prerelease: false
|
156
156
|
version_requirements: !ruby/object:Gem::Requirement
|
157
157
|
requirements:
|
158
158
|
- - '='
|
159
159
|
- !ruby/object:Gem::Version
|
160
|
-
version: 0.29.
|
160
|
+
version: 0.29.3
|
161
161
|
- !ruby/object:Gem::Dependency
|
162
162
|
name: decidim-participatory_processes
|
163
163
|
requirement: !ruby/object:Gem::Requirement
|
164
164
|
requirements:
|
165
165
|
- - '='
|
166
166
|
- !ruby/object:Gem::Version
|
167
|
-
version: 0.29.
|
167
|
+
version: 0.29.3
|
168
168
|
type: :development
|
169
169
|
prerelease: false
|
170
170
|
version_requirements: !ruby/object:Gem::Requirement
|
171
171
|
requirements:
|
172
172
|
- - '='
|
173
173
|
- !ruby/object:Gem::Version
|
174
|
-
version: 0.29.
|
174
|
+
version: 0.29.3
|
175
175
|
description: A proposals component for decidim's participatory spaces.
|
176
176
|
email:
|
177
177
|
- josepjaume@gmail.com
|
@@ -322,9 +322,11 @@ files:
|
|
322
322
|
- app/helpers/decidim/proposals/proposal_votes_helper.rb
|
323
323
|
- app/helpers/decidim/proposals/proposal_wizard_helper.rb
|
324
324
|
- app/helpers/decidim/proposals/proposals_helper.rb
|
325
|
+
- app/jobs/decidim/proposals/admin/import_proposals_job.rb
|
325
326
|
- app/jobs/decidim/proposals/hide_all_created_by_author_job.rb
|
326
327
|
- app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb
|
327
328
|
- app/jobs/decidim/proposals/settings_change_job.rb
|
329
|
+
- app/mailers/decidim/proposals/admin/import_proposals_mailer.rb
|
328
330
|
- app/models/decidim/proposals/application_record.rb
|
329
331
|
- app/models/decidim/proposals/collaborative_draft.rb
|
330
332
|
- app/models/decidim/proposals/collaborative_draft_collaborator_request.rb
|
@@ -376,6 +378,8 @@ files:
|
|
376
378
|
- app/services/decidim/proposals/proposal_builder.rb
|
377
379
|
- app/services/decidim/proposals/proposal_search.rb
|
378
380
|
- app/validators/proposal_length_validator.rb
|
381
|
+
- app/views/decidim/proposals/admin/import_proposals_mailer/notify_failure.html.erb
|
382
|
+
- app/views/decidim/proposals/admin/import_proposals_mailer/notify_success.html.erb
|
379
383
|
- app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb
|
380
384
|
- app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb
|
381
385
|
- app/views/decidim/proposals/admin/participatory_texts/_bulk-actions.html.erb
|
@@ -457,6 +461,7 @@ files:
|
|
457
461
|
- config/locales/bg.yml
|
458
462
|
- config/locales/bn-BD.yml
|
459
463
|
- config/locales/bs-BA.yml
|
464
|
+
- config/locales/ca-IT.yml
|
460
465
|
- config/locales/ca.yml
|
461
466
|
- config/locales/cs-CZ.yml
|
462
467
|
- config/locales/cs.yml
|