decidim-budgets 0.26.7 → 0.26.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/decidim/budgets/admin/application_controller.rb +0 -2
- data/app/controllers/decidim/budgets/admin/attachment_collections_controller.rb +3 -1
- data/app/controllers/decidim/budgets/admin/attachments_controller.rb +7 -1
- data/app/controllers/decidim/budgets/admin/budgets_controller.rb +1 -1
- data/app/controllers/decidim/budgets/line_items_controller.rb +2 -2
- data/app/controllers/decidim/budgets/orders_controller.rb +1 -1
- data/app/controllers/decidim/budgets/projects_controller.rb +6 -2
- data/app/forms/decidim/budgets/admin/budget_form.rb +2 -1
- data/app/models/decidim/budgets/order.rb +1 -0
- data/app/models/decidim/budgets/project.rb +6 -2
- data/app/views/decidim/budgets/admin/budgets/edit.html.erb +1 -0
- data/app/views/decidim/budgets/admin/budgets/index.html.erb +1 -0
- data/app/views/decidim/budgets/admin/budgets/new.html.erb +1 -0
- data/app/views/decidim/budgets/admin/projects/edit.html.erb +1 -0
- data/app/views/decidim/budgets/admin/projects/index.html.erb +1 -0
- data/app/views/decidim/budgets/admin/projects/new.html.erb +1 -0
- data/app/views/decidim/budgets/admin/proposals_imports/new.html.erb +1 -0
- data/config/environment.rb +3 -0
- data/config/locales/ar.yml +1 -1
- data/config/locales/ca.yml +4 -1
- data/config/locales/cs.yml +7 -2
- data/config/locales/de.yml +13 -5
- data/config/locales/el.yml +33 -1
- data/config/locales/en.yml +3 -0
- data/config/locales/es-MX.yml +6 -3
- data/config/locales/es-PY.yml +6 -3
- data/config/locales/es.yml +5 -2
- data/config/locales/eu.yml +57 -45
- data/config/locales/fi-plain.yml +4 -1
- data/config/locales/fi.yml +5 -2
- data/config/locales/fr-CA.yml +4 -1
- data/config/locales/fr.yml +4 -1
- data/config/locales/ga-IE.yml +1 -1
- data/config/locales/hu.yml +42 -2
- data/config/locales/id-ID.yml +1 -1
- data/config/locales/is-IS.yml +1 -2
- data/config/locales/it.yml +2 -2
- data/config/locales/ja.yml +4 -2
- data/config/locales/kaa.yml +10 -0
- data/config/locales/lb.yml +5 -3
- data/config/locales/lt.yml +2 -1
- data/config/locales/lv.yml +1 -1
- data/config/locales/nl.yml +2 -2
- data/config/locales/no.yml +1 -1
- data/config/locales/pl.yml +24 -1
- data/config/locales/pt-BR.yml +20 -1
- data/config/locales/pt.yml +3 -1
- data/config/locales/ru.yml +1 -1
- data/config/locales/sk.yml +1 -1
- data/config/locales/sq-AL.yml +1 -0
- data/config/locales/sv.yml +3 -2
- data/config/locales/th-TH.yml +1 -0
- data/config/locales/tr-TR.yml +3 -1
- data/config/locales/uk.yml +2 -2
- data/config/locales/zh-CN.yml +3 -0
- data/lib/decidim/budgets/version.rb +1 -1
- data/lib/decidim/budgets/workflows/all.rb +1 -1
- data/lib/decidim/budgets/workflows/base.rb +1 -1
- metadata +15 -12
data/config/locales/pl.yml
CHANGED
@@ -13,8 +13,11 @@ pl:
|
|
13
13
|
decidim_scope_id: Zakres
|
14
14
|
description: Opis
|
15
15
|
proposal_ids: Powiązane propozycje
|
16
|
+
proposals: Propozycje
|
16
17
|
selected: Wybrane do implementacji
|
17
18
|
title: Tytuł
|
19
|
+
proposals_import:
|
20
|
+
scope_id: Zakres
|
18
21
|
activerecord:
|
19
22
|
models:
|
20
23
|
decidim/budgets/project:
|
@@ -23,6 +26,17 @@ pl:
|
|
23
26
|
many: Projektów
|
24
27
|
other: Projektów
|
25
28
|
decidim:
|
29
|
+
admin:
|
30
|
+
filters:
|
31
|
+
projects:
|
32
|
+
category_id_eq:
|
33
|
+
label: Kategoria
|
34
|
+
scope_id_eq:
|
35
|
+
label: Zakres
|
36
|
+
selected_at_null:
|
37
|
+
label: Wybrane
|
38
|
+
values:
|
39
|
+
'false': Wybrane do wykonania
|
26
40
|
budgets:
|
27
41
|
actions:
|
28
42
|
attachment_collections: Foldery
|
@@ -91,7 +105,10 @@ pl:
|
|
91
105
|
success: "%{number} propozycji pomyślnie zaimportowano do projektów"
|
92
106
|
new:
|
93
107
|
create: Importuj propozycje do projektów
|
108
|
+
default_budget: Domyślny budżet
|
109
|
+
import_all_accepted_proposals: Importuj wszystkie zaakceptowane propozycje
|
94
110
|
no_components: W tej przestrzeni partycypacyjnej nie ma innych komponentów do zaimportowania propozycji jako projektów.
|
111
|
+
origin_component_id: Źródłowy komponent
|
95
112
|
select_component: Wybierz komponent
|
96
113
|
title: Importuj propozycje
|
97
114
|
admin_log:
|
@@ -112,6 +129,7 @@ pl:
|
|
112
129
|
more_information: Więcej informacji
|
113
130
|
budget_list_item:
|
114
131
|
voting_finished: Głosowałeś w tym budżecie
|
132
|
+
voting_started: Zaczęto głosowanie w ramach tego budżetu
|
115
133
|
budgets_list:
|
116
134
|
cancel_order:
|
117
135
|
more_than_one: usuń swój głos na %{name} i zacznij od nowa
|
@@ -122,6 +140,7 @@ pl:
|
|
122
140
|
my_budgets: Moje budżety
|
123
141
|
progress: Zakończ głosowanie
|
124
142
|
show: Zobacz projekty
|
143
|
+
vote: Głos
|
125
144
|
voted_on: Zagłosowałeś na %{links}
|
126
145
|
limit_announcement:
|
127
146
|
cant_vote: Nie możesz głosować na ten budżet. <a href="%{landing_path}">Spróbuj zagłosować na inny</a>.
|
@@ -150,8 +169,10 @@ pl:
|
|
150
169
|
title: Potwierdź głosowanie
|
151
170
|
budget_excess:
|
152
171
|
budget_excess:
|
172
|
+
description: Ten projekt przekracza maksymalny budżet i nie można go dodać. Jeśli chcesz, możesz usunąć wybrany projekt, aby móc zagłosować ponownie zgodnie ze swoimi preferencjami.
|
153
173
|
title: Przekroczono maksymalny budżet
|
154
174
|
close: Zamknij
|
175
|
+
description: Ten projekt przekracza maksymalny budżet i nie można go dodać. Jeśli chcesz, możesz usunąć wybrany projekt, aby móc zagłosować ponownie zgodnie ze swoimi preferencjami.
|
155
176
|
ok: ok
|
156
177
|
projects_excess:
|
157
178
|
title: Maksymalna liczba projektów została przekroczona
|
@@ -185,6 +206,8 @@ pl:
|
|
185
206
|
few: "%{count} projekty"
|
186
207
|
many: "%{count} projektów"
|
187
208
|
other: "%{count} projektów"
|
209
|
+
exit_modal:
|
210
|
+
close_modal: Zamknij okno
|
188
211
|
filters:
|
189
212
|
category: Kategoria
|
190
213
|
scope: Zakres
|
@@ -200,7 +223,7 @@ pl:
|
|
200
223
|
filter_by: Filtruj według
|
201
224
|
unfold: Rozwiń
|
202
225
|
order_progress:
|
203
|
-
vote:
|
226
|
+
vote: Wspieranie
|
204
227
|
order_selected_projects:
|
205
228
|
remove: Usuń
|
206
229
|
selected_projects:
|
data/config/locales/pt-BR.yml
CHANGED
@@ -13,14 +13,29 @@ pt-BR:
|
|
13
13
|
decidim_scope_id: Âmbito
|
14
14
|
description: Descrição
|
15
15
|
proposal_ids: Propostas relacionadas
|
16
|
+
proposals: Propostas
|
16
17
|
selected: Selecionado para implementação
|
17
18
|
title: Título
|
19
|
+
proposals_import:
|
20
|
+
scope_id: Escopo
|
18
21
|
activerecord:
|
19
22
|
models:
|
20
23
|
decidim/budgets/project:
|
21
24
|
one: Projeto
|
22
25
|
other: Projetos
|
23
26
|
decidim:
|
27
|
+
admin:
|
28
|
+
filters:
|
29
|
+
projects:
|
30
|
+
category_id_eq:
|
31
|
+
label: Categoria
|
32
|
+
scope_id_eq:
|
33
|
+
label: Escopo
|
34
|
+
selected_at_null:
|
35
|
+
label: Selecionado
|
36
|
+
values:
|
37
|
+
'false': Selecionado para implementação
|
38
|
+
'true': Não selecionado para implementação
|
24
39
|
budgets:
|
25
40
|
actions:
|
26
41
|
attachment_collections: Pastas
|
@@ -180,6 +195,8 @@ pt-BR:
|
|
180
195
|
projects_count:
|
181
196
|
one: 1 projeto
|
182
197
|
other: "%{count} projetos"
|
198
|
+
exit_modal:
|
199
|
+
close_modal: Fechar modal
|
183
200
|
filters:
|
184
201
|
category: Categoria
|
185
202
|
scope: Âmbito
|
@@ -201,7 +218,7 @@ pt-BR:
|
|
201
218
|
selected_projects:
|
202
219
|
one: projeto selecionado
|
203
220
|
other: projetos selecionados
|
204
|
-
view:
|
221
|
+
view: Ver
|
205
222
|
orders:
|
206
223
|
highest_cost: Custo mais alto
|
207
224
|
label: Ordenar projetos por
|
@@ -229,6 +246,7 @@ pt-BR:
|
|
229
246
|
components:
|
230
247
|
budgets:
|
231
248
|
actions:
|
249
|
+
comment: Comentar
|
232
250
|
vote: Voto
|
233
251
|
name: Orçamentos
|
234
252
|
settings:
|
@@ -250,6 +268,7 @@ pt-BR:
|
|
250
268
|
total_budget: Orçamento total
|
251
269
|
vote_minimum_budget_projects_number: Número mínimo de projetos para votar
|
252
270
|
vote_rule_minimum_budget_projects_enabled: 'Habilitar regra: Número mínimo de projetos a serem votados em'
|
271
|
+
vote_rule_selected_projects_enabled: 'Habilitar regra: Número mínimo e máximo de projetos a serem votados'
|
253
272
|
vote_rule_threshold_percent_enabled: 'Ativar regra: Porcentagem mínima do orçamento'
|
254
273
|
vote_selected_projects_maximum: Quantidade máxima de projetos a serem selecionados
|
255
274
|
vote_selected_projects_minimum: Quantidade mínima de projetos a serem selecionados
|
data/config/locales/pt.yml
CHANGED
@@ -183,6 +183,8 @@ pt:
|
|
183
183
|
projects_count:
|
184
184
|
one: 1 projeto
|
185
185
|
other: "%{count} projetos"
|
186
|
+
exit_modal:
|
187
|
+
close_modal: Fechar o modal
|
186
188
|
filters:
|
187
189
|
category: Categoria
|
188
190
|
scope: Âmbito
|
@@ -193,7 +195,7 @@ pt:
|
|
193
195
|
not_selected: Não seleccionado
|
194
196
|
selected: Seleccionado
|
195
197
|
filters_small_view:
|
196
|
-
close_modal: Fechar modal
|
198
|
+
close_modal: Fechar o modal
|
197
199
|
filter: Filtrar
|
198
200
|
filter_by: Filtrar por
|
199
201
|
unfold: Desdobrar
|
data/config/locales/ru.yml
CHANGED
@@ -84,6 +84,7 @@ ru:
|
|
84
84
|
description: Вы уже голосовали за бюджет. Если вы передумали, вы можете %{cancel_link}.
|
85
85
|
title: Голосование по бюджету завершено
|
86
86
|
title: Вы определяете бюджет
|
87
|
+
total_budget: Общий бюджет
|
87
88
|
count:
|
88
89
|
projects_count:
|
89
90
|
one: 1 проект
|
@@ -95,7 +96,6 @@ ru:
|
|
95
96
|
scope: Охват
|
96
97
|
search: Поиск
|
97
98
|
filters_small_view:
|
98
|
-
close_modal: Закрыть окошко
|
99
99
|
filter: Отобрать
|
100
100
|
filter_by: 'Отобрать по признаку:'
|
101
101
|
unfold: Развернуть
|
data/config/locales/sk.yml
CHANGED
@@ -87,6 +87,7 @@ sk:
|
|
87
87
|
description: Už ste hlasovali za rozpočet. Ak ste zmenili názor, môžete %{cancel_link}.
|
88
88
|
title: Hlasovanie o rozpočte dokončené
|
89
89
|
title: Vy rozhodujete o rozpočte
|
90
|
+
total_budget: Celkový rozpočet
|
90
91
|
count:
|
91
92
|
projects_count:
|
92
93
|
one: 1 projekt
|
@@ -98,7 +99,6 @@ sk:
|
|
98
99
|
scope: Rozsah
|
99
100
|
search: Hľadať
|
100
101
|
filters_small_view:
|
101
|
-
close_modal: Zavrieť okno
|
102
102
|
filter: Filter
|
103
103
|
filter_by: Filtrovať podľa
|
104
104
|
unfold: Rozbaliť
|
@@ -0,0 +1 @@
|
|
1
|
+
sq:
|
data/config/locales/sv.yml
CHANGED
@@ -13,7 +13,8 @@ sv:
|
|
13
13
|
decidim_scope_id: Omfång
|
14
14
|
description: Beskrivning
|
15
15
|
proposal_ids: Relaterade förslag
|
16
|
-
|
16
|
+
proposals: Förslag
|
17
|
+
selected: Valt för genomförande
|
17
18
|
title: Titel
|
18
19
|
proposals_import:
|
19
20
|
scope_id: Omfång
|
@@ -219,7 +220,7 @@ sv:
|
|
219
220
|
not_selected: Inte vald
|
220
221
|
selected: Valda
|
221
222
|
filters_small_view:
|
222
|
-
close_modal: Stäng
|
223
|
+
close_modal: Stäng fönster
|
223
224
|
filter: Filtrera
|
224
225
|
filter_by: Filtrera efter
|
225
226
|
unfold: Veckla ut
|
@@ -0,0 +1 @@
|
|
1
|
+
th:
|
data/config/locales/tr-TR.yml
CHANGED
@@ -172,6 +172,8 @@ tr:
|
|
172
172
|
projects_count:
|
173
173
|
one: 1 proje
|
174
174
|
other: "%{count} proje"
|
175
|
+
exit_modal:
|
176
|
+
close_modal: Pencereyi kapat
|
175
177
|
filters:
|
176
178
|
category: Kategori
|
177
179
|
scope: Kapsam
|
@@ -187,7 +189,7 @@ tr:
|
|
187
189
|
filter_by: Şuna göre filtrele
|
188
190
|
unfold: Aç
|
189
191
|
order_progress:
|
190
|
-
vote: Oy
|
192
|
+
vote: Oy
|
191
193
|
order_selected_projects:
|
192
194
|
remove: Kaldır
|
193
195
|
selected_projects:
|
data/config/locales/uk.yml
CHANGED
@@ -84,6 +84,7 @@ uk:
|
|
84
84
|
description: Ви вже проголосували за бюджет. Якщо ви змінили свою думку, ви можете %{cancel_link}.
|
85
85
|
title: Голосування щодо бюджету завершено
|
86
86
|
title: Ви визначаєте бюджет
|
87
|
+
total_budget: Загальний бюджет
|
87
88
|
count:
|
88
89
|
projects_count:
|
89
90
|
one: 1 проект
|
@@ -95,12 +96,11 @@ uk:
|
|
95
96
|
scope: Обсяг
|
96
97
|
search: Шукати
|
97
98
|
filters_small_view:
|
98
|
-
close_modal: Закрити віконце
|
99
99
|
filter: Відібрати
|
100
100
|
filter_by: 'Відібрати за ознакою:'
|
101
101
|
unfold: Розгорнути
|
102
102
|
order_progress:
|
103
|
-
vote:
|
103
|
+
vote: Проголосувати
|
104
104
|
order_selected_projects:
|
105
105
|
remove: Видалити
|
106
106
|
selected_projects:
|
data/config/locales/zh-CN.yml
CHANGED
@@ -144,9 +144,12 @@ zh-CN:
|
|
144
144
|
description: 您已经投票给了预算。如果您改变了主意,您可以 %{cancel_link}。
|
145
145
|
title: 预算投票完成
|
146
146
|
title: 您决定预算
|
147
|
+
total_budget: 预算总额
|
147
148
|
count:
|
148
149
|
projects_count:
|
149
150
|
other: "%{count} 个项目"
|
151
|
+
exit_modal:
|
152
|
+
close_modal: 关闭模式
|
150
153
|
filters:
|
151
154
|
category: 类别
|
152
155
|
scope: 范围
|
@@ -11,7 +11,7 @@ module Decidim
|
|
11
11
|
end
|
12
12
|
|
13
13
|
# Users can vote in all budgets with this workflow.
|
14
|
-
def vote_allowed?(resource,
|
14
|
+
def vote_allowed?(resource, consider_progress: true) # rubocop:disable Lint/UnusedMethodArgument
|
15
15
|
!voted?(resource)
|
16
16
|
end
|
17
17
|
end
|
@@ -40,7 +40,7 @@ module Decidim
|
|
40
40
|
# Using `false` allow UI to offer users to discard votes in progress to start voting in another resource.
|
41
41
|
#
|
42
42
|
# Returns Boolean.
|
43
|
-
def vote_allowed?(_resource,
|
43
|
+
def vote_allowed?(_resource, consider_progress: true) # rubocop:disable Lint/UnusedMethodArgument
|
44
44
|
raise StandardError, "Not implemented"
|
45
45
|
end
|
46
46
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-budgets
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.26.
|
4
|
+
version: 0.26.9
|
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: 2023-
|
13
|
+
date: 2023-12-21 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: decidim-comments
|
@@ -18,70 +18,70 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - '='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.26.
|
21
|
+
version: 0.26.9
|
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.26.
|
28
|
+
version: 0.26.9
|
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.26.
|
35
|
+
version: 0.26.9
|
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.26.
|
42
|
+
version: 0.26.9
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: decidim-admin
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
47
|
- - '='
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: 0.26.
|
49
|
+
version: 0.26.9
|
50
50
|
type: :development
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
54
|
- - '='
|
55
55
|
- !ruby/object:Gem::Version
|
56
|
-
version: 0.26.
|
56
|
+
version: 0.26.9
|
57
57
|
- !ruby/object:Gem::Dependency
|
58
58
|
name: decidim-dev
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
60
60
|
requirements:
|
61
61
|
- - '='
|
62
62
|
- !ruby/object:Gem::Version
|
63
|
-
version: 0.26.
|
63
|
+
version: 0.26.9
|
64
64
|
type: :development
|
65
65
|
prerelease: false
|
66
66
|
version_requirements: !ruby/object:Gem::Requirement
|
67
67
|
requirements:
|
68
68
|
- - '='
|
69
69
|
- !ruby/object:Gem::Version
|
70
|
-
version: 0.26.
|
70
|
+
version: 0.26.9
|
71
71
|
- !ruby/object:Gem::Dependency
|
72
72
|
name: decidim-proposals
|
73
73
|
requirement: !ruby/object:Gem::Requirement
|
74
74
|
requirements:
|
75
75
|
- - '='
|
76
76
|
- !ruby/object:Gem::Version
|
77
|
-
version: 0.26.
|
77
|
+
version: 0.26.9
|
78
78
|
type: :development
|
79
79
|
prerelease: false
|
80
80
|
version_requirements: !ruby/object:Gem::Requirement
|
81
81
|
requirements:
|
82
82
|
- - '='
|
83
83
|
- !ruby/object:Gem::Version
|
84
|
-
version: 0.26.
|
84
|
+
version: 0.26.9
|
85
85
|
description: A budgets component for decidim's participatory spaces.
|
86
86
|
email:
|
87
87
|
- josepjaume@gmail.com
|
@@ -215,6 +215,7 @@ files:
|
|
215
215
|
- app/views/decidim/budgets/projects/index.js.erb
|
216
216
|
- app/views/decidim/budgets/projects/show.html.erb
|
217
217
|
- config/assets.rb
|
218
|
+
- config/environment.rb
|
218
219
|
- config/locales/am-ET.yml
|
219
220
|
- config/locales/ar-SA.yml
|
220
221
|
- config/locales/ar.yml
|
@@ -281,9 +282,11 @@ files:
|
|
281
282
|
- config/locales/sk.yml
|
282
283
|
- config/locales/sl.yml
|
283
284
|
- config/locales/so-SO.yml
|
285
|
+
- config/locales/sq-AL.yml
|
284
286
|
- config/locales/sr-CS.yml
|
285
287
|
- config/locales/sv.yml
|
286
288
|
- config/locales/sw-KE.yml
|
289
|
+
- config/locales/th-TH.yml
|
287
290
|
- config/locales/ti-ER.yml
|
288
291
|
- config/locales/tr-TR.yml
|
289
292
|
- config/locales/uk.yml
|