decidim-proposals 0.28.6 → 0.29.0.rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -18
- data/app/cells/decidim/proposals/cost_report_cell.rb +0 -3
- data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb +12 -0
- data/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb +1 -1
- data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb +1 -1
- data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb +2 -3
- data/app/cells/decidim/proposals/proposal_cell.rb +2 -0
- data/app/cells/decidim/proposals/proposal_g/show.erb +23 -0
- data/app/cells/decidim/proposals/proposal_g_cell.rb +48 -0
- data/app/cells/decidim/proposals/proposal_l_cell.rb +18 -19
- data/app/cells/decidim/proposals/proposal_metadata_cell.rb +23 -15
- data/app/commands/decidim/proposals/admin/answer_proposal.rb +2 -1
- data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb +7 -5
- data/app/commands/decidim/proposals/admin/create_proposal.rb +4 -6
- data/app/commands/decidim/proposals/admin/create_proposal_state.rb +15 -0
- data/app/commands/decidim/proposals/admin/destroy_proposal_state.rb +10 -0
- data/app/commands/decidim/proposals/admin/import_proposals.rb +10 -2
- data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb +4 -21
- data/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb +6 -4
- data/app/commands/decidim/proposals/admin/update_proposal_state.rb +13 -0
- data/app/commands/decidim/proposals/create_proposal.rb +21 -2
- data/app/commands/decidim/proposals/update_proposal.rb +2 -2
- data/app/commands/decidim/proposals/vote_proposal.rb +1 -1
- data/app/commands/decidim/proposals/withdraw_proposal.rb +3 -7
- data/app/controllers/concerns/decidim/proposals/admin/filterable.rb +10 -22
- data/app/controllers/decidim/proposals/admin/proposal_states_controller.rb +86 -0
- data/app/controllers/decidim/proposals/admin/proposals_controller.rb +4 -0
- data/app/controllers/decidim/proposals/admin/valuation_assignments_controller.rb +8 -11
- data/app/controllers/decidim/proposals/proposals_controller.rb +38 -39
- data/app/controllers/decidim/proposals/versions_controller.rb +1 -1
- data/app/events/decidim/proposals/proposal_state_changed_event.rb +37 -0
- data/app/forms/decidim/proposals/admin/proposal_answer_form.rb +8 -4
- data/app/forms/decidim/proposals/admin/proposal_form.rb +1 -1
- data/app/forms/decidim/proposals/admin/proposal_state_form.rb +22 -0
- data/app/forms/decidim/proposals/admin/proposals_fork_form.rb +1 -1
- data/app/forms/decidim/proposals/admin/proposals_import_form.rb +1 -1
- data/app/forms/decidim/proposals/admin/valuation_assignment_form.rb +12 -14
- data/app/forms/decidim/proposals/proposal_form.rb +25 -4
- data/app/forms/decidim/proposals/reject_access_to_collaborative_draft_form.rb +1 -1
- data/app/forms/decidim/proposals/request_access_to_collaborative_draft_form.rb +1 -1
- data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb +7 -17
- data/app/helpers/decidim/proposals/admin/proposals_helper.rb +13 -89
- data/app/helpers/decidim/proposals/application_helper.rb +16 -10
- data/app/helpers/decidim/proposals/map_helper.rb +1 -1
- data/app/helpers/decidim/proposals/proposal_cells_helper.rb +6 -2
- data/app/helpers/decidim/proposals/proposal_votes_helper.rb +3 -3
- data/app/helpers/decidim/proposals/proposal_wizard_helper.rb +5 -8
- data/app/helpers/decidim/proposals/proposals_helper.rb +18 -24
- data/app/models/decidim/proposals/collaborative_draft.rb +3 -2
- data/app/models/decidim/proposals/proposal.rb +88 -29
- data/app/models/decidim/proposals/proposal_state.rb +58 -0
- data/app/packs/documents/decidim/proposals/participatory_texts/participatory_text.md +1 -3
- data/app/packs/images/decidim/proposals/proposal-placeholder-card-g.svg +15 -0
- data/app/packs/src/decidim/proposals/add_proposal.js +2 -0
- data/app/packs/src/decidim/proposals/admin/proposals.js +43 -8
- data/app/packs/stylesheets/decidim/proposals/proposals.scss +39 -1
- data/app/permissions/decidim/proposals/admin/permissions.rb +16 -4
- data/app/permissions/decidim/proposals/permissions.rb +3 -4
- data/app/presenters/decidim/proposals/admin_log/proposal_state_presenter.rb +21 -0
- data/app/presenters/decidim/proposals/proposal_presenter.rb +12 -3
- data/app/queries/decidim/proposals/metrics/endorsements_metric_manage.rb +1 -1
- data/app/queries/decidim/proposals/metrics/proposal_followers_metric_measure.rb +1 -1
- data/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb +4 -4
- data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb +1 -1
- data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb +1 -1
- data/app/services/decidim/proposals/diff_renderer.rb +1 -3
- data/app/services/decidim/proposals/proposal_builder.rb +1 -1
- data/app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb +1 -1
- data/app/views/decidim/proposals/admin/participatory_texts/index.html.erb +3 -2
- data/app/views/decidim/proposals/admin/proposal_answers/_form.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb +3 -3
- data/app/views/decidim/proposals/admin/proposal_states/_form.html.erb +67 -0
- data/app/views/decidim/proposals/admin/proposal_states/edit.html.erb +18 -0
- data/app/views/decidim/proposals/admin/proposal_states/index.html.erb +50 -0
- data/app/views/decidim/proposals/admin/proposal_states/new.html.erb +18 -0
- data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb +6 -12
- data/app/views/decidim/proposals/admin/proposals/_form.html.erb +6 -6
- data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb +11 -7
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb +7 -5
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_merge.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_recategorize.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_scope-change.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_split.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_valuator.html.erb +11 -7
- data/app/views/decidim/proposals/admin/proposals/bulk_actions/_valuators_picker.html.erb +12 -0
- data/app/views/decidim/proposals/admin/proposals/index.html.erb +11 -7
- data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb +1 -1
- data/app/views/decidim/proposals/admin/proposals/show.html.erb +7 -6
- data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb +3 -3
- data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +12 -5
- data/app/views/decidim/proposals/proposals/_proposal.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/_proposal_aside.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/_proposals.html.erb +9 -3
- data/app/views/decidim/proposals/proposals/_vote_button.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/_voting_rules.html.erb +3 -3
- data/app/views/decidim/proposals/proposals/_wizard_header.html.erb +0 -1
- data/app/views/decidim/proposals/proposals/index.html.erb +2 -9
- data/app/views/decidim/proposals/proposals/index.js.erb +0 -12
- data/app/views/decidim/proposals/proposals/new.html.erb +2 -7
- data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb +4 -4
- data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb +8 -8
- data/app/views/decidim/proposals/proposals/preview.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/show.html.erb +3 -3
- data/config/locales/ar.yml +12 -121
- data/config/locales/bg.yml +121 -111
- data/config/locales/ca.yml +91 -93
- data/config/locales/cs.yml +67 -134
- data/config/locales/de.yml +131 -133
- data/config/locales/el.yml +11 -121
- data/config/locales/en.yml +112 -114
- data/config/locales/es-MX.yml +90 -92
- data/config/locales/es-PY.yml +93 -95
- data/config/locales/es.yml +91 -93
- data/config/locales/eu.yml +231 -240
- data/config/locales/fi-plain.yml +92 -94
- data/config/locales/fi.yml +141 -143
- data/config/locales/fr-CA.yml +95 -95
- data/config/locales/fr.yml +86 -86
- data/config/locales/ga-IE.yml +2 -27
- data/config/locales/gl.yml +11 -107
- data/config/locales/he-IL.yml +0 -17
- data/config/locales/hu.yml +23 -91
- data/config/locales/id-ID.yml +7 -107
- data/config/locales/is-IS.yml +8 -36
- data/config/locales/it.yml +17 -131
- data/config/locales/ja.yml +119 -121
- data/config/locales/lb.yml +1 -0
- data/config/locales/lt.yml +10 -123
- data/config/locales/lv.yml +6 -101
- data/config/locales/nl.yml +15 -104
- data/config/locales/no.yml +9 -108
- data/config/locales/pl.yml +114 -115
- data/config/locales/pt-BR.yml +13 -84
- data/config/locales/pt.yml +11 -109
- data/config/locales/ro-RO.yml +17 -120
- data/config/locales/ru.yml +9 -56
- data/config/locales/sk.yml +7 -109
- data/config/locales/sl.yml +4 -0
- data/config/locales/sr-CS.yml +2 -0
- data/config/locales/sv.yml +143 -342
- data/config/locales/tr-TR.yml +66 -108
- data/config/locales/uk.yml +11 -58
- data/config/locales/zh-CN.yml +7 -100
- data/config/locales/zh-TW.yml +11 -119
- data/db/migrate/20240110203500_add_withdrawn_at_field_to_proposals.rb +27 -0
- data/db/migrate/20240110203501_create_decidim_proposals_proposal_state.rb +14 -0
- data/db/migrate/20240110203502_add_state_id_to_decidim_proposals_proposals.rb +13 -0
- data/db/migrate/20240110203503_remove_state_from_decidim_proposals_proposals.rb +11 -0
- data/db/migrate/20240110203504_create_default_proposal_states.rb +31 -0
- data/db/migrate/20240209092404_change_color_fields_on_proposals_states.rb +54 -0
- data/decidim-proposals.gemspec +3 -3
- data/lib/decidim/api/proposal_type.rb +4 -13
- data/lib/decidim/api/proposals_type.rb +3 -1
- data/lib/decidim/proposals/admin_engine.rb +8 -0
- data/lib/decidim/proposals/admin_filter.rb +37 -0
- data/lib/decidim/proposals/component.rb +8 -5
- data/lib/decidim/proposals/engine.rb +1 -15
- data/lib/decidim/proposals/import/proposal_answer_creator.rb +6 -6
- data/lib/decidim/proposals/import/proposal_creator.rb +1 -1
- data/lib/decidim/proposals/markdown_to_proposals.rb +2 -8
- data/lib/decidim/proposals/proposal_serializer.rb +8 -9
- data/lib/decidim/proposals/seeds.rb +60 -51
- data/lib/decidim/proposals/test/factories.rb +69 -14
- data/lib/decidim/proposals/version.rb +1 -1
- data/lib/decidim/proposals.rb +84 -12
- data/lib/tasks/proposals/upgrade/{decdim_proposals_upgrade_tasks.rake → decidim_proposals_upgrade_tasks.rake} +0 -13
- metadata +51 -41
- data/app/events/decidim/proposals/accepted_proposal_event.rb +0 -17
- data/app/events/decidim/proposals/evaluating_proposal_event.rb +0 -11
- data/app/events/decidim/proposals/rejected_proposal_event.rb +0 -17
- data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb +0 -44
- data/app/queries/decidim/proposals/similar_proposals.rb +0 -67
- data/app/services/decidim/proposals/collaborative_draft_diff_renderer.rb +0 -22
- data/app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb +0 -0
- data/app/views/decidim/proposals/proposals/_proposal_badge.html.erb +0 -3
- data/app/views/decidim/proposals/proposals/compare.html.erb +0 -24
- data/app/views/decidim/proposals/proposals/complete.html.erb +0 -31
- data/config/locales/bn-BD.yml +0 -1
- data/config/locales/bs-BA.yml +0 -98
- data/config/locales/ca-IT.yml +0 -931
data/config/locales/en.yml
CHANGED
@@ -12,8 +12,6 @@ en:
|
|
12
12
|
state: State
|
13
13
|
title: Title
|
14
14
|
user_group_id: Create collaborative draft as
|
15
|
-
import_participatory_text:
|
16
|
-
document: Document
|
17
15
|
proposal:
|
18
16
|
address: Address
|
19
17
|
answer: Answer
|
@@ -23,8 +21,6 @@ en:
|
|
23
21
|
category_id: Category
|
24
22
|
decidim_scope_id: Scope
|
25
23
|
has_address: Has address
|
26
|
-
latitude: Latitude
|
27
|
-
longitude: Longitude
|
28
24
|
scope_id: Scope
|
29
25
|
state: State
|
30
26
|
suggested_hashtags: Suggested hashtags
|
@@ -35,11 +31,22 @@ en:
|
|
35
31
|
cost: Cost
|
36
32
|
cost_report: Cost report
|
37
33
|
execution_period: Execution period
|
34
|
+
proposal_state:
|
35
|
+
announcement_title: Answer heading
|
36
|
+
bg_color: Background color
|
37
|
+
colors:
|
38
|
+
blue: Blue
|
39
|
+
gray: Gray
|
40
|
+
green: Green
|
41
|
+
orange: Orange
|
42
|
+
pink: Pink
|
43
|
+
purple: Purple
|
44
|
+
red: Red
|
45
|
+
yellow: Yellow
|
46
|
+
text_color: Text color
|
38
47
|
proposals_copy:
|
39
48
|
copy_proposals: I understand that this will import all proposals from the selected component to the current one and that this action cannot be reversed.
|
40
49
|
origin_component_id: Component to copy the proposals from
|
41
|
-
proposals_file_import:
|
42
|
-
file: File
|
43
50
|
proposals_import:
|
44
51
|
import_proposals: Import proposals
|
45
52
|
keep_answers: Keep state and answers
|
@@ -68,22 +75,19 @@ en:
|
|
68
75
|
attributes:
|
69
76
|
base:
|
70
77
|
not_official: Are not official
|
71
|
-
|
78
|
+
voted: Have received votes or endorsements
|
72
79
|
proposals_split:
|
73
80
|
attributes:
|
74
81
|
base:
|
75
82
|
not_official: Are not official
|
76
|
-
|
83
|
+
voted: Have received votes or endorsements
|
77
84
|
models:
|
78
|
-
decidim/proposals/accepted_proposal_event: Proposal accepted
|
79
85
|
decidim/proposals/admin/update_proposal_category_event: Proposal category changed
|
80
86
|
decidim/proposals/admin/update_proposal_scope_event: Proposal scope changed
|
81
87
|
decidim/proposals/creation_enabled_event: Proposal creation enabled
|
82
88
|
decidim/proposals/endorsing_enabled_event: Proposal endorsing enabled
|
83
|
-
decidim/proposals/evaluating_proposal_event: Proposal is being evaluated
|
84
89
|
decidim/proposals/proposal_mentioned_event: Proposal mentioned
|
85
90
|
decidim/proposals/publish_proposal_event: Proposal published
|
86
|
-
decidim/proposals/rejected_proposal_event: Proposal rejected
|
87
91
|
decidim/proposals/voting_enabled_event: Proposal voting enabled
|
88
92
|
activerecord:
|
89
93
|
models:
|
@@ -97,8 +101,8 @@ en:
|
|
97
101
|
one: Note
|
98
102
|
other: Notes
|
99
103
|
decidim/proposals/proposal_vote:
|
100
|
-
one:
|
101
|
-
other:
|
104
|
+
one: Vote
|
105
|
+
other: Votes
|
102
106
|
decidim:
|
103
107
|
admin:
|
104
108
|
filters:
|
@@ -110,6 +114,8 @@ en:
|
|
110
114
|
values:
|
111
115
|
'false': Proposals
|
112
116
|
'true': Amendments
|
117
|
+
proposal_state_id_eq:
|
118
|
+
label: State
|
113
119
|
scope_id_eq:
|
114
120
|
label: Scope
|
115
121
|
state_eq:
|
@@ -138,7 +144,7 @@ en:
|
|
138
144
|
comment: Comment
|
139
145
|
create: Create
|
140
146
|
endorse: Endorse
|
141
|
-
vote:
|
147
|
+
vote: Vote
|
142
148
|
vote_comment: Vote comment
|
143
149
|
withdraw: Withdraw
|
144
150
|
name: Proposals
|
@@ -149,7 +155,8 @@ en:
|
|
149
155
|
amendments_wizard_help_text: Amendments Wizard help text
|
150
156
|
announcement: Announcement
|
151
157
|
attachments_allowed: Allow attachments
|
152
|
-
|
158
|
+
attachments_allowed_help: By enabling this option, proposals will default to grid mode, and the first image will appear on the card.
|
159
|
+
can_accumulate_votes_beyond_threshold: Can accumulate votes beyond threshold
|
153
160
|
collaborative_drafts_enabled: Collaborative drafts enabled
|
154
161
|
comments_enabled: Comments enabled
|
155
162
|
comments_max_length: Comments max length (Leave 0 for default value)
|
@@ -160,12 +167,12 @@ en:
|
|
160
167
|
most_commented: Most commented
|
161
168
|
most_endorsed: Most endorsed
|
162
169
|
most_followed: Most followed
|
163
|
-
most_voted: Most
|
170
|
+
most_voted: Most voted
|
164
171
|
random: Random
|
165
172
|
recent: Recent
|
166
173
|
with_more_authors: With more authors
|
167
174
|
geocoding_enabled: Geocoding enabled
|
168
|
-
minimum_votes_per_user: Minimum
|
175
|
+
minimum_votes_per_user: Minimum votes per user
|
169
176
|
new_proposal_body_template: New proposal body template
|
170
177
|
new_proposal_body_template_help: You can define prefilled text that the new Proposals will have
|
171
178
|
new_proposal_help_text: New proposal help text
|
@@ -181,14 +188,12 @@ en:
|
|
181
188
|
proposal_length: Maximum proposal body length
|
182
189
|
proposal_limit: Proposal limit per participant
|
183
190
|
proposal_wizard_step_1_help_text: Proposal wizard "Create" step help text
|
184
|
-
proposal_wizard_step_2_help_text: Proposal wizard "
|
185
|
-
proposal_wizard_step_3_help_text: Proposal wizard "Complete" step help text
|
186
|
-
proposal_wizard_step_4_help_text: Proposal wizard "Publish" step help text
|
191
|
+
proposal_wizard_step_2_help_text: Proposal wizard "Publish" step help text
|
187
192
|
resources_permissions_enabled: Actions permissions can be set for each proposal
|
188
193
|
scope_id: Scope
|
189
194
|
scopes_enabled: Scopes enabled
|
190
195
|
threshold_per_proposal: Threshold per proposal
|
191
|
-
vote_limit:
|
196
|
+
vote_limit: Vote limit per participant
|
192
197
|
step:
|
193
198
|
amendment_creation_enabled: Amendment creation enabled
|
194
199
|
amendment_creation_enabled_help: Participant can amend proposals.
|
@@ -214,7 +219,7 @@ en:
|
|
214
219
|
most_commented: Most commented
|
215
220
|
most_endorsed: Most endorsed
|
216
221
|
most_followed: Most followed
|
217
|
-
most_voted: Most
|
222
|
+
most_voted: Most voted
|
218
223
|
random: Random
|
219
224
|
recent: Recent
|
220
225
|
with_more_authors: With more authors
|
@@ -224,9 +229,9 @@ en:
|
|
224
229
|
publish_answers_immediately: Publish proposal answers immediately
|
225
230
|
publish_answers_immediately_help_html: Mind that if you answer any proposal without this enabled, you will need to publish them manually by selecting them and using the action for publication. For more info on how this works, see <a href="https://docs.decidim.org/en/admin/components/proposals/answers#_publication" target="_blank">proposals' answers documentation page</a>.
|
226
231
|
suggested_hashtags: Hashtags suggested to participants for new proposals
|
227
|
-
votes_blocked:
|
228
|
-
votes_enabled:
|
229
|
-
votes_hidden:
|
232
|
+
votes_blocked: Votes blocked
|
233
|
+
votes_enabled: Votes enabled
|
234
|
+
votes_hidden: Votes hidden (if votes are enabled, checking this will hide the number of votes)
|
230
235
|
events:
|
231
236
|
proposals:
|
232
237
|
admin:
|
@@ -275,28 +280,6 @@ en:
|
|
275
280
|
email_outro: You have received this notification because you are following %{participatory_space_title}. You can stop receiving notifications following the previous link.
|
276
281
|
email_subject: Proposals endorsing has started for %{participatory_space_title}
|
277
282
|
notification_title: You can now start <a href="%{resource_path}">endorsing proposals</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
|
278
|
-
proposal_accepted:
|
279
|
-
affected_user:
|
280
|
-
email_intro: 'Your proposal "%{resource_title}" has been accepted. You can read the answer in this page:'
|
281
|
-
email_outro: You have received this notification because you are an author of "%{resource_title}".
|
282
|
-
email_subject: Your proposal has been accepted
|
283
|
-
notification_title: Your proposal <a href="%{resource_path}">%{resource_title}</a> has been accepted.
|
284
|
-
follower:
|
285
|
-
email_intro: 'The proposal "%{resource_title}" has been accepted. You can read the answer in this page:'
|
286
|
-
email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
|
287
|
-
email_subject: A proposal you are following has been accepted
|
288
|
-
notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has been accepted.
|
289
|
-
proposal_evaluating:
|
290
|
-
affected_user:
|
291
|
-
email_intro: 'Your proposal "%{resource_title}" is currently being evaluated. You can check for an answer in this page:'
|
292
|
-
email_outro: You have received this notification because you are an author of "%{resource_title}".
|
293
|
-
email_subject: Your proposal is being evaluated
|
294
|
-
notification_title: Your proposal <a href="%{resource_path}">%{resource_title}</a> is being evaluated.
|
295
|
-
follower:
|
296
|
-
email_intro: 'The proposal "%{resource_title}" is currently being evaluated. You can check for an answer in this page:'
|
297
|
-
email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
|
298
|
-
email_subject: A proposal you are following is being evaluated
|
299
|
-
notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal is being evaluated.
|
300
283
|
proposal_mentioned:
|
301
284
|
email_intro: Your proposal "%{mentioned_proposal_title}" has been mentioned <a href="%{resource_url}">in this space</a> in the comments.
|
302
285
|
email_outro: You have received this notification because you are an author of "%{resource_title}".
|
@@ -313,17 +296,17 @@ en:
|
|
313
296
|
email_subject: New proposal "%{resource_title}" added to %{participatory_space_title}
|
314
297
|
notification_title: The proposal <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title} by %{author}.
|
315
298
|
notification_title_official: The official proposal <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title}.
|
316
|
-
|
299
|
+
proposal_state_changed:
|
317
300
|
affected_user:
|
318
|
-
email_intro: '
|
301
|
+
email_intro: 'The proposal "%{resource_title}" has changed its state to "%{state}". You can read the answer in this page:'
|
319
302
|
email_outro: You have received this notification because you are an author of "%{resource_title}".
|
320
|
-
email_subject: Your proposal has
|
321
|
-
notification_title: Your proposal <a href="%{resource_path}">%{resource_title}</a> has
|
303
|
+
email_subject: Your proposal has changed its state (%{state})
|
304
|
+
notification_title: Your proposal <a href="%{resource_path}">%{resource_title}</a> has changed its state to "%{state}".
|
322
305
|
follower:
|
323
|
-
email_intro: 'The proposal "%{resource_title}" has
|
306
|
+
email_intro: 'The proposal "%{resource_title}" has changed its state to "%{state}". You can read the answer in this page:'
|
324
307
|
email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
|
325
|
-
email_subject: A proposal you are following has
|
326
|
-
notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has
|
308
|
+
email_subject: A proposal you are following has changed its state (%{state})
|
309
|
+
notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has changed its state to "%{state}".
|
327
310
|
proposal_update_category:
|
328
311
|
email_intro: 'An admin has updated the category of your proposal "%{resource_title}", check it out in this page:'
|
329
312
|
email_outro: You have received this notification because you are the author of the proposal.
|
@@ -335,10 +318,10 @@ en:
|
|
335
318
|
email_subject: The %{resource_title} proposal scope has been updated
|
336
319
|
notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal scope has been updated by an admin.
|
337
320
|
voting_enabled:
|
338
|
-
email_intro: 'You can
|
321
|
+
email_intro: 'You can vote proposals in %{participatory_space_title}! Start participating in this page:'
|
339
322
|
email_outro: You have received this notification because you are following %{participatory_space_title}. You can stop receiving notifications following the previous link.
|
340
|
-
email_subject: Proposal
|
341
|
-
notification_title: You can now start <a href="%{resource_path}">
|
323
|
+
email_subject: Proposal voting has started for %{participatory_space_title}
|
324
|
+
notification_title: You can now start <a href="%{resource_path}">voting proposals</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>
|
342
325
|
gamification:
|
343
326
|
badges:
|
344
327
|
accepted_proposals:
|
@@ -355,14 +338,14 @@ en:
|
|
355
338
|
proposal_votes:
|
356
339
|
conditions:
|
357
340
|
- Browse and spend some time reading other people's proposals
|
358
|
-
-
|
359
|
-
description: This badge is granted when you
|
360
|
-
description_another: This participant has
|
361
|
-
description_own: You have
|
362
|
-
name: Proposal
|
363
|
-
next_level_in:
|
364
|
-
unearned_another: This participant has not
|
365
|
-
unearned_own: You have
|
341
|
+
- Vote to the proposals you like or find interesting
|
342
|
+
description: This badge is granted when you vote other people's proposals.
|
343
|
+
description_another: This participant has voted to %{score} proposals.
|
344
|
+
description_own: You have voted to %{score} proposals.
|
345
|
+
name: Proposal votes
|
346
|
+
next_level_in: Vote to %{score} more proposals to reach the next level!
|
347
|
+
unearned_another: This participant has not voted to any proposals yet.
|
348
|
+
unearned_own: You have voted to no proposals yet.
|
366
349
|
proposals:
|
367
350
|
conditions:
|
368
351
|
- Choose the participation space of your interest with submission for proposals enabled
|
@@ -388,18 +371,23 @@ en:
|
|
388
371
|
object: proposals
|
389
372
|
title: Proposals
|
390
373
|
votes:
|
391
|
-
description: Number of
|
392
|
-
object:
|
393
|
-
title:
|
374
|
+
description: Number of votes to proposals
|
375
|
+
object: votes
|
376
|
+
title: Votes
|
394
377
|
participatory_spaces:
|
395
378
|
highlighted_proposals:
|
379
|
+
last: Last proposals
|
396
380
|
see_all: See all proposals
|
397
381
|
proposals:
|
398
382
|
actions:
|
399
383
|
answer_proposal: Answer proposal
|
384
|
+
delete_proposal_state_confirm: Are you sure you want to delete this state?
|
385
|
+
destroy: Delete state
|
400
386
|
edit_proposal: Edit proposal
|
387
|
+
edit_proposal_state: Edit state
|
401
388
|
import: Import proposals from another component
|
402
389
|
new: New proposal
|
390
|
+
new_proposal_state: New status
|
403
391
|
participatory_texts: Participatory texts
|
404
392
|
show: Show proposal
|
405
393
|
title: Actions
|
@@ -477,11 +465,7 @@ en:
|
|
477
465
|
success: Participatory text successfully updated.
|
478
466
|
proposal_answers:
|
479
467
|
form:
|
480
|
-
accepted: Accepted
|
481
468
|
answer_proposal: Answer
|
482
|
-
evaluating: Evaluating
|
483
|
-
not_answered: Not answered
|
484
|
-
rejected: Rejected
|
485
469
|
title: Answer for proposal %{title}
|
486
470
|
proposal_notes:
|
487
471
|
create:
|
@@ -492,6 +476,25 @@ en:
|
|
492
476
|
submit: Submit
|
493
477
|
leave_your_note: Leave your note
|
494
478
|
title: Private notes
|
479
|
+
proposal_states:
|
480
|
+
create:
|
481
|
+
error: Error creating state
|
482
|
+
success: Status created successfully
|
483
|
+
destroy:
|
484
|
+
success: Status deleted successfully
|
485
|
+
edit:
|
486
|
+
title: Edit status
|
487
|
+
update: Update
|
488
|
+
form:
|
489
|
+
preview: Preview
|
490
|
+
index:
|
491
|
+
title: Statuses
|
492
|
+
new:
|
493
|
+
create: Create
|
494
|
+
title: New status
|
495
|
+
update:
|
496
|
+
error: Error updating status
|
497
|
+
success: Status updated successfully
|
495
498
|
proposals:
|
496
499
|
answer:
|
497
500
|
invalid: There has been a problem answering this proposal.
|
@@ -520,9 +523,11 @@ en:
|
|
520
523
|
publish: Publish
|
521
524
|
publish_answers: Publish answers
|
522
525
|
select_component: Select a component
|
526
|
+
select_valuators: Select one or more valuators
|
523
527
|
selected: selected
|
524
528
|
split: Split proposals
|
525
529
|
split_button: Split
|
530
|
+
statuses: Statuses
|
526
531
|
title: Proposals
|
527
532
|
unassign_from_valuator: Unassign from valuator
|
528
533
|
unassign_from_valuator_button: Unassign
|
@@ -552,7 +557,7 @@ en:
|
|
552
557
|
remove_assignment: Remove assignment
|
553
558
|
remove_assignment_confirmation: Are you sure you want to remove the valuator from this proposal?
|
554
559
|
valuators: Valuators
|
555
|
-
votes_count:
|
560
|
+
votes_count: Votes count
|
556
561
|
update_category:
|
557
562
|
invalid: 'These proposals already had the %{subject_name} category: %{proposals}.'
|
558
563
|
select_a_category: Please select a category.
|
@@ -613,11 +618,8 @@ en:
|
|
613
618
|
participants: Participants
|
614
619
|
user_groups: Groups
|
615
620
|
filter_state_values:
|
616
|
-
accepted: Accepted
|
617
621
|
all: All
|
618
|
-
evaluating: Evaluating
|
619
622
|
not_answered: Not answered
|
620
|
-
rejected: Rejected
|
621
623
|
filter_type_values:
|
622
624
|
all: All
|
623
625
|
amendments: Amendments
|
@@ -750,6 +752,9 @@ en:
|
|
750
752
|
valuator: Valuator
|
751
753
|
valuators: Valuators
|
752
754
|
votes: Votes
|
755
|
+
proposal_state:
|
756
|
+
css_class: CSS class
|
757
|
+
title: Status
|
753
758
|
new:
|
754
759
|
limit_reached: You cannot create new proposals since you have exceeded the limit.
|
755
760
|
participatory_text_proposal:
|
@@ -759,15 +764,8 @@ en:
|
|
759
764
|
comment: Comment
|
760
765
|
proposal_votes:
|
761
766
|
create:
|
762
|
-
error: There was a problem
|
767
|
+
error: There was a problem voting the proposal.
|
763
768
|
proposals:
|
764
|
-
compare:
|
765
|
-
continue: Continue
|
766
|
-
no_similars_found: Well done! No similar proposals found
|
767
|
-
title: Similar Proposals
|
768
|
-
complete:
|
769
|
-
send: Send
|
770
|
-
title: Complete your proposal
|
771
769
|
dynamic_map_instructions:
|
772
770
|
description: The coordinates will be updated when clicking on 'preview' button. However, the address does not change.
|
773
771
|
instructions: You can move the point on the map.
|
@@ -783,7 +781,9 @@ en:
|
|
783
781
|
discard: Discard this draft
|
784
782
|
discard_confirmation: Are you sure you want to discard this proposal draft?
|
785
783
|
send: Preview
|
786
|
-
title: Edit
|
784
|
+
title: Edit Proposal Draft
|
785
|
+
edit_form_fields:
|
786
|
+
marker_added: Marker added to the map.
|
787
787
|
filters:
|
788
788
|
activity: My activity
|
789
789
|
all: All
|
@@ -796,26 +796,28 @@ en:
|
|
796
796
|
search: Search
|
797
797
|
state: Status
|
798
798
|
type: Type
|
799
|
-
voted:
|
799
|
+
voted: Voted
|
800
800
|
index:
|
801
801
|
click_here: See all proposals
|
802
802
|
collaborative_drafts_list: Access collaborative drafts
|
803
803
|
count:
|
804
804
|
one: "%{count} proposal"
|
805
805
|
other: "%{count} proposals"
|
806
|
+
grid_mode: Grid mode
|
807
|
+
list_mode: List mode
|
806
808
|
new_proposal: New proposal
|
807
809
|
see_all: See all proposals
|
808
810
|
see_all_withdrawn: See all withdrawn proposals
|
809
811
|
text_banner: You are viewing the list of proposals withdrawn by their authors. %{go_back_link}.
|
810
812
|
new:
|
811
813
|
send: Continue
|
812
|
-
title: Create
|
814
|
+
title: Create your proposal
|
813
815
|
orders:
|
814
816
|
label: 'Order proposals by:'
|
815
817
|
most_commented: Most commented
|
816
818
|
most_endorsed: Most endorsed
|
817
819
|
most_followed: Most followed
|
818
|
-
most_voted: Most
|
820
|
+
most_voted: Most voted
|
819
821
|
random: Random
|
820
822
|
recent: Recent
|
821
823
|
with_more_authors: With more authors
|
@@ -853,49 +855,45 @@ en:
|
|
853
855
|
proposal_accepted_reason: 'This proposal has been accepted because:'
|
854
856
|
proposal_in_evaluation_reason: This proposal is being evaluated
|
855
857
|
proposal_rejected_reason: 'This proposal has been rejected because:'
|
856
|
-
withdraw_btn_hint: You can withdraw your proposal if you change your mind, as long as you have not received any
|
858
|
+
withdraw_btn_hint: You can withdraw your proposal if you change your mind, as long as you have not received any vote. The proposal is not deleted, it will appear in the list of withdrawn proposals.
|
857
859
|
withdraw_confirmation_html: Are you sure you want to withdraw this proposal?<br><br><strong>This action cannot be cancelled!</strong>
|
858
860
|
withdraw_proposal: Withdraw proposal
|
859
861
|
update:
|
860
862
|
title: Update proposal
|
861
863
|
vote_button:
|
862
|
-
already_voted: Already
|
863
|
-
already_voted_hover: Withdraw
|
864
|
-
maximum_votes_reached:
|
865
|
-
no_votes_remaining: No
|
866
|
-
vote:
|
867
|
-
votes_blocked:
|
864
|
+
already_voted: Already voted
|
865
|
+
already_voted_hover: Withdraw vote
|
866
|
+
maximum_votes_reached: Vote limit reached
|
867
|
+
no_votes_remaining: No votes remaining
|
868
|
+
vote: Vote
|
869
|
+
votes_blocked: Voting disabled
|
868
870
|
votes_count:
|
869
871
|
count:
|
870
|
-
one:
|
871
|
-
other:
|
872
|
+
one: Vote
|
873
|
+
other: Votes
|
872
874
|
voting_rules:
|
873
|
-
|
874
|
-
description: Each proposal can accumulate more than %{limit}
|
875
|
+
can_accumulate_votes_beyond_threshold:
|
876
|
+
description: Each proposal can accumulate more than %{limit} votes
|
875
877
|
minimum_votes_per_user:
|
876
|
-
description: You must distribute a minimum of %{votes}
|
877
|
-
given_enough_votes: You have given enough
|
878
|
-
|
878
|
+
description: You must distribute a minimum of %{votes} votes among different proposals.
|
879
|
+
given_enough_votes: You have given enough votes.
|
880
|
+
votes_remaining: You have to vote %{remaining_votes} more proposals for your votes to be taken into account.
|
879
881
|
proposal_limit:
|
880
882
|
description: You can create up to %{limit} proposals.
|
881
883
|
threshold_per_proposal:
|
882
|
-
description: In order to be validated proposals need to reach %{limit}
|
883
|
-
title: '
|
884
|
+
description: In order to be validated proposals need to reach %{limit} votes.
|
885
|
+
title: 'Votes are subject to the following rules:'
|
884
886
|
vote_limit:
|
885
|
-
description: You can
|
886
|
-
votes: Remaining %{number}
|
887
|
+
description: You can vote up to %{limit} proposals.
|
888
|
+
votes: Remaining %{number} votes
|
887
889
|
wizard_aside:
|
888
890
|
back: Back
|
889
891
|
back_from_step_1: Back to proposals
|
890
|
-
back_from_step_2: Back to
|
891
|
-
back_from_step_3: Back to compare proposals
|
892
|
-
back_from_step_4: Back to edit draft
|
892
|
+
back_from_step_2: Back to edit
|
893
893
|
wizard_steps:
|
894
894
|
current_step: Current step
|
895
895
|
step_1: Create your proposal
|
896
|
-
step_2:
|
897
|
-
step_3: Complete
|
898
|
-
step_4: Publish your proposal
|
896
|
+
step_2: Publish your proposal
|
899
897
|
title: Proposal creation steps
|
900
898
|
proposals_picker:
|
901
899
|
choose_proposals: Choose proposals
|
@@ -916,7 +914,7 @@ en:
|
|
916
914
|
title: Versions
|
917
915
|
withdraw:
|
918
916
|
errors:
|
919
|
-
|
917
|
+
has_votes: This proposal cannot be withdrawn because it already has votes.
|
920
918
|
resource_links:
|
921
919
|
copied_from_component:
|
922
920
|
proposal_proposal: Related proposals
|
@@ -928,4 +926,4 @@ en:
|
|
928
926
|
statistics:
|
929
927
|
proposals_accepted: Accepted Proposals
|
930
928
|
proposals_count: Proposals
|
931
|
-
|
929
|
+
votes_count: Votes
|