decidim-initiatives 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/initiatives/admin/committee_requests_controller.rb +1 -1
- data/app/controllers/decidim/initiatives/admin/exports_controller.rb +14 -0
- data/app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb +1 -1
- data/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb +1 -1
- data/app/controllers/decidim/initiatives/committee_requests_controller.rb +1 -1
- data/app/controllers/decidim/initiatives/create_initiative_controller.rb +2 -2
- data/app/controllers/decidim/initiatives/initiatives_type_scopes_controller.rb +1 -1
- data/app/controllers/decidim/initiatives/initiatives_type_signature_types_controller.rb +1 -1
- data/app/packs/stylesheets/decidim/initiatives/print-initiative.scss +16 -0
- data/app/permissions/decidim/initiatives/admin/permissions.rb +1 -0
- data/app/views/decidim/initiatives/admin/initiatives/edit.html.erb +2 -0
- data/app/views/decidim/initiatives/admin/initiatives/index.html.erb +1 -0
- data/app/views/decidim/initiatives/admin/initiatives_type_scopes/edit.html.erb +1 -0
- data/app/views/decidim/initiatives/admin/initiatives_type_scopes/new.html.erb +1 -0
- data/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb +1 -0
- data/app/views/decidim/initiatives/admin/initiatives_types/index.html.erb +2 -0
- data/app/views/decidim/initiatives/admin/initiatives_types/new.html.erb +1 -0
- data/app/views/decidim/initiatives/initiatives/print.html.erb +1 -1
- data/config/environment.rb +3 -0
- data/config/locales/ar.yml +5 -5
- data/config/locales/ca.yml +6 -6
- data/config/locales/cs.yml +4 -4
- data/config/locales/de.yml +30 -15
- data/config/locales/el.yml +6 -5
- data/config/locales/es-MX.yml +6 -6
- data/config/locales/es-PY.yml +6 -6
- data/config/locales/es.yml +7 -7
- data/config/locales/eu.yml +96 -76
- data/config/locales/fi-plain.yml +2 -2
- data/config/locales/fi.yml +2 -2
- data/config/locales/fr-CA.yml +7 -7
- data/config/locales/fr.yml +5 -5
- data/config/locales/gl.yml +5 -5
- data/config/locales/hu.yml +14 -8
- data/config/locales/id-ID.yml +5 -5
- data/config/locales/is-IS.yml +6 -5
- data/config/locales/it.yml +2 -7
- data/config/locales/ja.yml +5 -6
- data/config/locales/lb.yml +15 -14
- data/config/locales/lt.yml +19 -1
- data/config/locales/lv.yml +6 -5
- data/config/locales/nl.yml +5 -5
- data/config/locales/no.yml +1 -6
- data/config/locales/pl.yml +7 -5
- data/config/locales/pt-BR.yml +5 -3
- data/config/locales/pt.yml +0 -5
- data/config/locales/ro-RO.yml +3 -8
- data/config/locales/ru.yml +8 -5
- data/config/locales/sk.yml +6 -6
- data/config/locales/sq-AL.yml +1 -0
- data/config/locales/sv.yml +5 -6
- data/config/locales/th-TH.yml +1 -0
- data/config/locales/tr-TR.yml +1 -7
- data/config/locales/uk.yml +8 -5
- data/config/locales/zh-CN.yml +6 -6
- data/config/locales/zh-TW.yml +0 -6
- data/db/migrate/20181003082010_fix_user_groups_ids_on_initiatives.rb +18 -3
- data/lib/decidim/initiatives/engine.rb +1 -1
- data/lib/decidim/initiatives/version.rb +1 -1
- metadata +18 -14
data/config/locales/sk.yml
CHANGED
@@ -184,7 +184,7 @@ sk:
|
|
184
184
|
destroy:
|
185
185
|
success: Typ iniciatívy bol úspešne odstránený
|
186
186
|
edit:
|
187
|
-
confirm_destroy:
|
187
|
+
confirm_destroy: Si si istý?
|
188
188
|
destroy: Odstrániť
|
189
189
|
update: Aktualizovať
|
190
190
|
form:
|
@@ -262,6 +262,8 @@ sk:
|
|
262
262
|
email_outro: Toto oznámenie ste dostali, pretože sledujete %{author_nickname}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
|
263
263
|
email_subject: Iniciatíva bola schválená od%{author_nickname}
|
264
264
|
notification_title: Iniciatíva <a href="%{resource_path}">% {resource_title} </a> bola schválená <a href="%{author_path}">% {AUTHOR_NAME}% {author_nickname} </a>.
|
265
|
+
form:
|
266
|
+
delete_attachment: Odstrániť
|
265
267
|
index:
|
266
268
|
title: Iniciatívy
|
267
269
|
initiative_signatures:
|
@@ -300,6 +302,9 @@ sk:
|
|
300
302
|
few: a%{count} ďalších ľudí
|
301
303
|
many: a%{count} ďalších ľudí
|
302
304
|
other: a%{count} ďalších ľudí
|
305
|
+
committee_members:
|
306
|
+
confirm_revoke: Si si istý?
|
307
|
+
revoke: Zrušiť
|
303
308
|
count:
|
304
309
|
title:
|
305
310
|
one: "%{count} iniciatíva"
|
@@ -369,11 +374,6 @@ sk:
|
|
369
374
|
status_change_for: Iniciatíva%{title} zmenila svoj stav
|
370
375
|
last_activity:
|
371
376
|
new_initiative: Nová iniciatíva
|
372
|
-
pages:
|
373
|
-
home:
|
374
|
-
highlighted_initiatives:
|
375
|
-
active_initiatives: Aktívne iniciatívy
|
376
|
-
see_all_initiatives: Zobraziť všetky iniciatívy
|
377
377
|
states:
|
378
378
|
accepted: Prijal
|
379
379
|
expired: Platnosť vypršala
|
@@ -0,0 +1 @@
|
|
1
|
+
sq:
|
data/config/locales/sv.yml
CHANGED
@@ -3,6 +3,7 @@ sv:
|
|
3
3
|
attributes:
|
4
4
|
initiative:
|
5
5
|
answer: Svar
|
6
|
+
answer_url: Svars URL
|
6
7
|
area_id: Område
|
7
8
|
decidim_scope_id: Omfång
|
8
9
|
decidim_user_group_id: Författare
|
@@ -61,6 +62,9 @@ sv:
|
|
61
62
|
title: Titeln bör inte vara tom
|
62
63
|
activerecord:
|
63
64
|
models:
|
65
|
+
decidim/initiative:
|
66
|
+
one: Initiativ
|
67
|
+
other: Initiativ
|
64
68
|
decidim/initiative_comittee:
|
65
69
|
one: Kommitté
|
66
70
|
other: Kommittéer
|
@@ -342,7 +346,7 @@ sv:
|
|
342
346
|
more_information: "(Mer information)"
|
343
347
|
select: Jag vill arbeta för detta initiativ
|
344
348
|
share_committee_link:
|
345
|
-
continue:
|
349
|
+
continue: Fortsätta
|
346
350
|
invite_to_committee_help: Länk för att bjuda in personer till kampanjutskottet
|
347
351
|
show_similar_initiatives:
|
348
352
|
back: Tillbaka
|
@@ -509,11 +513,6 @@ sv:
|
|
509
513
|
status_change_for: Initiativet %{title} har ändrat status
|
510
514
|
last_activity:
|
511
515
|
new_initiative: Nytt initiativ
|
512
|
-
pages:
|
513
|
-
home:
|
514
|
-
highlighted_initiatives:
|
515
|
-
active_initiatives: Pågående initiativ
|
516
|
-
see_all_initiatives: Visa alla initiativ
|
517
516
|
show:
|
518
517
|
badge_name:
|
519
518
|
accepted: Nog med signaturer
|
@@ -0,0 +1 @@
|
|
1
|
+
th:
|
data/config/locales/tr-TR.yml
CHANGED
@@ -213,7 +213,6 @@ tr:
|
|
213
213
|
success: Girişim teknik doğrulamaya gönderildi
|
214
214
|
update: Güncelle
|
215
215
|
form:
|
216
|
-
attachments: Ekli Dosyalar
|
217
216
|
settings: Ayarlar
|
218
217
|
title: Genel bilgi
|
219
218
|
index:
|
@@ -515,11 +514,6 @@ tr:
|
|
515
514
|
status_change_for: Girişim %{title} durumu değişti
|
516
515
|
last_activity:
|
517
516
|
new_initiative: Yeni girişim
|
518
|
-
pages:
|
519
|
-
home:
|
520
|
-
highlighted_initiatives:
|
521
|
-
active_initiatives: Aktif girişimler
|
522
|
-
see_all_initiatives: Tüm girişimleri görün
|
523
517
|
show:
|
524
518
|
badge_name:
|
525
519
|
accepted: Yeterince imza
|
@@ -555,7 +549,7 @@ tr:
|
|
555
549
|
promotal_committee: Tanıtım komitesi
|
556
550
|
select_initiative_type: Seç
|
557
551
|
show_similar_initiatives: Karşılaştır
|
558
|
-
step:
|
552
|
+
step: Adım %{current} / %{total}
|
559
553
|
title: Yeni girişim oluştur
|
560
554
|
initiative_header:
|
561
555
|
initiative_menu_item: girişim
|
data/config/locales/uk.yml
CHANGED
@@ -215,6 +215,8 @@ uk:
|
|
215
215
|
email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
|
216
216
|
email_subject: '%{author_nickname} підтримав почин'
|
217
217
|
notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> підтримав почин <a href="%{resource_path}">%{resource_title}</a>.
|
218
|
+
form:
|
219
|
+
delete_attachment: Видалити
|
218
220
|
index:
|
219
221
|
title: Почини
|
220
222
|
initiative_votes:
|
@@ -229,6 +231,9 @@ uk:
|
|
229
231
|
few: і ще %{count} людей
|
230
232
|
many: і ще %{count} людей
|
231
233
|
other: і ще %{count} людей
|
234
|
+
committee_members:
|
235
|
+
confirm_revoke: Ви впевнені?
|
236
|
+
revoke: Відкликати
|
232
237
|
count:
|
233
238
|
title:
|
234
239
|
one: "%{count} почин"
|
@@ -288,11 +293,6 @@ uk:
|
|
288
293
|
status_change_for: Стан почину %{title} змінився
|
289
294
|
last_activity:
|
290
295
|
new_initiative: Започаткувати почин
|
291
|
-
pages:
|
292
|
-
home:
|
293
|
-
highlighted_initiatives:
|
294
|
-
active_initiatives: Діючі почини
|
295
|
-
see_all_initiatives: Переглянути всі почини
|
296
296
|
states:
|
297
297
|
accepted: Прийняті
|
298
298
|
expired: Строк дії яких закінчився
|
@@ -301,6 +301,7 @@ uk:
|
|
301
301
|
layouts:
|
302
302
|
decidim:
|
303
303
|
initiative_creation_header:
|
304
|
+
back: Повернутись
|
304
305
|
fill_data: Внести
|
305
306
|
finish: Завершити
|
306
307
|
previous_form: Почати
|
@@ -309,6 +310,8 @@ uk:
|
|
309
310
|
show_similar_initiatives: Порівняти
|
310
311
|
initiative_header:
|
311
312
|
initiative_menu_item: Почин
|
313
|
+
initiative_signature_creation_header:
|
314
|
+
back: Повернутись
|
312
315
|
initiatives:
|
313
316
|
initiative:
|
314
317
|
check: Перевірте ще раз
|
data/config/locales/zh-CN.yml
CHANGED
@@ -205,7 +205,6 @@ zh-CN:
|
|
205
205
|
success: 该倡议已经发送给技术验证
|
206
206
|
update: 更新
|
207
207
|
form:
|
208
|
-
attachments: 附件
|
209
208
|
settings: 设置
|
210
209
|
title: 通告周知
|
211
210
|
index:
|
@@ -341,6 +340,9 @@ zh-CN:
|
|
341
340
|
email_outro: 您收到此通知是因为您正在关注 %{author_nickname}。您可以停止收到跟随上一个链接的通知。
|
342
341
|
email_subject: '%{author_nickname} 认可的倡议'
|
343
342
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> 倡议已被 <a href="%{author_path}">%{author_name} %{author_nickname}</a> 认可。
|
343
|
+
form:
|
344
|
+
add_attachments: www.un.org/webcast
|
345
|
+
delete_attachment: 删除
|
344
346
|
index:
|
345
347
|
title: 倡议
|
346
348
|
initiative_signatures:
|
@@ -376,6 +378,9 @@ zh-CN:
|
|
376
378
|
author_list:
|
377
379
|
hidden_authors_count:
|
378
380
|
other: 和更多 %{count} 人
|
381
|
+
committee_members:
|
382
|
+
confirm_revoke: 您确定吗?
|
383
|
+
revoke: Revoke
|
379
384
|
count:
|
380
385
|
title:
|
381
386
|
other: "%{count} 倡议"
|
@@ -446,11 +451,6 @@ zh-CN:
|
|
446
451
|
status_change_for: 倡议 %{title} 改变了其状态
|
447
452
|
last_activity:
|
448
453
|
new_initiative: 新举措
|
449
|
-
pages:
|
450
|
-
home:
|
451
|
-
highlighted_initiatives:
|
452
|
-
active_initiatives: 积极的倡议
|
453
|
-
see_all_initiatives: 查看所有倡议
|
454
454
|
show:
|
455
455
|
badge_name:
|
456
456
|
accepted: 足够的签名
|
data/config/locales/zh-TW.yml
CHANGED
@@ -282,7 +282,6 @@ zh-TW:
|
|
282
282
|
form:
|
283
283
|
authorizations: 權限設置
|
284
284
|
child_scope_threshold_enabled_help: '此配置選項不支援離線投票,它啟用子範圍並且需要一個授權處理程序將範圍與使用者關聯起來,請確認在授權設置中選擇了該授權。為了使其正常工作,範圍需要以階層方式進行配置:1個父範圍對應N個子範圍。如需了解更多有關此配置如何運作的信息,請參閱此<a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">連結</a>。'
|
285
|
-
only_global_scope_enabled_help: 若您已啟用「子範圍籤章」並將全域範圍配置為父範圍,請勾選此標誌。啟用後,建立倡議的精靈中將跳過倡議類型選擇。如需有關此配置如何運作的詳細信息,請參閱此<a href="https://docs.decidim.org/en/admin/spaces/initiatives/" target="_blank">鏈接</a>。
|
286
285
|
options: 選項
|
287
286
|
title: 一般資訊
|
288
287
|
initiative_type_scopes:
|
@@ -557,11 +556,6 @@ zh-TW:
|
|
557
556
|
status_change_for: 倡議「%{title}」的狀態已更改。
|
558
557
|
last_activity:
|
559
558
|
new_initiative: 新的倡議
|
560
|
-
pages:
|
561
|
-
home:
|
562
|
-
highlighted_initiatives:
|
563
|
-
active_initiatives: 進行中的倡議
|
564
|
-
see_all_initiatives: 查看所有倡議
|
565
559
|
show:
|
566
560
|
badge_name:
|
567
561
|
accepted: 足夠的簽署數
|
@@ -1,16 +1,31 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class FixUserGroupsIdsOnInitiatives < ActiveRecord::Migration[5.2]
|
4
|
+
class UserGroup < ApplicationRecord
|
5
|
+
self.table_name = :decidim_users
|
6
|
+
self.inheritance_column = nil # disable the default inheritance
|
7
|
+
|
8
|
+
default_scope { where(type: "Decidim::UserGroup") }
|
9
|
+
end
|
10
|
+
|
11
|
+
class Initiative < ApplicationRecord
|
12
|
+
self.table_name = :decidim_initiatives
|
13
|
+
end
|
14
|
+
|
15
|
+
class InitiativesVote < ApplicationRecord
|
16
|
+
self.table_name = :decidim_initiatives_votes
|
17
|
+
end
|
18
|
+
|
4
19
|
# rubocop:disable Rails/SkipsModelValidations
|
5
20
|
def change
|
6
|
-
|
21
|
+
UserGroup.find_each do |group|
|
7
22
|
old_id = group.extended_data["old_user_group_id"]
|
8
23
|
next unless old_id
|
9
24
|
|
10
|
-
|
25
|
+
Initiative
|
11
26
|
.where(decidim_user_group_id: old_id)
|
12
27
|
.update_all(decidim_user_group_id: group.id)
|
13
|
-
|
28
|
+
InitiativesVote
|
14
29
|
.where(decidim_user_group_id: old_id)
|
15
30
|
.update_all(decidim_user_group_id: group.id)
|
16
31
|
end
|
@@ -89,7 +89,7 @@ module Decidim
|
|
89
89
|
I18n.t("menu.initiatives", scope: "decidim"),
|
90
90
|
decidim_initiatives.initiatives_path,
|
91
91
|
position: 2.4,
|
92
|
-
active:
|
92
|
+
active: %r{^/(initiatives|create_initiative)},
|
93
93
|
if: !Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).all.empty?
|
94
94
|
end
|
95
95
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-initiatives
|
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
|
- Juan Salvador Perez Garcia
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-12-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: decidim-admin
|
@@ -16,56 +16,56 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.26.
|
19
|
+
version: 0.26.9
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.26.
|
26
|
+
version: 0.26.9
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: decidim-comments
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.26.
|
33
|
+
version: 0.26.9
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 0.26.
|
40
|
+
version: 0.26.9
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: decidim-core
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - '='
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 0.26.
|
47
|
+
version: 0.26.9
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - '='
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 0.26.
|
54
|
+
version: 0.26.9
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: decidim-verifications
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - '='
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 0.26.
|
61
|
+
version: 0.26.9
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - '='
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: 0.26.
|
68
|
+
version: 0.26.9
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: origami
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -142,28 +142,28 @@ dependencies:
|
|
142
142
|
requirements:
|
143
143
|
- - '='
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version: 0.26.
|
145
|
+
version: 0.26.9
|
146
146
|
type: :development
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - '='
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version: 0.26.
|
152
|
+
version: 0.26.9
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: decidim-meetings
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
157
|
- - '='
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: 0.26.
|
159
|
+
version: 0.26.9
|
160
160
|
type: :development
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
164
|
- - '='
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: 0.26.
|
166
|
+
version: 0.26.9
|
167
167
|
description: Citizen initiatives plugin for decidim.
|
168
168
|
email:
|
169
169
|
- jsperezg@gmail.com
|
@@ -218,6 +218,7 @@ files:
|
|
218
218
|
- app/controllers/decidim/initiatives/admin/committee_requests_controller.rb
|
219
219
|
- app/controllers/decidim/initiatives/admin/component_permissions_controller.rb
|
220
220
|
- app/controllers/decidim/initiatives/admin/components_controller.rb
|
221
|
+
- app/controllers/decidim/initiatives/admin/exports_controller.rb
|
221
222
|
- app/controllers/decidim/initiatives/admin/initiative_attachments_controller.rb
|
222
223
|
- app/controllers/decidim/initiatives/admin/initiatives_controller.rb
|
223
224
|
- app/controllers/decidim/initiatives/admin/initiatives_permissions_controller.rb
|
@@ -390,6 +391,7 @@ files:
|
|
390
391
|
- app/views/layouts/decidim/initiative_creation.html.erb
|
391
392
|
- app/views/layouts/decidim/initiative_signature_creation.html.erb
|
392
393
|
- config/assets.rb
|
394
|
+
- config/environment.rb
|
393
395
|
- config/initializers/wicked_pdf.rb
|
394
396
|
- config/locales/am-ET.yml
|
395
397
|
- config/locales/ar-SA.yml
|
@@ -457,9 +459,11 @@ files:
|
|
457
459
|
- config/locales/sk.yml
|
458
460
|
- config/locales/sl.yml
|
459
461
|
- config/locales/so-SO.yml
|
462
|
+
- config/locales/sq-AL.yml
|
460
463
|
- config/locales/sr-CS.yml
|
461
464
|
- config/locales/sv.yml
|
462
465
|
- config/locales/sw-KE.yml
|
466
|
+
- config/locales/th-TH.yml
|
463
467
|
- config/locales/ti-ER.yml
|
464
468
|
- config/locales/tr-TR.yml
|
465
469
|
- config/locales/uk.yml
|