decidim-proposals 0.28.4 → 0.28.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb +11 -11
- data/app/cells/decidim/proposals/proposal_l_cell.rb +17 -18
- data/app/controllers/decidim/proposals/proposals_controller.rb +4 -8
- data/app/forms/decidim/proposals/admin/proposal_answer_form.rb +3 -3
- data/app/forms/decidim/proposals/admin/proposal_form.rb +1 -1
- data/app/helpers/decidim/proposals/map_helper.rb +1 -1
- data/app/models/decidim/proposals/proposal.rb +2 -6
- data/app/permissions/decidim/proposals/permissions.rb +4 -3
- data/app/services/decidim/proposals/collaborative_draft_diff_renderer.rb +22 -0
- data/app/services/decidim/proposals/diff_renderer.rb +2 -0
- data/app/services/decidim/proposals/proposal_builder.rb +1 -1
- data/app/views/decidim/proposals/admin/proposals/index.html.erb +2 -2
- data/app/views/decidim/proposals/proposals/index.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/index.js.erb +12 -0
- data/app/views/decidim/proposals/proposals/show.html.erb +1 -1
- data/config/locales/ar.yml +1 -3
- data/config/locales/bg.yml +5 -7
- data/config/locales/bn-BD.yml +1 -0
- data/config/locales/bs-BA.yml +100 -0
- data/config/locales/ca.yml +5 -5
- data/config/locales/cs.yml +5 -5
- data/config/locales/de.yml +7 -7
- data/config/locales/el.yml +3 -5
- data/config/locales/es-MX.yml +3 -3
- data/config/locales/es-PY.yml +3 -3
- data/config/locales/es.yml +2 -2
- data/config/locales/eu.yml +92 -92
- data/config/locales/fi-plain.yml +3 -3
- data/config/locales/fi.yml +23 -23
- data/config/locales/fr-CA.yml +4 -6
- data/config/locales/fr.yml +3 -5
- data/config/locales/gl.yml +3 -6
- data/config/locales/he-IL.yml +4 -0
- data/config/locales/hu.yml +2 -3
- data/config/locales/id-ID.yml +9 -4
- data/config/locales/is-IS.yml +0 -7
- data/config/locales/it.yml +7 -8
- data/config/locales/ja.yml +3 -5
- data/config/locales/lt.yml +1 -3
- data/config/locales/lv.yml +5 -2
- data/config/locales/nl.yml +7 -5
- data/config/locales/no.yml +1 -4
- data/config/locales/pl.yml +2 -4
- data/config/locales/pt-BR.yml +3 -5
- data/config/locales/pt.yml +2 -4
- data/config/locales/ro-RO.yml +7 -9
- data/config/locales/ru.yml +0 -7
- data/config/locales/sk.yml +6 -3
- data/config/locales/sl.yml +0 -4
- data/config/locales/sv.yml +5 -5
- data/config/locales/tr-TR.yml +5 -7
- data/config/locales/uk.yml +1 -8
- data/config/locales/zh-CN.yml +1 -3
- data/config/locales/zh-TW.yml +3 -5
- data/decidim-proposals.gemspec +1 -1
- data/lib/decidim/api/proposal_type.rb +13 -0
- data/lib/decidim/api/proposals_type.rb +1 -3
- data/lib/decidim/proposals/proposal_serializer.rb +7 -4
- data/lib/decidim/proposals/test/factories.rb +6 -5
- data/lib/decidim/proposals/version.rb +1 -1
- metadata +24 -21
data/config/locales/nl.yml
CHANGED
@@ -92,6 +92,10 @@ nl:
|
|
92
92
|
admin:
|
93
93
|
filters:
|
94
94
|
proposals:
|
95
|
+
category_id_eq:
|
96
|
+
label: Categorie
|
97
|
+
scope_id_eq:
|
98
|
+
label: Scope
|
95
99
|
valuator_role_ids_has:
|
96
100
|
label: Toegewezen aan beoordelaar
|
97
101
|
search_placeholder:
|
@@ -101,7 +105,7 @@ nl:
|
|
101
105
|
actions:
|
102
106
|
amend: Pas aan
|
103
107
|
comment: Reactie
|
104
|
-
create:
|
108
|
+
create: Creëren
|
105
109
|
endorse: Aanbevelen
|
106
110
|
vote: Stem
|
107
111
|
vote_comment: Stem op de reactie
|
@@ -259,12 +263,10 @@ nl:
|
|
259
263
|
notification_title: Het voorstel <a href="%{resource_path}">%{resource_title}</a> is afgewezen.
|
260
264
|
proposal_update_category:
|
261
265
|
email_intro: 'Een beheerder heeft de categorie van uw voorstel "%{resource_title} bijgewerkt, bekijk het op deze pagina:'
|
262
|
-
email_outro: Je hebt deze melding ontvangen omdat je de auteur bent van het voorstel.
|
263
266
|
email_subject: De categorie van het %{resource_title} voorstel is bijgewerkt
|
264
267
|
notification_title: De categorie van het <a href="%{resource_path}">%{resource_title}</a> voorstel is bijgewerkt door een beheerder.
|
265
268
|
proposal_update_scope:
|
266
269
|
email_intro: 'Een admin heeft de reikwijdte van je voorstel "%{resource_title}" geüpdatet, bekijk het op deze pagina:'
|
267
|
-
email_outro: Je hebt deze melding ontvangen omdat je de auteur bent van het voorstel.
|
268
270
|
email_subject: Het toepassingsgebied van het %{resource_title} voorstel is bijgewerkt
|
269
271
|
notification_title: Het bereik van <a href="%{resource_path}">%{resource_title}</a> voorstel is bijgewerkt door een admin.
|
270
272
|
voting_enabled:
|
@@ -324,7 +326,7 @@ nl:
|
|
324
326
|
title: stemmen
|
325
327
|
participatory_spaces:
|
326
328
|
highlighted_proposals:
|
327
|
-
see_all: Alles zien
|
329
|
+
see_all: Alles zien
|
328
330
|
proposals:
|
329
331
|
actions:
|
330
332
|
answer_proposal: Antwoord voorstel
|
@@ -402,7 +404,7 @@ nl:
|
|
402
404
|
title: Voorstel bijwerken
|
403
405
|
update: Bijwerken
|
404
406
|
form:
|
405
|
-
attachment_legend: "(Optioneel)
|
407
|
+
attachment_legend: "(Optioneel) Voeg een bijlage toe"
|
406
408
|
created_in_meeting: Dit voorstel komt uit een vergadering
|
407
409
|
delete_attachment: Bijlage verwijderen
|
408
410
|
select_a_category: Kies een categorie
|
data/config/locales/no.yml
CHANGED
@@ -267,11 +267,8 @@
|
|
267
267
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> forslaget ble avvist.
|
268
268
|
proposal_update_category:
|
269
269
|
email_intro: 'En admin har oppdatert kategorien for forslaget ditt "%{resource_title}", sjekk det ut på denne siden:'
|
270
|
-
email_outro: Du har mottatt denne varslingen fordi du er forfatteren av forslaget.
|
271
270
|
email_subject: Forslags kategorien %{resource_title} ble oppdatert
|
272
271
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> forslags kategorien er blitt oppdatert av en administrator.
|
273
|
-
proposal_update_scope:
|
274
|
-
email_outro: Du har mottatt denne varslingen fordi du er forfatteren av forslaget.
|
275
272
|
voting_enabled:
|
276
273
|
email_intro: 'Du kan støtte forslag i %{participatory_space_title}! Begynn å delta på denne siden:'
|
277
274
|
email_outro: Du har mottatt denne varslingen fordi du følger %{participatory_space_title}. Du kan slutte å motta varsler hvis du følger den forrige lenken.
|
@@ -329,7 +326,7 @@
|
|
329
326
|
title: Støtter
|
330
327
|
participatory_spaces:
|
331
328
|
highlighted_proposals:
|
332
|
-
see_all: Vis alle
|
329
|
+
see_all: Vis alle
|
333
330
|
proposals:
|
334
331
|
actions:
|
335
332
|
answer_proposal: Svar på forslag
|
data/config/locales/pl.yml
CHANGED
@@ -138,7 +138,7 @@ pl:
|
|
138
138
|
actions:
|
139
139
|
amend: Popraw
|
140
140
|
comment: Skomentuj
|
141
|
-
create:
|
141
|
+
create: Utwórz
|
142
142
|
endorse: Rekomendacje
|
143
143
|
vote: Wspieranie
|
144
144
|
vote_comment: Poprzyj komentarz
|
@@ -328,12 +328,10 @@ pl:
|
|
328
328
|
notification_title: Propozycja <a href="%{resource_path}">%{resource_title}</a> została odrzucona.
|
329
329
|
proposal_update_category:
|
330
330
|
email_intro: 'Administrator zaktualizował kategorię Twojej propozycji "%{resource_title}", sprawdź to:'
|
331
|
-
email_outro: Otrzymałeś to powiadomienie, ponieważ jesteś autorem propozycji.
|
332
331
|
email_subject: Kategoria %{resource_title} propozycji została zaktualizowana
|
333
332
|
notification_title: Kategoria propozycji <a href="%{resource_path}">%{resource_title}</a> została zaktualizowana przez administratora.
|
334
333
|
proposal_update_scope:
|
335
334
|
email_intro: 'Administrator zaktualizował zakres Twojej propozycji „%{resource_title}”, sprawdź to na tej stronie:'
|
336
|
-
email_outro: Otrzymałeś to powiadomienie, ponieważ jesteś autorem propozycji.
|
337
335
|
email_subject: Zaktualizowano zakres propozycji %{resource_title}
|
338
336
|
notification_title: Administrator zaktualizował zakres propozycji <a href="%{resource_path}">%{resource_title}</a>.
|
339
337
|
voting_enabled:
|
@@ -396,7 +394,7 @@ pl:
|
|
396
394
|
participatory_spaces:
|
397
395
|
highlighted_proposals:
|
398
396
|
last: Ostatnie propozycje
|
399
|
-
see_all: Zobacz wszystkie propozycje
|
397
|
+
see_all: Zobacz wszystkie propozycje
|
400
398
|
proposals:
|
401
399
|
actions:
|
402
400
|
answer_proposal: Odpowiedz na propozycję
|
data/config/locales/pt-BR.yml
CHANGED
@@ -277,12 +277,10 @@ pt-BR:
|
|
277
277
|
notification_title: A proposta <a href="%{resource_path}">%{resource_title}</a> foi rejeitada.
|
278
278
|
proposal_update_category:
|
279
279
|
email_intro: 'Um administrador atualizou a categoria de sua proposta "%{resource_title}", confira:'
|
280
|
-
email_outro: Você recebeu esta notificação porque você é o autor da proposta.
|
281
280
|
email_subject: A categoria de proposta %{resource_title} foi atualizada
|
282
281
|
notification_title: A <a href="%{resource_path}">%{resource_title}</a> categoria de proposta foi atualizada por um administrador.
|
283
282
|
proposal_update_scope:
|
284
283
|
email_intro: 'Um administrador atualizou o escopo de sua proposta "%{resource_title}", confira nesta página:'
|
285
|
-
email_outro: Você recebeu esta notificação porque você é o autor da proposta.
|
286
284
|
email_subject: O escopo da proposta %{resource_title} foi atualizado
|
287
285
|
notification_title: O escopo da proposta <a href="%{resource_path}">%{resource_title}</a> foi atualizado por um administrador.
|
288
286
|
voting_enabled:
|
@@ -342,7 +340,7 @@ pt-BR:
|
|
342
340
|
title: Votos
|
343
341
|
participatory_spaces:
|
344
342
|
highlighted_proposals:
|
345
|
-
see_all: Ver todos
|
343
|
+
see_all: Ver todos
|
346
344
|
proposals:
|
347
345
|
actions:
|
348
346
|
answer_proposal: Responder proposta
|
@@ -435,7 +433,7 @@ pt-BR:
|
|
435
433
|
title: Atualizar proposta
|
436
434
|
update: Atualizar
|
437
435
|
form:
|
438
|
-
attachment_legend: "(Opcional)
|
436
|
+
attachment_legend: "(Opcional) Adicione um anexo"
|
439
437
|
created_in_meeting: Esta proposta vem de uma reunião
|
440
438
|
delete_attachment: Excluir anexo
|
441
439
|
select_a_category: Selecionar uma categoria
|
@@ -643,7 +641,7 @@ pt-BR:
|
|
643
641
|
official_proposal: Proposta oficial
|
644
642
|
published_answer: Resposta publicada
|
645
643
|
published_at: Publicado em
|
646
|
-
scope:
|
644
|
+
scope: Escopo
|
647
645
|
state: Estado
|
648
646
|
title: Título
|
649
647
|
valuator: Avaliador
|
data/config/locales/pt.yml
CHANGED
@@ -276,12 +276,10 @@ pt:
|
|
276
276
|
notification_title: A proposta <a href="%{resource_path}">%{resource_title}</a> foi rejeitada.
|
277
277
|
proposal_update_category:
|
278
278
|
email_intro: 'Um administrador atualizou a categoria da sua proposta "%{resource_title}", verifique nesta página:'
|
279
|
-
email_outro: Recebeu esta notificação porque é o autor da proposta.
|
280
279
|
email_subject: A categoria da proposta %{resource_title} foi atualizada
|
281
280
|
notification_title: A categoria da proposta <a href="%{resource_path}">%{resource_title}</a> foi atualizada por um administrador.
|
282
281
|
proposal_update_scope:
|
283
282
|
email_intro: 'Um administrador atualizou o âmbito da sua proposta "%{resource_title}". Consulte-o nesta página:'
|
284
|
-
email_outro: Recebeu esta notificação porque é o autor da proposta.
|
285
283
|
email_subject: O âmbito da proposta %{resource_title} foi atualizado
|
286
284
|
notification_title: O âmbito da proposta <a href="%{resource_path}">%{resource_title}</a> foi atualizado por um administrador.
|
287
285
|
voting_enabled:
|
@@ -341,7 +339,7 @@ pt:
|
|
341
339
|
title: Votos
|
342
340
|
participatory_spaces:
|
343
341
|
highlighted_proposals:
|
344
|
-
see_all: Ver todos
|
342
|
+
see_all: Ver todos
|
345
343
|
proposals:
|
346
344
|
actions:
|
347
345
|
answer_proposal: Responder a proposta
|
@@ -408,7 +406,7 @@ pt:
|
|
408
406
|
title: Atualizar proposta
|
409
407
|
update: Atualizar
|
410
408
|
form:
|
411
|
-
attachment_legend: "(Opcional)
|
409
|
+
attachment_legend: "(Opcional) Adicione um anexo"
|
412
410
|
created_in_meeting: Esta proposta vem de uma reunião
|
413
411
|
delete_attachment: Apagar anexo
|
414
412
|
select_a_category: Selecione uma categoria
|
data/config/locales/ro-RO.yml
CHANGED
@@ -282,12 +282,10 @@ ro:
|
|
282
282
|
notification_title: Propunerea <a href="%{resource_path}">%{resource_title}</a> a fost respinsă.
|
283
283
|
proposal_update_category:
|
284
284
|
email_intro: 'Un administrator a actualizat categoria propunerii tale „%{resource_title}", verifică modificarea în această pagină:'
|
285
|
-
email_outro: Ai primit această notificare deoarece ești autorul acestei propuneri.
|
286
285
|
email_subject: Categoria propunerii %{resource_title} a fost actualizată
|
287
286
|
notification_title: Categoria propunerii <a href="%{resource_path}">%{resource_title}</a> a fost actualizată de către un administrator.
|
288
287
|
proposal_update_scope:
|
289
288
|
email_intro: 'Un administrator a actualizat domeniul de interes al propunerii tale „%{resource_title}”, verifică modificarea în această pagină:'
|
290
|
-
email_outro: Ai primit această notificare deoarece ești autorul acestei propuneri.
|
291
289
|
email_subject: Domeniul de interes al propunerii %{resource_title} a fost actualizat
|
292
290
|
notification_title: Domeniul de interes al propunerii <a href="%{resource_path}">%{resource_title}</a> a fost actualizat de către un administrator.
|
293
291
|
voting_enabled:
|
@@ -347,7 +345,7 @@ ro:
|
|
347
345
|
title: Voturi
|
348
346
|
participatory_spaces:
|
349
347
|
highlighted_proposals:
|
350
|
-
see_all: Afișează toate propunerile
|
348
|
+
see_all: Afișează toate propunerile
|
351
349
|
proposals:
|
352
350
|
actions:
|
353
351
|
answer_proposal: Răspundeți la propunere
|
@@ -359,14 +357,14 @@ ro:
|
|
359
357
|
title: Acțiuni
|
360
358
|
admin:
|
361
359
|
actions:
|
362
|
-
preview:
|
360
|
+
preview: Previzualizați
|
363
361
|
exports:
|
364
362
|
proposal_comments: Comentarii
|
365
363
|
proposals: Propuneri
|
366
364
|
imports:
|
367
365
|
label:
|
368
|
-
answers:
|
369
|
-
proposals:
|
366
|
+
answers: Importați răspunsuri dintr-un fișier
|
367
|
+
proposals: Importați propuneri dintr-un fișier
|
370
368
|
resources:
|
371
369
|
answers:
|
372
370
|
one: răspuns la propunere
|
@@ -394,7 +392,7 @@ ro:
|
|
394
392
|
info_1: Următoarele secțiuni au fost convertite în propuneri. Acum le poți revizui și ajusta înainte de a le publica.
|
395
393
|
publish_document: Publică documentul
|
396
394
|
save_draft: Salvează ciorna
|
397
|
-
title:
|
395
|
+
title: Previzualizați textul participativ
|
398
396
|
new_import:
|
399
397
|
accepted_mime_types:
|
400
398
|
md: Markdown
|
@@ -462,7 +460,7 @@ ro:
|
|
462
460
|
comments_count: Număr de comentarii
|
463
461
|
documents: Documente
|
464
462
|
endorsements_count: Număr de susțineri
|
465
|
-
endorsers:
|
463
|
+
endorsers: Susținători
|
466
464
|
n_more_endorsers:
|
467
465
|
one: și încă 1
|
468
466
|
few: și încă %{count}
|
@@ -668,7 +666,7 @@ ro:
|
|
668
666
|
edit_draft:
|
669
667
|
discard: Renunță la această ciornă
|
670
668
|
discard_confirmation: Sigur dorești să renunți la această ciornă de propunere?
|
671
|
-
send:
|
669
|
+
send: Previzualizați
|
672
670
|
filters:
|
673
671
|
activity: Activitatea mea
|
674
672
|
all: Toate
|
data/config/locales/ru.yml
CHANGED
@@ -121,11 +121,8 @@ ru:
|
|
121
121
|
notification_title: Предложение <a href="%{resource_path}">%{resource_title}</a> было отклонено.
|
122
122
|
proposal_update_category:
|
123
123
|
email_intro: 'Администратор обновил категорию вашего предложения «%{resource_title}», проверьте её:'
|
124
|
-
email_outro: Вы получили это уведомление, потому что вы являетесь автором предложения.
|
125
124
|
email_subject: Обновлена категория предложений %{resource_title}
|
126
125
|
notification_title: Категория предложений <a href="%{resource_path}">%{resource_title}</a> была обновлена администратором.
|
127
|
-
proposal_update_scope:
|
128
|
-
email_outro: Вы получили это уведомление, потому что вы являетесь автором предложения.
|
129
126
|
voting_enabled:
|
130
127
|
email_intro: 'Теперь вы можете голосовать по предложениям в %{participatory_space_title}! Начните со страницы:'
|
131
128
|
email_outro: Вы получили это уведомление, потому что вы следите за «%{participatory_space_title}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
|
@@ -160,7 +157,6 @@ ru:
|
|
160
157
|
title: Частные примечания
|
161
158
|
proposals:
|
162
159
|
form:
|
163
|
-
attachment_legend: "(Необязательно) Прикрепить файл"
|
164
160
|
select_a_category: Выберите категорию
|
165
161
|
index:
|
166
162
|
actions: Действия
|
@@ -209,13 +205,11 @@ ru:
|
|
209
205
|
models:
|
210
206
|
proposal:
|
211
207
|
fields:
|
212
|
-
category: Категория
|
213
208
|
comments: Комментарии
|
214
209
|
id: Псевдоним
|
215
210
|
notes: Примечания
|
216
211
|
official_proposal: Служебное предложение
|
217
212
|
published_at: 'Обнародовано:'
|
218
|
-
scope: Охват
|
219
213
|
state: Cостояние
|
220
214
|
title: Заголовок
|
221
215
|
votes: Голоса
|
@@ -267,7 +261,6 @@ ru:
|
|
267
261
|
title: Обнародуйте свое предложение
|
268
262
|
show:
|
269
263
|
answer: Ответить
|
270
|
-
edit_proposal: Редактировать предложение
|
271
264
|
proposal_accepted_reason: 'Это предложение было принято, поскольку:'
|
272
265
|
proposal_in_evaluation_reason: Это предложение сейчас рассматривается
|
273
266
|
proposal_rejected_reason: 'Это предложение было отклонено, поскольку:'
|
data/config/locales/sk.yml
CHANGED
@@ -87,6 +87,10 @@ sk:
|
|
87
87
|
admin:
|
88
88
|
filters:
|
89
89
|
proposals:
|
90
|
+
category_id_eq:
|
91
|
+
label: Kategória
|
92
|
+
scope_id_eq:
|
93
|
+
label: Rozsah
|
90
94
|
valuator_role_ids_has:
|
91
95
|
label: Priradené ku hodnotiteľov
|
92
96
|
search_placeholder:
|
@@ -126,6 +130,7 @@ sk:
|
|
126
130
|
proposal_wizard_step_2_help_text: Pomocný text Sprievodcu "Porovnať" návrhu
|
127
131
|
proposal_wizard_step_3_help_text: Pomocný text Sprievodcu "Dokončiť" návrh
|
128
132
|
resources_permissions_enabled: Pre každý návrh možno nastaviť povolenia akcie
|
133
|
+
scope_id: Rozsah
|
129
134
|
threshold_per_proposal: Maximálny limit na návrh
|
130
135
|
vote_limit: Počet hlasov na užívateľa
|
131
136
|
step:
|
@@ -219,12 +224,10 @@ sk:
|
|
219
224
|
notification_title: Návrh <a href="%{resource_path}">%{resource_title} </a> bol zamietnutý.
|
220
225
|
proposal_update_category:
|
221
226
|
email_intro: 'Správca aktualizoval kategórii vášho návrhu "%{resource_title}", pozrite sa na neho:'
|
222
|
-
email_outro: Toto oznámenie ste dostali, pretože ste autorom návrhu.
|
223
227
|
email_subject: Kategória návrhov %{resource_title} bola aktualizovaná
|
224
228
|
notification_title: Kategória návrhu <a href="%{resource_path}">%{resource_title} </a> bola aktualizovaná administrátorom.
|
225
229
|
proposal_update_scope:
|
226
230
|
email_intro: 'Admin upravil rozsah Vašeho návrhu %{resource_title}, pozrite sa na to na tejto stránke:'
|
227
|
-
email_outro: Toto oznámenie ste dostali, pretože ste autorom návrhu.
|
228
231
|
email_subject: Rozsah návrhu %{resource_title} bol aktualizovaný
|
229
232
|
notification_title: Rozsah návrhu <a href="%{resource_path}">%{resource_title}</a> bol aktualizovaný administrátorom.
|
230
233
|
voting_enabled:
|
@@ -284,7 +287,7 @@ sk:
|
|
284
287
|
title: Hlasy
|
285
288
|
participatory_spaces:
|
286
289
|
highlighted_proposals:
|
287
|
-
see_all: Zobraziť všetky
|
290
|
+
see_all: Zobraziť všetky
|
288
291
|
proposals:
|
289
292
|
actions:
|
290
293
|
answer_proposal: Odpoveď na návrh
|
data/config/locales/sl.yml
CHANGED
@@ -8,15 +8,11 @@ sl:
|
|
8
8
|
admin:
|
9
9
|
filters:
|
10
10
|
proposals:
|
11
|
-
category_id_eq:
|
12
|
-
label: Kategorija
|
13
11
|
is_emendation_true:
|
14
12
|
label: Tip
|
15
13
|
values:
|
16
14
|
'false': Predlogi
|
17
15
|
'true': Amandmaji
|
18
|
-
scope_id_eq:
|
19
|
-
label: Obseg
|
20
16
|
state_eq:
|
21
17
|
values:
|
22
18
|
accepted: Sprejeto
|
data/config/locales/sv.yml
CHANGED
@@ -159,7 +159,7 @@ sv:
|
|
159
159
|
recent: Senaste
|
160
160
|
with_more_authors: Med flera författare
|
161
161
|
geocoding_enabled: Aktivera visning på karta
|
162
|
-
minimum_votes_per_user:
|
162
|
+
minimum_votes_per_user: Minst antal stöd per deltagare
|
163
163
|
new_proposal_body_template: Innehållsmall för nytt förslag
|
164
164
|
new_proposal_body_template_help: Du kan ange den förifyllda texten för nya förslag
|
165
165
|
new_proposal_help_text: Hjälptext till nya förslag
|
@@ -181,7 +181,7 @@ sv:
|
|
181
181
|
resources_permissions_enabled: Behörigheter kan ställas in för varje förslag
|
182
182
|
scope_id: Indelning
|
183
183
|
scopes_enabled: Aktivera indelningar
|
184
|
-
threshold_per_proposal:
|
184
|
+
threshold_per_proposal: Minst antal stöd per förslag
|
185
185
|
vote_limit: Max antal stöd varje deltagare kan ge
|
186
186
|
step:
|
187
187
|
amendment_creation_enabled: Skapa ändringar är aktiverat
|
@@ -319,12 +319,12 @@ sv:
|
|
319
319
|
notification_title: Förslaget <a href="%{resource_path}">%{resource_title}</a> har avslagits.
|
320
320
|
proposal_update_category:
|
321
321
|
email_intro: 'En administratör har uppdaterat kategorin för ditt förslag "%{resource_title}", ta en titt på följande sida:'
|
322
|
-
email_outro: Du har fått det här meddelandet eftersom du
|
322
|
+
email_outro: Du har fått det här meddelandet eftersom du har skrivit förslaget.
|
323
323
|
email_subject: Förslagskategorin %{resource_title} har uppdaterats
|
324
324
|
notification_title: Förslagskategorin <a href="%{resource_path}">%{resource_title}</a> har uppdaterats av en administratör.
|
325
325
|
proposal_update_scope:
|
326
326
|
email_intro: 'En administratör har uppdaterat indelningen för ditt förslag "%{resource_title}", ta en titt på följande sida:'
|
327
|
-
email_outro: Du har fått det här meddelandet eftersom du
|
327
|
+
email_outro: Du har fått det här meddelandet eftersom du har skrivit förslaget.
|
328
328
|
email_subject: Indelningen för förslaget %{resource_title} har uppdaterats
|
329
329
|
notification_title: Indelningen för förslaget <a href="%{resource_path}">%{resource_title}</a> har uppdaterats av en administratör.
|
330
330
|
voting_enabled:
|
@@ -386,7 +386,7 @@ sv:
|
|
386
386
|
title: Stöd
|
387
387
|
participatory_spaces:
|
388
388
|
highlighted_proposals:
|
389
|
-
last: Senaste
|
389
|
+
last: Senaste förslagen
|
390
390
|
see_all: Visa alla förslag
|
391
391
|
proposals:
|
392
392
|
actions:
|
data/config/locales/tr-TR.yml
CHANGED
@@ -89,7 +89,7 @@ tr:
|
|
89
89
|
'false': Teklifler
|
90
90
|
'true': Değişiklikler
|
91
91
|
scope_id_eq:
|
92
|
-
label:
|
92
|
+
label: kapsam
|
93
93
|
state_eq:
|
94
94
|
label: Durum
|
95
95
|
values:
|
@@ -140,7 +140,7 @@ tr:
|
|
140
140
|
proposal_wizard_step_3_help_text: Teklif sihirbazı "Tamamlandı" adımı yardım metni
|
141
141
|
proposal_wizard_step_4_help_text: Teklif "Yayınlama" sihirbazı yardım metni
|
142
142
|
resources_permissions_enabled: Her teklif için işlem izinleri ayarlanabilir
|
143
|
-
scope_id:
|
143
|
+
scope_id: kapsam
|
144
144
|
scopes_enabled: Kapsamlar etkinleştirildi
|
145
145
|
threshold_per_proposal: Teklif başına eşik
|
146
146
|
vote_limit: Katılımcı başına destek sınırı
|
@@ -245,12 +245,10 @@ tr:
|
|
245
245
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> teklifi reddedildi.
|
246
246
|
proposal_update_category:
|
247
247
|
email_intro: 'Bir yönetici "%{resource_title}" teklifinizin kategorisini güncelledi, bu sayfada kontrol edin:'
|
248
|
-
email_outro: Bu bildirimi, teklifin yazarı olduğunuz için aldınız.
|
249
248
|
email_subject: '%{resource_title} teklif kategorisi güncellendi'
|
250
249
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> teklif kategorisi bir yönetici tarafından güncellendi.
|
251
250
|
proposal_update_scope:
|
252
251
|
email_intro: 'Bir yönetici, "%{resource_title}" teklifinizin kapsamını güncelledi, bu sayfada göz atın:'
|
253
|
-
email_outro: Bu bildirimi, teklifin yazarı olduğunuz için aldınız.
|
254
252
|
email_subject: '%{resource_title} teklif kapsamı güncellendi'
|
255
253
|
notification_title: <a href="%{resource_path}">%{resource_title} </a> teklif kapsamı bir yönetici tarafından güncellendi.
|
256
254
|
voting_enabled:
|
@@ -310,7 +308,7 @@ tr:
|
|
310
308
|
title: Destekler
|
311
309
|
participatory_spaces:
|
312
310
|
highlighted_proposals:
|
313
|
-
see_all: Tüm teklifleri görün
|
311
|
+
see_all: Tüm teklifleri görün
|
314
312
|
proposals:
|
315
313
|
actions:
|
316
314
|
answer_proposal: Cevap önerisi
|
@@ -505,7 +503,7 @@ tr:
|
|
505
503
|
open: Aç
|
506
504
|
published: Yayınlandı
|
507
505
|
related_to: İle ilgili
|
508
|
-
scope:
|
506
|
+
scope: kapsam
|
509
507
|
search: Arama
|
510
508
|
state: Statü
|
511
509
|
withdrawn: Geri çekildi
|
@@ -578,7 +576,7 @@ tr:
|
|
578
576
|
official_proposal: Resmi teklif
|
579
577
|
published_answer: Yayınlanan cevap
|
580
578
|
published_at: Yayınlandı
|
581
|
-
scope:
|
579
|
+
scope: kapsam
|
582
580
|
state: Durum
|
583
581
|
title: Başlık
|
584
582
|
valuator: Bilirkişi
|
data/config/locales/uk.yml
CHANGED
@@ -55,7 +55,7 @@ uk:
|
|
55
55
|
components:
|
56
56
|
proposals:
|
57
57
|
actions:
|
58
|
-
create:
|
58
|
+
create: Внести
|
59
59
|
endorse: Підтримати
|
60
60
|
vote: Голосувати
|
61
61
|
withdraw: Відкликати голос
|
@@ -121,11 +121,8 @@ uk:
|
|
121
121
|
notification_title: Пропозицію <a href="%{resource_path}">%{resource_title}</a> було відхилено.
|
122
122
|
proposal_update_category:
|
123
123
|
email_intro: 'Адміністратор оновив категорію вашої пропозиції "%{resource_title}", перевірте її:'
|
124
|
-
email_outro: Ви отримали це сповіщення, оскільки ви є автором цієї пропозиції.
|
125
124
|
email_subject: Категорію пропозиції %{resource_title} було оновлено
|
126
125
|
notification_title: Адміністратор оновив категорію пропозиції <a href="%{resource_path}">%{resource_title}</a>.
|
127
|
-
proposal_update_scope:
|
128
|
-
email_outro: Ви отримали це сповіщення, оскільки ви є автором цієї пропозиції.
|
129
126
|
voting_enabled:
|
130
127
|
email_intro: 'Ви можете голосувати щодо пропозицій у %{participatory_space_title}! Почніть брати участь зі сторінки:'
|
131
128
|
email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
|
@@ -160,7 +157,6 @@ uk:
|
|
160
157
|
title: Приватні примітки
|
161
158
|
proposals:
|
162
159
|
form:
|
163
|
-
attachment_legend: "(Необов'язково) Додати вкладений файл"
|
164
160
|
select_a_category: Оберіть категорію
|
165
161
|
index:
|
166
162
|
actions: Дії
|
@@ -209,13 +205,11 @@ uk:
|
|
209
205
|
models:
|
210
206
|
proposal:
|
211
207
|
fields:
|
212
|
-
category: Категорія
|
213
208
|
comments: Коментарі
|
214
209
|
id: Псевдонім
|
215
210
|
notes: Примітки
|
216
211
|
official_proposal: Службова пропозиція
|
217
212
|
published_at: 'Оприлюднено:'
|
218
|
-
scope: Обсяг
|
219
213
|
state: Стан
|
220
214
|
title: Назва
|
221
215
|
votes: Голоси
|
@@ -267,7 +261,6 @@ uk:
|
|
267
261
|
title: Оприлюднити свою пропозицію
|
268
262
|
show:
|
269
263
|
answer: Відповісти
|
270
|
-
edit_proposal: Редагувати пропозицію
|
271
264
|
proposal_accepted_reason: 'Ця пропозиція була прийнята, тому що:'
|
272
265
|
proposal_in_evaluation_reason: Ця пропозиція розглядається
|
273
266
|
proposal_rejected_reason: 'Ця пропозиція була відхилена, оскільки:'
|
data/config/locales/zh-CN.yml
CHANGED
@@ -230,12 +230,10 @@ zh-CN:
|
|
230
230
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> 提议已被拒绝。
|
231
231
|
proposal_update_category:
|
232
232
|
email_intro: '管理员更新了您的提议 "%{resource_title}"的类别,在此页面查看:'
|
233
|
-
email_outro: 您收到此通知是因为您是提案的作者。
|
234
233
|
email_subject: '%{resource_title} 建议类别已更新'
|
235
234
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> 提议类别已被管理员更新。
|
236
235
|
proposal_update_scope:
|
237
236
|
email_intro: '管理员更新了您的提议 "%{resource_title}"的范围,在此页面查看:'
|
238
|
-
email_outro: 您收到此通知是因为您是提案的作者。
|
239
237
|
email_subject: '%{resource_title} 建议范围已更新'
|
240
238
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> 提议范围已被管理员更新。
|
241
239
|
voting_enabled:
|
@@ -294,7 +292,7 @@ zh-CN:
|
|
294
292
|
title: 支持
|
295
293
|
participatory_spaces:
|
296
294
|
highlighted_proposals:
|
297
|
-
see_all: 查看所有建议
|
295
|
+
see_all: 查看所有建议
|
298
296
|
proposals:
|
299
297
|
actions:
|
300
298
|
answer_proposal: 答复建议
|
data/config/locales/zh-TW.yml
CHANGED
@@ -94,7 +94,7 @@ zh-TW:
|
|
94
94
|
filters:
|
95
95
|
proposals:
|
96
96
|
category_id_eq:
|
97
|
-
label:
|
97
|
+
label: 類別
|
98
98
|
is_emendation_true:
|
99
99
|
label: 類別
|
100
100
|
values:
|
@@ -302,12 +302,10 @@ zh-TW:
|
|
302
302
|
notification_title: <a href="%{resource_path}">%{resource_title}</a>" 提案已經被拒絕。
|
303
303
|
proposal_update_category:
|
304
304
|
email_intro: '管理員已更新您的提案 "%{resource_title}" 的分類,請前往此頁面查看:'
|
305
|
-
email_outro: 您收到此通知是因為您是該提案的作者。
|
306
305
|
email_subject: '「%{resource_title}」提案的分類已更新'
|
307
306
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> 提案類別已由管理員更新。
|
308
307
|
proposal_update_scope:
|
309
308
|
email_intro: '一位管理員已更新您的提案"%{resource_title}" 的範圍,您可以在此頁面檢查:'
|
310
|
-
email_outro: 您收到此通知是因為您是該提案的作者。
|
311
309
|
email_subject: '%{resource_title} 提案範圍已更新'
|
312
310
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> 提案範圍已由管理員更新。
|
313
311
|
voting_enabled:
|
@@ -369,7 +367,7 @@ zh-TW:
|
|
369
367
|
title: 支援
|
370
368
|
participatory_spaces:
|
371
369
|
highlighted_proposals:
|
372
|
-
see_all: 檢視所有提案
|
370
|
+
see_all: 檢視所有提案
|
373
371
|
proposals:
|
374
372
|
actions:
|
375
373
|
answer_proposal: 回覆提案
|
@@ -697,7 +695,7 @@ zh-TW:
|
|
697
695
|
models:
|
698
696
|
proposal:
|
699
697
|
fields:
|
700
|
-
category:
|
698
|
+
category: 類別
|
701
699
|
comments: 評論
|
702
700
|
id: ID
|
703
701
|
notes: 備註
|
data/decidim-proposals.gemspec
CHANGED
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
|
|
10
10
|
s.version = Decidim::Proposals.version
|
11
11
|
s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
|
12
12
|
s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
|
13
|
-
s.license = "AGPL-3.0"
|
13
|
+
s.license = "AGPL-3.0-or-later"
|
14
14
|
s.homepage = "https://decidim.org"
|
15
15
|
s.metadata = {
|
16
16
|
"bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
|
@@ -51,6 +51,19 @@ module Decidim
|
|
51
51
|
current_component = object.component
|
52
52
|
object.proposal_votes_count unless current_component.current_settings.votes_hidden?
|
53
53
|
end
|
54
|
+
|
55
|
+
def self.authorized?(object, context)
|
56
|
+
context[:proposal] = object
|
57
|
+
|
58
|
+
chain = [
|
59
|
+
allowed_to?(:read, :proposal, object, context),
|
60
|
+
object.published?
|
61
|
+
].all?
|
62
|
+
|
63
|
+
super && chain
|
64
|
+
rescue Decidim::PermissionAction::PermissionNotSetError
|
65
|
+
false
|
66
|
+
end
|
54
67
|
end
|
55
68
|
end
|
56
69
|
end
|
@@ -16,9 +16,7 @@ module Decidim
|
|
16
16
|
end
|
17
17
|
end
|
18
18
|
|
19
|
-
class ProposalsType < Decidim::
|
20
|
-
implements Decidim::Core::ComponentInterface
|
21
|
-
|
19
|
+
class ProposalsType < Decidim::Core::ComponentType
|
22
20
|
graphql_name "Proposals"
|
23
21
|
description "A proposals component of a participatory space."
|
24
22
|
|
@@ -44,7 +44,8 @@ module Decidim
|
|
44
44
|
reference: proposal.reference,
|
45
45
|
answer: ensure_translatable(proposal.answer),
|
46
46
|
answered_at: proposal.answered_at,
|
47
|
-
supports: proposal.proposal_votes_count
|
47
|
+
supports: (proposal.proposal_votes_count unless
|
48
|
+
proposal.component.current_settings.votes_hidden?),
|
48
49
|
endorsements: {
|
49
50
|
total_count: proposal.endorsements.size,
|
50
51
|
user_endorsements:
|
@@ -130,7 +131,7 @@ module Decidim
|
|
130
131
|
|
131
132
|
def author_url(author)
|
132
133
|
if author.respond_to?(:nickname)
|
133
|
-
profile_url(author
|
134
|
+
profile_url(author) # is a Decidim::User or Decidim::UserGroup
|
134
135
|
elsif author.respond_to?(:title)
|
135
136
|
meeting_url(author) # is a Decidim::Meetings::Meeting
|
136
137
|
else
|
@@ -138,8 +139,10 @@ module Decidim
|
|
138
139
|
end
|
139
140
|
end
|
140
141
|
|
141
|
-
def profile_url(
|
142
|
-
|
142
|
+
def profile_url(author)
|
143
|
+
return "" if author.respond_to?(:deleted?) && author.deleted?
|
144
|
+
|
145
|
+
Decidim::Core::Engine.routes.url_helpers.profile_url(author.nickname, host:)
|
143
146
|
end
|
144
147
|
|
145
148
|
def meeting_url(meeting)
|