decidim-proposals 0.25.2 → 0.26.0.rc1
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/collaborative_draft_m_cell.rb +1 -1
- data/app/cells/decidim/proposals/cost_report_cell.rb +3 -3
- data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb +1 -1
- data/app/cells/decidim/proposals/proposal_m_cell.rb +4 -5
- data/app/cells/decidim/proposals/proposals_picker_cell.rb +7 -5
- data/app/commands/decidim/proposals/update_proposal.rb +3 -2
- data/app/controllers/concerns/decidim/proposals/orderable.rb +21 -8
- data/app/controllers/decidim/proposals/admin/proposals_merges_controller.rb +4 -1
- data/app/controllers/decidim/proposals/admin/proposals_splits_controller.rb +4 -1
- data/app/controllers/decidim/proposals/proposals_controller.rb +2 -2
- data/app/events/decidim/proposals/proposal_mentioned_event.rb +8 -0
- data/app/events/decidim/proposals/publish_proposal_event.rb +26 -0
- data/app/forms/decidim/proposals/admin/proposals_file_import_form.rb +31 -0
- data/app/forms/decidim/proposals/admin/proposals_fork_form.rb +8 -3
- data/app/helpers/decidim/proposals/application_helper.rb +1 -6
- data/app/helpers/decidim/proposals/map_helper.rb +1 -1
- data/app/helpers/decidim/proposals/proposals_helper.rb +1 -1
- data/app/models/decidim/proposals/proposal.rb +3 -2
- data/app/packs/src/decidim/proposals/admin/proposals_picker.js +15 -0
- data/app/presenters/decidim/proposals/proposal_presenter.rb +2 -48
- data/app/queries/decidim/proposals/similar_proposals.rb +1 -1
- data/app/services/decidim/proposals/proposal_search.rb +9 -4
- data/app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb +11 -0
- data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb +7 -2
- data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +1 -1
- data/app/views/decidim/proposals/collaborative_drafts/_filters_small_view.html.erb +3 -3
- data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +2 -2
- data/app/views/decidim/proposals/proposals/_filters.html.erb +2 -0
- data/app/views/decidim/proposals/proposals/_filters_small_view.html.erb +3 -3
- data/app/views/decidim/proposals/proposals/_proposals.html.erb +18 -0
- data/app/views/decidim/proposals/proposals/index.html.erb +0 -5
- data/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb +2 -2
- data/config/brakeman.ignore +88 -0
- data/config/locales/ar.yml +0 -5
- data/config/locales/bg.yml +0 -2
- data/config/locales/ca.yml +1 -5
- data/config/locales/cs.yml +60 -5
- data/config/locales/de.yml +0 -5
- data/config/locales/el.yml +0 -5
- data/config/locales/en.yml +57 -6
- data/config/locales/es-MX.yml +0 -5
- data/config/locales/es-PY.yml +0 -5
- data/config/locales/es.yml +56 -5
- data/config/locales/eu.yml +38 -5
- data/config/locales/fi-plain.yml +54 -5
- data/config/locales/fi.yml +56 -5
- data/config/locales/fr-CA.yml +55 -5
- data/config/locales/fr.yml +55 -5
- data/config/locales/gl.yml +53 -5
- data/config/locales/hu.yml +0 -5
- data/config/locales/id-ID.yml +0 -4
- data/config/locales/is-IS.yml +0 -2
- data/config/locales/it.yml +13 -5
- data/config/locales/ja.yml +66 -18
- data/config/locales/lv.yml +0 -5
- data/config/locales/nl.yml +57 -5
- data/config/locales/no.yml +0 -5
- data/config/locales/pl.yml +0 -5
- data/config/locales/pt-BR.yml +1 -6
- data/config/locales/pt.yml +37 -5
- data/config/locales/ro-RO.yml +57 -6
- data/config/locales/ru.yml +0 -2
- data/config/locales/sk.yml +0 -5
- data/config/locales/sr-CS.yml +0 -1
- data/config/locales/sv.yml +54 -5
- data/config/locales/tr-TR.yml +0 -5
- data/config/locales/uk.yml +0 -2
- data/config/locales/val-ES.yml +1 -0
- data/config/locales/zh-CN.yml +0 -5
- data/lib/decidim/proposals/component.rb +37 -4
- data/lib/decidim/proposals/import/proposal_answer_creator.rb +95 -0
- data/lib/decidim/proposals/import/proposal_creator.rb +124 -0
- data/lib/decidim/proposals/import/proposals_answers_verifier.rb +29 -0
- data/lib/decidim/proposals/import/proposals_verifier.rb +16 -0
- data/lib/decidim/proposals/import.rb +12 -0
- data/lib/decidim/proposals/proposal_serializer.rb +6 -3
- data/lib/decidim/proposals/test/factories.rb +1 -9
- data/lib/decidim/proposals/version.rb +1 -1
- data/lib/decidim/proposals.rb +1 -1
- metadata +32 -24
- data/lib/decidim/proposals/proposal_creator.rb +0 -98
@@ -1,3 +1,11 @@
|
|
1
|
+
<% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
|
2
|
+
<div class="callout warning">
|
3
|
+
<%= t("decidim.proposals.proposals.index.text_banner",
|
4
|
+
go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[state_withdraw]" => nil)),
|
5
|
+
).html_safe %>
|
6
|
+
</div>
|
7
|
+
<% end %>
|
8
|
+
|
1
9
|
<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
|
2
10
|
<div class="column">
|
3
11
|
<%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
|
@@ -26,3 +34,13 @@
|
|
26
34
|
</div>
|
27
35
|
</div>
|
28
36
|
<%= decidim_paginate @proposals %>
|
37
|
+
|
38
|
+
<div class="row">
|
39
|
+
<div class="text-right">
|
40
|
+
<% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
|
41
|
+
<%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[state_withdraw]" => nil) %>
|
42
|
+
<% else %>
|
43
|
+
<%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { state_withdraw: "withdrawn", state: [""] }) %>
|
44
|
+
<% end %>
|
45
|
+
</div>
|
46
|
+
</div>
|
@@ -6,9 +6,9 @@
|
|
6
6
|
<p>
|
7
7
|
<%= link_to resource_locator(proposal).path do %>
|
8
8
|
<% if proposal.participatory_text_level == "article" %>
|
9
|
-
<u><%= decidim_html_escape(present(proposal).title)
|
9
|
+
<u><%= decidim_html_escape(present(proposal).title) %></u>
|
10
10
|
<% else %>
|
11
|
-
<u><%= decidim_html_escape(present(proposal).title)
|
11
|
+
<u><%= decidim_html_escape(present(proposal).title) %></u>
|
12
12
|
<% end %>
|
13
13
|
<br>
|
14
14
|
<% end %>
|
@@ -0,0 +1,88 @@
|
|
1
|
+
{
|
2
|
+
"ignored_warnings": [
|
3
|
+
{
|
4
|
+
"warning_type": "Cross-Site Scripting",
|
5
|
+
"warning_code": 2,
|
6
|
+
"fingerprint": "7568599cc8af59b10939f6617f52763f2df32bba7474f9df063d71c803e95e32",
|
7
|
+
"check_name": "CrossSiteScripting",
|
8
|
+
"message": "Unescaped parameter value",
|
9
|
+
"file": "app/views/decidim/proposals/proposals/show.html.erb",
|
10
|
+
"line": 59,
|
11
|
+
"link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
|
12
|
+
"code": "cell(\"decidim/proposals/proposal_m\", Proposal.published.not_hidden.where(:component => current_component).find_by(:id => params[:id]), :full_badge => true).badge",
|
13
|
+
"render_path": [
|
14
|
+
{
|
15
|
+
"type": "controller",
|
16
|
+
"class": "Decidim::Proposals::ProposalsController",
|
17
|
+
"method": "show",
|
18
|
+
"line": 62,
|
19
|
+
"file": "app/controllers/decidim/proposals/proposals_controller.rb",
|
20
|
+
"rendered": {
|
21
|
+
"name": "decidim/proposals/proposals/show",
|
22
|
+
"file": "app/views/decidim/proposals/proposals/show.html.erb"
|
23
|
+
}
|
24
|
+
}
|
25
|
+
],
|
26
|
+
"location": {
|
27
|
+
"type": "template",
|
28
|
+
"template": "decidim/proposals/proposals/show"
|
29
|
+
},
|
30
|
+
"user_input": "params[:id]",
|
31
|
+
"confidence": "Weak",
|
32
|
+
"note": ""
|
33
|
+
},
|
34
|
+
{
|
35
|
+
"warning_type": "Cross-Site Scripting",
|
36
|
+
"warning_code": 2,
|
37
|
+
"fingerprint": "7d03debd980da201727e8648772750aab0445ea0eb5426f1aea2c8e560e5c458",
|
38
|
+
"check_name": "CrossSiteScripting",
|
39
|
+
"message": "Unescaped parameter value",
|
40
|
+
"file": "app/views/decidim/proposals/collaborative_drafts/show.html.erb",
|
41
|
+
"line": 34,
|
42
|
+
"link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
|
43
|
+
"code": "cell(\"decidim/proposals/collaborative_draft_m\", CollaborativeDraft.not_hidden.where(:component => current_component).find_by(:id => params[:id]), :full_badge => true).badge",
|
44
|
+
"render_path": [
|
45
|
+
{
|
46
|
+
"type": "controller",
|
47
|
+
"class": "Decidim::Proposals::CollaborativeDraftsController",
|
48
|
+
"method": "show",
|
49
|
+
"line": 43,
|
50
|
+
"file": "app/controllers/decidim/proposals/collaborative_drafts_controller.rb",
|
51
|
+
"rendered": {
|
52
|
+
"name": "decidim/proposals/collaborative_drafts/show",
|
53
|
+
"file": "app/views/decidim/proposals/collaborative_drafts/show.html.erb"
|
54
|
+
}
|
55
|
+
}
|
56
|
+
],
|
57
|
+
"location": {
|
58
|
+
"type": "template",
|
59
|
+
"template": "decidim/proposals/collaborative_drafts/show"
|
60
|
+
},
|
61
|
+
"user_input": "params[:id]",
|
62
|
+
"confidence": "Weak",
|
63
|
+
"note": ""
|
64
|
+
},
|
65
|
+
{
|
66
|
+
"warning_type": "Mass Assignment",
|
67
|
+
"warning_code": 70,
|
68
|
+
"fingerprint": "8eeee9ad33162a80c7cf7a87d597f4cc108b0874d40ddabd1f5241f460a9519a",
|
69
|
+
"check_name": "MassAssignment",
|
70
|
+
"message": "Specify exact keys allowed for mass assignment instead of using `permit!` which allows any keys",
|
71
|
+
"file": "app/controllers/decidim/proposals/admin/participatory_texts_controller.rb",
|
72
|
+
"line": 50,
|
73
|
+
"link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
|
74
|
+
"code": "params.require(:preview_participatory_text).permit!",
|
75
|
+
"render_path": null,
|
76
|
+
"location": {
|
77
|
+
"type": "method",
|
78
|
+
"class": "Decidim::Proposals::Admin::ParticipatoryTextsController",
|
79
|
+
"method": "update"
|
80
|
+
},
|
81
|
+
"user_input": null,
|
82
|
+
"confidence": "Medium",
|
83
|
+
"note": ""
|
84
|
+
}
|
85
|
+
],
|
86
|
+
"updated": "2021-10-05 05:32:00 +0000",
|
87
|
+
"brakeman_version": "5.1.1"
|
88
|
+
}
|
data/config/locales/ar.yml
CHANGED
@@ -107,7 +107,6 @@ ar:
|
|
107
107
|
name: اقتراحات
|
108
108
|
settings:
|
109
109
|
global:
|
110
|
-
allow_card_image: السماح بالبطاقة الصورية
|
111
110
|
amendments_enabled: تم تمكين التعديلات
|
112
111
|
announcement: إعلان
|
113
112
|
attachments_allowed: السماح للمرفقات
|
@@ -137,7 +136,6 @@ ar:
|
|
137
136
|
announcement: إعلان
|
138
137
|
automatic_hashtags: علامات التصنيف المضافة إلى جميع المقترحات
|
139
138
|
comments_blocked: تم حظر التعليقات
|
140
|
-
creation_enabled: تمكين إنشاء الاقتراح
|
141
139
|
endorsements_blocked: المصادقة المحظورة
|
142
140
|
endorsements_enabled: تم التصديق
|
143
141
|
proposal_answering_enabled: تم تمكين الرد على الاقتراح
|
@@ -214,7 +212,6 @@ ar:
|
|
214
212
|
email_intro: تمت إضافة الاقتراح "%{resource_title}" إلى "%{participatory_space_title}" الذي تتابعه.
|
215
213
|
email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{participatory_space_title}". يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
|
216
214
|
email_subject: تمت إضافة اقتراح جديد "%{resource_title}" إلى %{participatory_space_title}
|
217
|
-
notification_title: تمت إضافة الاقتراح <a href="%{resource_path}">%{resource_title}</a> إلى %{participatory_space_title}
|
218
215
|
proposal_rejected:
|
219
216
|
affected_user:
|
220
217
|
email_intro: 'تم رفض اقتراحك "%{resource_title}". يمكنك قراءة الإجابة في هذه الصفحة:'
|
@@ -420,11 +417,9 @@ ar:
|
|
420
417
|
select_states: تحقق من حالة مقترحات الاستيراد
|
421
418
|
proposals_merges:
|
422
419
|
create:
|
423
|
-
invalid: كانت هناك مشكلة في دمج المقترحات المحددة.
|
424
420
|
success: دمج المقترحات بنجاح في واحدة جديدة.
|
425
421
|
proposals_splits:
|
426
422
|
create:
|
427
|
-
invalid: كانت هناك مشكلة في تقسيم المقترحات المحددة.
|
428
423
|
success: تم تقسيم المقترحات بنجاح إلى مقترحات جديدة.
|
429
424
|
valuation_assignments:
|
430
425
|
create:
|
data/config/locales/bg.yml
CHANGED
@@ -95,7 +95,6 @@ bg:
|
|
95
95
|
name: Предложения
|
96
96
|
settings:
|
97
97
|
global:
|
98
|
-
allow_card_image: Позволи изображение на карта
|
99
98
|
amendments_enabled: Поправките са разрешени
|
100
99
|
amendments_enabled_help: Ако е активно, конфигурирайте свойствата на измененията за всяка стъпка.
|
101
100
|
amendments_wizard_help_text: Помощен текст на съветника за изменения
|
@@ -139,7 +138,6 @@ bg:
|
|
139
138
|
answers_with_costs: Активиране на "тежест" за отговорите на предложение
|
140
139
|
automatic_hashtags: Добавени са хаштагове на всички предложения
|
141
140
|
comments_blocked: Коментарите са блокирани
|
142
|
-
creation_enabled: Създаването на предложения е разрешено
|
143
141
|
endorsements_blocked: Одобряване забранено
|
144
142
|
endorsements_enabled: Одобряване разрешено
|
145
143
|
proposal_answering_enabled: Отговора на предложение е разрешен
|
data/config/locales/ca.yml
CHANGED
@@ -125,7 +125,6 @@ ca:
|
|
125
125
|
name: Propostes
|
126
126
|
settings:
|
127
127
|
global:
|
128
|
-
allow_card_image: Permetre targeta amb imatge
|
129
128
|
amendments_enabled: Esmenes habilitades
|
130
129
|
amendments_enabled_help: Si l'actives, configura les funcionalitats de l'esmena per cada fase.
|
131
130
|
amendments_wizard_help_text: Text d'ajuda al crear una nova esmena
|
@@ -176,7 +175,6 @@ ca:
|
|
176
175
|
answers_with_costs: Habilitar cost en les respostes a propostes
|
177
176
|
automatic_hashtags: Hashtags afegits a totes les propostes
|
178
177
|
comments_blocked: Comentaris bloquejats
|
179
|
-
creation_enabled: Habilitar la creació de propostes
|
180
178
|
endorsements_blocked: Adhesions bloquejades
|
181
179
|
endorsements_enabled: Adhesions habilitades
|
182
180
|
proposal_answering_enabled: Resposta a propostes activada
|
@@ -269,7 +267,7 @@ ca:
|
|
269
267
|
email_intro: La proposta "%{resource_title}" s'ha afegit a "%{participatory_space_title}", que segueixes.
|
270
268
|
email_outro: Has rebut aquesta notificació perquè estàs seguint "%{participatory_space_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
|
271
269
|
email_subject: Nova proposta "%{resource_title}" afegida a %{participatory_space_title}
|
272
|
-
notification_title:
|
270
|
+
notification_title: '%{author} ha afegit la proposta <a href="%{resource_path}">%{resource_title}</a> a %{participatory_space_title}'
|
273
271
|
proposal_rejected:
|
274
272
|
affected_user:
|
275
273
|
email_intro: 'La teva proposta "%{resource_title}" ha estat rebutjada. Pots llegir la resposta en aquesta pàgina:'
|
@@ -509,11 +507,9 @@ ca:
|
|
509
507
|
title: Importar propostes
|
510
508
|
proposals_merges:
|
511
509
|
create:
|
512
|
-
invalid: S'ha produït un error en fusionar les propostes seleccionades.
|
513
510
|
success: S'han combinat amb èxit les propostes en una de nova.
|
514
511
|
proposals_splits:
|
515
512
|
create:
|
516
|
-
invalid: S'ha produït un error en dividir les propostes seleccionades.
|
517
513
|
success: Les propostes s'han dividit en d'altres de noves correctament.
|
518
514
|
valuation_assignments:
|
519
515
|
create:
|
data/config/locales/cs.yml
CHANGED
@@ -57,6 +57,16 @@ cs:
|
|
57
57
|
identical: A název nemůže být totožný
|
58
58
|
title:
|
59
59
|
identical: Tělo A nemůže být totožné
|
60
|
+
proposals_merge:
|
61
|
+
attributes:
|
62
|
+
base:
|
63
|
+
not_official: Nejsou oficiální
|
64
|
+
supported: Obdrželi podporu nebo potvrzení
|
65
|
+
proposals_split:
|
66
|
+
attributes:
|
67
|
+
base:
|
68
|
+
not_official: Nejsou oficiální
|
69
|
+
supported: Obdrželi podporu nebo potvrzení
|
60
70
|
models:
|
61
71
|
decidim/proposals/accepted_proposal_event: Návrh byl akceptován
|
62
72
|
decidim/proposals/admin/update_proposal_category_event: Kategorie nabídky se změnila
|
@@ -133,7 +143,6 @@ cs:
|
|
133
143
|
name: Návrhy
|
134
144
|
settings:
|
135
145
|
global:
|
136
|
-
allow_card_image: Povolit obrázek karty
|
137
146
|
amendments_enabled: Pozměňovací návrhy povoleny
|
138
147
|
amendments_enabled_help: Pokud je aktivní, nastavte funkce změny pro každý krok.
|
139
148
|
amendments_wizard_help_text: Nápověda průvodce k Pozměňovacím návrhům
|
@@ -143,6 +152,17 @@ cs:
|
|
143
152
|
collaborative_drafts_enabled: Společné koncepty povoleny
|
144
153
|
comments_enabled: Komentáře povoleny
|
145
154
|
comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
|
155
|
+
default_sort_order: Výchozí řazení návrhu
|
156
|
+
default_sort_order_help: Výchozí znamená, že pokud jsou podporované funkce povoleny, budou návrhy zobrazeny náhodně, a pokud jsou opory blokovány, pak budou seřazeny podle nejpodporovanější.
|
157
|
+
default_sort_order_options:
|
158
|
+
default: Výchozí
|
159
|
+
most_commented: Nejvíce komentované
|
160
|
+
most_endorsed: Nejvíce schvalované
|
161
|
+
most_followed: Nejvíce sledované
|
162
|
+
most_voted: Nejvíce podporované
|
163
|
+
random: Náhodně
|
164
|
+
recent: Nedávné
|
165
|
+
with_more_authors: S více autory
|
146
166
|
geocoding_enabled: Geokódování povoleno
|
147
167
|
minimum_votes_per_user: Minimální počet hlasů na uživatele
|
148
168
|
new_proposal_body_template: Šablona těla nového návrhu
|
@@ -184,7 +204,18 @@ cs:
|
|
184
204
|
answers_with_costs: Povolit finanční náklady v odpovědích k návrhu
|
185
205
|
automatic_hashtags: Do všech návrhů byly přidány značky Hashtags
|
186
206
|
comments_blocked: Komentáře byly blokovány
|
187
|
-
creation_enabled:
|
207
|
+
creation_enabled: Účastníci mohou vytvářet návrhy
|
208
|
+
default_sort_order: Výchozí řazení návrhu
|
209
|
+
default_sort_order_help: Výchozí znamená, že pokud jsou podporované funkce povoleny, budou návrhy zobrazeny náhodně, a pokud jsou opory blokovány, pak budou seřazeny podle nejpodporovanější.
|
210
|
+
default_sort_order_options:
|
211
|
+
default: Výchozí
|
212
|
+
most_commented: Nejvíce komentované
|
213
|
+
most_endorsed: Nejvíce schvalované
|
214
|
+
most_followed: Nejvíce sledované
|
215
|
+
most_voted: Nejvíce podporované
|
216
|
+
random: Náhodně
|
217
|
+
recent: Nedávné
|
218
|
+
with_more_authors: S více autory
|
188
219
|
endorsements_blocked: Schvalování blokováno
|
189
220
|
endorsements_enabled: Schvalování povoleno
|
190
221
|
proposal_answering_enabled: Odpovídání návrhu je povoleno
|
@@ -277,7 +308,7 @@ cs:
|
|
277
308
|
email_intro: Návrh "%{resource_title}" byl přidán k "%{participatory_space_title}", který sledujete.
|
278
309
|
email_outro: Toto oznámení jste obdrželi, protože jste sledovali "%{participatory_space_title}". Můžete jej odhlásit od předchozího odkazu.
|
279
310
|
email_subject: Nový návrh "%{resource_title}" byl přidán k %{participatory_space_title}
|
280
|
-
notification_title: Návrh <a href="%{resource_path}">%{resource_title}</a> byl přidán do %{participatory_space_title}
|
311
|
+
notification_title: Návrh <a href="%{resource_path}">%{resource_title}</a> byl přidán do %{participatory_space_title} uživatelem %{author}
|
281
312
|
proposal_rejected:
|
282
313
|
affected_user:
|
283
314
|
email_intro: 'Váš návrh "%{resource_title}" byl zamítnut. Odpověď můžete číst na této stránce:'
|
@@ -374,6 +405,27 @@ cs:
|
|
374
405
|
exports:
|
375
406
|
proposal_comments: Komentáře
|
376
407
|
proposals: Návrhy
|
408
|
+
imports:
|
409
|
+
help:
|
410
|
+
answers: 'Importní dokument by měl obsahovat následující sloupce: id, state (accepted, evaluating, rejected), answer/cs (a další jazyky povolené pro organizaci).'
|
411
|
+
proposals: Soubor musí mít názvy sloupců title/en a body/en (nebo jiné lokalizace, které dáváte. title/cs a body/cs). Podporovány jsou také sloupce pro scope/id a category/id.
|
412
|
+
label:
|
413
|
+
answers: Importovat odpovědi ze souboru
|
414
|
+
proposals: Importovat návrhy ze souboru
|
415
|
+
resources:
|
416
|
+
answers:
|
417
|
+
one: odpověď na návrh
|
418
|
+
few: odpovědi na návrh
|
419
|
+
many: odpovědí na návrh
|
420
|
+
other: odpovědi na návrh
|
421
|
+
proposals:
|
422
|
+
one: návrh
|
423
|
+
few: návrhy
|
424
|
+
many: návrhů
|
425
|
+
other: návrhy
|
426
|
+
title:
|
427
|
+
answers: Importovat odpovědi návrhu
|
428
|
+
proposals: Importovat návrhy
|
377
429
|
models:
|
378
430
|
proposal:
|
379
431
|
name: Návrh
|
@@ -519,11 +571,11 @@ cs:
|
|
519
571
|
title: Importovat návrhy
|
520
572
|
proposals_merges:
|
521
573
|
create:
|
522
|
-
invalid: Při
|
574
|
+
invalid: 'Při slučování vybraných návrhů došlo k chybě, protože některé z nich:'
|
523
575
|
success: Projekty byly úspěšně sloučeny do nové.
|
524
576
|
proposals_splits:
|
525
577
|
create:
|
526
|
-
invalid:
|
578
|
+
invalid: 'Vyskytl se problém s rozdělením vybraných návrhů, protože některé z nich:'
|
527
579
|
success: Úspěšně rozdělil návrhy na nové.
|
528
580
|
valuation_assignments:
|
529
581
|
create:
|
@@ -769,9 +821,12 @@ cs:
|
|
769
821
|
filter_by: Filtrovat podle
|
770
822
|
unfold: Rozvinout
|
771
823
|
index:
|
824
|
+
click_here: Zobrazit všechny návrhy
|
772
825
|
collaborative_drafts_list: Přístup ke konceptům spolupráce
|
773
826
|
new_proposal: Nový návrh
|
827
|
+
see_all: Zobrazit všechny návrhy
|
774
828
|
see_all_withdrawn: Podívejte se na všechny stažené návrhy
|
829
|
+
text_banner: Zobrazujete seznam návrhů stažených jejich autory. %{go_back_link}.
|
775
830
|
view_proposal: Zobrazit návrh
|
776
831
|
linked_proposals:
|
777
832
|
proposal_votes:
|
data/config/locales/de.yml
CHANGED
@@ -125,7 +125,6 @@ de:
|
|
125
125
|
name: Vorschläge
|
126
126
|
settings:
|
127
127
|
global:
|
128
|
-
allow_card_image: Kartenbild zulassen
|
129
128
|
amendments_enabled: Änderungsvorschläge aktiviert
|
130
129
|
amendments_enabled_help: Wenn aktiviert, konfigurieren Sie Änderungsmerkmale für jeden Schritt.
|
131
130
|
amendments_wizard_help_text: Hilfetext für Änderungsassistent
|
@@ -176,7 +175,6 @@ de:
|
|
176
175
|
answers_with_costs: Kosten für Vorschlagsantworten aktivieren
|
177
176
|
automatic_hashtags: Hashtags wurden allen Vorschlägen hinzugefügt
|
178
177
|
comments_blocked: Kommentare blockiert
|
179
|
-
creation_enabled: Vorschlagserstellung aktiviert
|
180
178
|
endorsements_blocked: Zustimmungen blockiert
|
181
179
|
endorsements_enabled: Bestätigungen aktiviert
|
182
180
|
proposal_answering_enabled: Vorschlagsantworten aktiviert
|
@@ -269,7 +267,6 @@ de:
|
|
269
267
|
email_intro: Der Vorschlag "%{resource_title}" wurde zu "%{participatory_space_title}" hinzugefügt, welchem Sie folgen.
|
270
268
|
email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie "%{participatory_space_title}" folgen. Sie können den Erhalt von Benachrichtigungen über den vorherigen Link beenden.
|
271
269
|
email_subject: Neuer Vorschlag "%{resource_title}" zu %{participatory_space_title} hinzugefügt
|
272
|
-
notification_title: Der Vorschlag <a href="%{resource_path}">%{resource_title}</a> wurde zu %{participatory_space_title} hinzugefügt
|
273
270
|
proposal_rejected:
|
274
271
|
affected_user:
|
275
272
|
email_intro: 'Ihr Vorschlag "%{resource_title}" wurde abgelehnt. Sie können die Antwort auf dieser Seite lesen:'
|
@@ -509,11 +506,9 @@ de:
|
|
509
506
|
title: Vorschläge importieren
|
510
507
|
proposals_merges:
|
511
508
|
create:
|
512
|
-
invalid: Beim Zusammenführen der ausgewählten Vorschläge ist ein Fehler aufgetreten.
|
513
509
|
success: Erfolgreich die Vorschläge in eine neue zusammengeführt.
|
514
510
|
proposals_splits:
|
515
511
|
create:
|
516
|
-
invalid: Beim Teilen der ausgewählten Vorschläge ist ein Fehler aufgetreten.
|
517
512
|
success: Die Vorschläge wurden erfolgreich in neue aufgeteilt.
|
518
513
|
valuation_assignments:
|
519
514
|
create:
|
data/config/locales/el.yml
CHANGED
@@ -97,7 +97,6 @@ el:
|
|
97
97
|
name: Προτάσεις
|
98
98
|
settings:
|
99
99
|
global:
|
100
|
-
allow_card_image: Να επιτρέπεται η εικόνα κάρτας
|
101
100
|
amendments_enabled: Οι τροποποιήσεις ενεργοποιήθηκαν
|
102
101
|
amendments_enabled_help: Εάν είναι ενεργό, διαμορφώστε τα χαρακτηριστικά Τροποποίησης για κάθε βήμα.
|
103
102
|
amendments_wizard_help_text: Κείμενο βοήθειας για τον Οδηγό τροποποιήσεων
|
@@ -141,7 +140,6 @@ el:
|
|
141
140
|
answers_with_costs: Ενεργοποιήστε το κόστος στις απαντήσεις της πρότασης
|
142
141
|
automatic_hashtags: Προστέθηκαν hashtag σε όλες τις προτάσεις
|
143
142
|
comments_blocked: Τα σχόλια αποκλείστηκαν
|
144
|
-
creation_enabled: Η δημιουργία πρότασης ενεργοποιήθηκε
|
145
143
|
endorsements_blocked: Επιδοκιμασίες αποκλεισμένες
|
146
144
|
endorsements_enabled: Επιδοκιμασίες ενεργοποιημένες
|
147
145
|
proposal_answering_enabled: Η απάντηση στην πρόταση ενεργοποιήθηκε
|
@@ -234,7 +232,6 @@ el:
|
|
234
232
|
email_intro: Η πρόταση «%{resource_title}» προστέθηκε στον χώρο συμμετοχής «%{participatory_space_title}» που ακολουθείτε.
|
235
233
|
email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον χώρο συμμετοχής «%{participatory_space_title}». Μπορείτε να διακόψετε τη λήψη ειδοποιήσεων ακολουθώντας τον προηγούμενο σύνδεσμο.
|
236
234
|
email_subject: Η νέα πρόταση «%{resource_title}» προστέθηκε στον χώρο συμμετοχής %{participatory_space_title}
|
237
|
-
notification_title: Η πρόταση <a href="%{resource_path}">%{resource_title}</a> προστέθηκε στον χώρο συμμετοχής %{participatory_space_title}
|
238
235
|
proposal_rejected:
|
239
236
|
affected_user:
|
240
237
|
email_intro: 'Η πρότασή σας «%{resource_title}» απορρίφθηκε. Μπορείτε να διαβάσετε την απάντηση σε αυτήν τη σελίδα:'
|
@@ -469,11 +466,9 @@ el:
|
|
469
466
|
select_states: Ελέγξτε την κατάσταση των προτάσεων προς εισαγωγή
|
470
467
|
proposals_merges:
|
471
468
|
create:
|
472
|
-
invalid: Υπήρξε ένα πρόβλημα κατά τη συγχώνευση των επιλεγμένων προτάσεων.
|
473
469
|
success: Επιτυχής συγχώνευση των προτάσεων σε μία νέα.
|
474
470
|
proposals_splits:
|
475
471
|
create:
|
476
|
-
invalid: Υπήρξε ένα πρόβλημα κατά τον διαχωρισμό των επιλεγμένων προτάσεων.
|
477
472
|
success: Επιτυχής διαχωρισμός των προτάσεων σε νέες.
|
478
473
|
valuation_assignments:
|
479
474
|
create:
|
data/config/locales/en.yml
CHANGED
@@ -58,6 +58,16 @@ en:
|
|
58
58
|
identical: AND title cannot be identical
|
59
59
|
title:
|
60
60
|
identical: AND body cannot be identical
|
61
|
+
proposals_merge:
|
62
|
+
attributes:
|
63
|
+
base:
|
64
|
+
not_official: Are not official
|
65
|
+
supported: Have received support or endorsements
|
66
|
+
proposals_split:
|
67
|
+
attributes:
|
68
|
+
base:
|
69
|
+
not_official: Are not official
|
70
|
+
supported: Have received support or endorsements
|
61
71
|
models:
|
62
72
|
decidim/proposals/accepted_proposal_event: Proposal accepted
|
63
73
|
decidim/proposals/admin/update_proposal_category_event: Proposal category changed
|
@@ -126,7 +136,6 @@ en:
|
|
126
136
|
name: Proposals
|
127
137
|
settings:
|
128
138
|
global:
|
129
|
-
allow_card_image: Allow card image
|
130
139
|
amendments_enabled: Amendments enabled
|
131
140
|
amendments_enabled_help: If active, configure Amendment features for each step.
|
132
141
|
amendments_wizard_help_text: Amendments Wizard help text
|
@@ -136,6 +145,17 @@ en:
|
|
136
145
|
collaborative_drafts_enabled: Collaborative drafts enabled
|
137
146
|
comments_enabled: Comments enabled
|
138
147
|
comments_max_length: Comments max length (Leave 0 for default value)
|
148
|
+
default_sort_order: Default proposal sorting
|
149
|
+
default_sort_order_help: Default means that if the supports are enabled, the proposals will be shown sorted by random, and if the supports are blocked, then they will be sorted by the most supported.
|
150
|
+
default_sort_order_options:
|
151
|
+
default: Default
|
152
|
+
most_commented: Most commented
|
153
|
+
most_endorsed: Most endorsed
|
154
|
+
most_followed: Most followed
|
155
|
+
most_voted: Most supported
|
156
|
+
random: Random
|
157
|
+
recent: Recent
|
158
|
+
with_more_authors: With more authors
|
139
159
|
geocoding_enabled: Geocoding enabled
|
140
160
|
minimum_votes_per_user: Minimum supports per user
|
141
161
|
new_proposal_body_template: New proposal body template
|
@@ -177,7 +197,18 @@ en:
|
|
177
197
|
answers_with_costs: Enable costs on proposal answers
|
178
198
|
automatic_hashtags: Hashtags added to all proposals
|
179
199
|
comments_blocked: Comments blocked
|
180
|
-
creation_enabled:
|
200
|
+
creation_enabled: Participants can create proposals
|
201
|
+
default_sort_order: Default proposal sorting
|
202
|
+
default_sort_order_help: Default it means that if the supports are enabled, the proposals will be shown sorted by random, and if the supports are blocked, then they will be sorted by the most supported.
|
203
|
+
default_sort_order_options:
|
204
|
+
default: Default
|
205
|
+
most_commented: Most commented
|
206
|
+
most_endorsed: Most endorsed
|
207
|
+
most_followed: Most followed
|
208
|
+
most_voted: Most supported
|
209
|
+
random: Random
|
210
|
+
recent: Recent
|
211
|
+
with_more_authors: With more authors
|
181
212
|
endorsements_blocked: Endorsements blocked
|
182
213
|
endorsements_enabled: Endorsements enabled
|
183
214
|
proposal_answering_enabled: Proposal answering enabled
|
@@ -270,7 +301,7 @@ en:
|
|
270
301
|
email_intro: The proposal "%{resource_title}" has been added to "%{participatory_space_title}" that you are following.
|
271
302
|
email_outro: You have received this notification because you are following "%{participatory_space_title}". You can stop receiving notifications following the previous link.
|
272
303
|
email_subject: New proposal "%{resource_title}" added to %{participatory_space_title}
|
273
|
-
notification_title: The proposal <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title}
|
304
|
+
notification_title: The proposal <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title} by %{author}
|
274
305
|
proposal_rejected:
|
275
306
|
affected_user:
|
276
307
|
email_intro: 'Your proposal "%{resource_title}" has been rejected. You can read the answer in this page:'
|
@@ -356,7 +387,7 @@ en:
|
|
356
387
|
actions:
|
357
388
|
answer_proposal: Answer proposal
|
358
389
|
edit_proposal: Edit proposal
|
359
|
-
import: Import from another component
|
390
|
+
import: Import proposals from another component
|
360
391
|
new: New proposal
|
361
392
|
participatory_texts: Participatory texts
|
362
393
|
show: Show proposal
|
@@ -367,6 +398,23 @@ en:
|
|
367
398
|
exports:
|
368
399
|
proposal_comments: Comments
|
369
400
|
proposals: Proposals
|
401
|
+
imports:
|
402
|
+
help:
|
403
|
+
answers: 'The import document should contain the following columns: id, state (accepted, evaluating, rejected), answer/en (and other languages enabled for the organization).'
|
404
|
+
proposals: The file must have column names title/en and body/en (or another locale which you prefer eg. title/ca and body/ca). Also scope/id and category/id columns are supported.
|
405
|
+
label:
|
406
|
+
answers: Import answers from a file
|
407
|
+
proposals: Import proposals from a file
|
408
|
+
resources:
|
409
|
+
answers:
|
410
|
+
one: proposal answer
|
411
|
+
other: proposal answers
|
412
|
+
proposals:
|
413
|
+
one: proposal
|
414
|
+
other: proposals
|
415
|
+
title:
|
416
|
+
answers: Import proposal answers
|
417
|
+
proposals: Import proposals
|
370
418
|
models:
|
371
419
|
proposal:
|
372
420
|
name: Proposal
|
@@ -510,11 +558,11 @@ en:
|
|
510
558
|
title: Import proposals
|
511
559
|
proposals_merges:
|
512
560
|
create:
|
513
|
-
invalid: There
|
561
|
+
invalid: 'There has been a problem merging the selected proposals because some of them:'
|
514
562
|
success: Successfully merged the proposals into a new one.
|
515
563
|
proposals_splits:
|
516
564
|
create:
|
517
|
-
invalid: There
|
565
|
+
invalid: 'There has been a problem splitting the selected proposals because some of them:'
|
518
566
|
success: Successfully splitted the proposals into new ones.
|
519
567
|
valuation_assignments:
|
520
568
|
create:
|
@@ -754,9 +802,12 @@ en:
|
|
754
802
|
filter_by: Filter by
|
755
803
|
unfold: Unfold
|
756
804
|
index:
|
805
|
+
click_here: See all proposals
|
757
806
|
collaborative_drafts_list: Access collaborative drafts
|
758
807
|
new_proposal: New proposal
|
808
|
+
see_all: See all proposals
|
759
809
|
see_all_withdrawn: See all withdrawn proposals
|
810
|
+
text_banner: You are viewing the list of proposals withdrawn by their authors. %{go_back_link}.
|
760
811
|
view_proposal: View proposal
|
761
812
|
linked_proposals:
|
762
813
|
proposal_votes:
|
data/config/locales/es-MX.yml
CHANGED
@@ -125,7 +125,6 @@ es-MX:
|
|
125
125
|
name: Propuestas
|
126
126
|
settings:
|
127
127
|
global:
|
128
|
-
allow_card_image: Permitir tarjeta con imagen
|
129
128
|
amendments_enabled: Enmiendas habilitadas
|
130
129
|
amendments_enabled_help: Si está activo, configura las opciones de enmiendas para cada fase.
|
131
130
|
amendments_wizard_help_text: Asistente de ayuda de las enmiendas
|
@@ -176,7 +175,6 @@ es-MX:
|
|
176
175
|
answers_with_costs: Habilitar coste en las respuestas a propuestas
|
177
176
|
automatic_hashtags: Hashtags añadidos a todas las propuestas.
|
178
177
|
comments_blocked: Comentarios bloqueados
|
179
|
-
creation_enabled: Habilitar creación de propuestas
|
180
178
|
endorsements_blocked: Adhesiones bloqueadas
|
181
179
|
endorsements_enabled: Adhesiones habilitadas
|
182
180
|
proposal_answering_enabled: Respuesta a propuestas activadas
|
@@ -269,7 +267,6 @@ es-MX:
|
|
269
267
|
email_intro: La propuesta "%{resource_title}" se ha añadido a "%{participatory_space_title}" que estás siguiendo.
|
270
268
|
email_outro: Recibiste esta notificación porque estás siguiendo "%{participatory_space_title}". Puedes dejar de seguirlo desde el enlace anterior.
|
271
269
|
email_subject: Nueva propuesta "%{resource_title}" añadida a %{participatory_space_title}
|
272
|
-
notification_title: La propuesta <a href="%{resource_path}">%{resource_title}</a> se ha añadido a %{participatory_space_title}
|
273
270
|
proposal_rejected:
|
274
271
|
affected_user:
|
275
272
|
email_intro: 'Su propuesta "%{resource_title}" ha sido rechazada. Puedes leer la respuesta en esta página:'
|
@@ -509,11 +506,9 @@ es-MX:
|
|
509
506
|
title: Importar propuestas
|
510
507
|
proposals_merges:
|
511
508
|
create:
|
512
|
-
invalid: Se produjo un error al fusionar las propuestas seleccionadas.
|
513
509
|
success: Las propuestas se fusionaron en una nueva con éxito.
|
514
510
|
proposals_splits:
|
515
511
|
create:
|
516
|
-
invalid: Hubo un error dividiendo las propuestas seleccionadas.
|
517
512
|
success: Las propuestas se han dividido en otras nuevas con éxito.
|
518
513
|
valuation_assignments:
|
519
514
|
create:
|
data/config/locales/es-PY.yml
CHANGED
@@ -125,7 +125,6 @@ es-PY:
|
|
125
125
|
name: Propuestas
|
126
126
|
settings:
|
127
127
|
global:
|
128
|
-
allow_card_image: Permitir tarjeta con imagen
|
129
128
|
amendments_enabled: Enmiendas habilitadas
|
130
129
|
amendments_enabled_help: Si está activo, configura las opciones de enmiendas para cada fase.
|
131
130
|
amendments_wizard_help_text: Asistente de ayuda de las enmiendas
|
@@ -176,7 +175,6 @@ es-PY:
|
|
176
175
|
answers_with_costs: Habilitar coste en las respuestas a propuestas
|
177
176
|
automatic_hashtags: Hashtags añadidos a todas las propuestas.
|
178
177
|
comments_blocked: Comentarios bloqueados
|
179
|
-
creation_enabled: Creación de propuesta habilitada
|
180
178
|
endorsements_blocked: Adhesiones bloqueados
|
181
179
|
endorsements_enabled: Adhesiones habilitados
|
182
180
|
proposal_answering_enabled: Contestación de propuesta habilitada
|
@@ -269,7 +267,6 @@ es-PY:
|
|
269
267
|
email_intro: La propuesta "%{resource_title}" se ha añadido a "%{participatory_space_title}" que estás siguiendo.
|
270
268
|
email_outro: Recibiste esta notificación porque estás siguiendo "%{participatory_space_title}". Puedes dejar de seguirlo desde el enlace anterior.
|
271
269
|
email_subject: Nueva propuesta "%{resource_title}" añadida a %{participatory_space_title}
|
272
|
-
notification_title: La propuesta <a href="%{resource_path}">%{resource_title}</a> se ha agregado a %{participatory_space_title}
|
273
270
|
proposal_rejected:
|
274
271
|
affected_user:
|
275
272
|
email_intro: 'Su propuesta "%{resource_title}" ha sido rechazada. Puedes leer la respuesta en esta página:'
|
@@ -509,11 +506,9 @@ es-PY:
|
|
509
506
|
title: Importar propuestas
|
510
507
|
proposals_merges:
|
511
508
|
create:
|
512
|
-
invalid: Se produjo un error al fusionar las propuestas seleccionadas.
|
513
509
|
success: Fusionó con éxito las propuestas en una nueva.
|
514
510
|
proposals_splits:
|
515
511
|
create:
|
516
|
-
invalid: Hubo un error dividiendo las propuestas seleccionadas.
|
517
512
|
success: Dividió con éxito las propuestas en otras nuevas.
|
518
513
|
valuation_assignments:
|
519
514
|
create:
|