decidim-proposals 0.28.3 → 0.29.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (168) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -18
  3. data/app/cells/decidim/proposals/cost_report_cell.rb +0 -3
  4. data/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb +1 -1
  5. data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb +1 -1
  6. data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb +2 -3
  7. data/app/cells/decidim/proposals/proposal_cell.rb +2 -0
  8. data/app/cells/decidim/proposals/proposal_g/show.erb +23 -0
  9. data/app/cells/decidim/proposals/proposal_g_cell.rb +48 -0
  10. data/app/cells/decidim/proposals/proposal_l_cell.rb +1 -3
  11. data/app/cells/decidim/proposals/proposal_metadata_cell.rb +23 -15
  12. data/app/commands/decidim/proposals/admin/answer_proposal.rb +2 -1
  13. data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb +7 -5
  14. data/app/commands/decidim/proposals/admin/create_proposal.rb +2 -2
  15. data/app/commands/decidim/proposals/admin/create_proposal_state.rb +15 -0
  16. data/app/commands/decidim/proposals/admin/destroy_proposal_state.rb +10 -0
  17. data/app/commands/decidim/proposals/admin/import_proposals.rb +10 -2
  18. data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb +4 -21
  19. data/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb +6 -4
  20. data/app/commands/decidim/proposals/admin/update_proposal_state.rb +13 -0
  21. data/app/commands/decidim/proposals/create_proposal.rb +21 -2
  22. data/app/commands/decidim/proposals/update_proposal.rb +2 -2
  23. data/app/commands/decidim/proposals/vote_proposal.rb +1 -1
  24. data/app/commands/decidim/proposals/withdraw_proposal.rb +3 -7
  25. data/app/controllers/concerns/decidim/proposals/admin/filterable.rb +10 -22
  26. data/app/controllers/decidim/proposals/admin/proposal_states_controller.rb +86 -0
  27. data/app/controllers/decidim/proposals/admin/proposals_controller.rb +4 -0
  28. data/app/controllers/decidim/proposals/admin/valuation_assignments_controller.rb +8 -11
  29. data/app/controllers/decidim/proposals/proposals_controller.rb +30 -35
  30. data/app/events/decidim/proposals/proposal_state_changed_event.rb +37 -0
  31. data/app/forms/decidim/proposals/admin/proposal_answer_form.rb +5 -1
  32. data/app/forms/decidim/proposals/admin/proposal_state_form.rb +22 -0
  33. data/app/forms/decidim/proposals/admin/proposals_fork_form.rb +1 -1
  34. data/app/forms/decidim/proposals/admin/proposals_import_form.rb +1 -1
  35. data/app/forms/decidim/proposals/admin/valuation_assignment_form.rb +12 -14
  36. data/app/forms/decidim/proposals/proposal_form.rb +25 -4
  37. data/app/forms/decidim/proposals/reject_access_to_collaborative_draft_form.rb +1 -1
  38. data/app/forms/decidim/proposals/request_access_to_collaborative_draft_form.rb +1 -1
  39. data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb +7 -17
  40. data/app/helpers/decidim/proposals/admin/proposals_helper.rb +13 -89
  41. data/app/helpers/decidim/proposals/application_helper.rb +16 -10
  42. data/app/helpers/decidim/proposals/proposal_cells_helper.rb +6 -2
  43. data/app/helpers/decidim/proposals/proposal_votes_helper.rb +3 -3
  44. data/app/helpers/decidim/proposals/proposal_wizard_helper.rb +5 -8
  45. data/app/helpers/decidim/proposals/proposals_helper.rb +18 -24
  46. data/app/models/decidim/proposals/proposal.rb +78 -28
  47. data/app/models/decidim/proposals/proposal_state.rb +58 -0
  48. data/app/packs/documents/decidim/proposals/participatory_texts/participatory_text.md +1 -3
  49. data/app/packs/images/decidim/proposals/proposal-placeholder-card-g.svg +15 -0
  50. data/app/packs/src/decidim/proposals/add_proposal.js +2 -0
  51. data/app/packs/src/decidim/proposals/admin/proposals.js +43 -8
  52. data/app/packs/stylesheets/decidim/proposals/proposals.scss +39 -1
  53. data/app/permissions/decidim/proposals/admin/permissions.rb +16 -4
  54. data/app/presenters/decidim/proposals/admin_log/proposal_state_presenter.rb +21 -0
  55. data/app/presenters/decidim/proposals/proposal_presenter.rb +12 -3
  56. data/app/queries/decidim/proposals/metrics/endorsements_metric_manage.rb +1 -1
  57. data/app/queries/decidim/proposals/metrics/proposal_followers_metric_measure.rb +1 -1
  58. data/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb +4 -4
  59. data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb +1 -1
  60. data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb +1 -1
  61. data/app/services/decidim/proposals/diff_renderer.rb +1 -1
  62. data/app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb +1 -1
  63. data/app/views/decidim/proposals/admin/participatory_texts/index.html.erb +3 -2
  64. data/app/views/decidim/proposals/admin/proposal_answers/_form.html.erb +2 -2
  65. data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb +3 -3
  66. data/app/views/decidim/proposals/admin/proposal_states/_form.html.erb +67 -0
  67. data/app/views/decidim/proposals/admin/proposal_states/edit.html.erb +18 -0
  68. data/app/views/decidim/proposals/admin/proposal_states/index.html.erb +50 -0
  69. data/app/views/decidim/proposals/admin/proposal_states/new.html.erb +18 -0
  70. data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb +6 -12
  71. data/app/views/decidim/proposals/admin/proposals/_form.html.erb +6 -6
  72. data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb +2 -2
  73. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb +11 -7
  74. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb +7 -5
  75. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_merge.html.erb +2 -2
  76. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb +2 -2
  77. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_recategorize.html.erb +2 -2
  78. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_scope-change.html.erb +2 -2
  79. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_split.html.erb +2 -2
  80. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_valuator.html.erb +11 -7
  81. data/app/views/decidim/proposals/admin/proposals/bulk_actions/_valuators_picker.html.erb +12 -0
  82. data/app/views/decidim/proposals/admin/proposals/index.html.erb +9 -5
  83. data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb +1 -1
  84. data/app/views/decidim/proposals/admin/proposals/show.html.erb +3 -2
  85. data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb +3 -3
  86. data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +12 -5
  87. data/app/views/decidim/proposals/proposals/_proposal.html.erb +1 -1
  88. data/app/views/decidim/proposals/proposals/_proposal_aside.html.erb +1 -1
  89. data/app/views/decidim/proposals/proposals/_proposals.html.erb +9 -3
  90. data/app/views/decidim/proposals/proposals/_vote_button.html.erb +1 -1
  91. data/app/views/decidim/proposals/proposals/_voting_rules.html.erb +3 -3
  92. data/app/views/decidim/proposals/proposals/_wizard_header.html.erb +0 -1
  93. data/app/views/decidim/proposals/proposals/new.html.erb +2 -7
  94. data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb +4 -4
  95. data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb +8 -8
  96. data/app/views/decidim/proposals/proposals/preview.html.erb +1 -1
  97. data/app/views/decidim/proposals/proposals/show.html.erb +1 -1
  98. data/config/locales/ar.yml +6 -114
  99. data/config/locales/bg.yml +110 -106
  100. data/config/locales/ca.yml +81 -78
  101. data/config/locales/cs.yml +60 -122
  102. data/config/locales/de.yml +122 -119
  103. data/config/locales/el.yml +3 -118
  104. data/config/locales/en.yml +110 -107
  105. data/config/locales/es-MX.yml +82 -79
  106. data/config/locales/es-PY.yml +85 -82
  107. data/config/locales/es.yml +81 -78
  108. data/config/locales/eu.yml +103 -107
  109. data/config/locales/fi-plain.yml +87 -84
  110. data/config/locales/fi.yml +118 -115
  111. data/config/locales/fr-CA.yml +86 -83
  112. data/config/locales/fr.yml +78 -75
  113. data/config/locales/ga-IE.yml +1 -27
  114. data/config/locales/gl.yml +5 -104
  115. data/config/locales/he-IL.yml +0 -13
  116. data/config/locales/hu.yml +15 -88
  117. data/config/locales/id-ID.yml +2 -97
  118. data/config/locales/is-IS.yml +1 -33
  119. data/config/locales/it.yml +6 -96
  120. data/config/locales/ja.yml +110 -107
  121. data/config/locales/lb.yml +1 -0
  122. data/config/locales/lt.yml +3 -122
  123. data/config/locales/lv.yml +2 -96
  124. data/config/locales/nl.yml +6 -95
  125. data/config/locales/no.yml +3 -107
  126. data/config/locales/pl.yml +106 -113
  127. data/config/locales/pt-BR.yml +5 -81
  128. data/config/locales/pt.yml +5 -107
  129. data/config/locales/ro-RO.yml +6 -110
  130. data/config/locales/ru.yml +2 -53
  131. data/config/locales/sk.yml +2 -103
  132. data/config/locales/sv.yml +66 -206
  133. data/config/locales/tr-TR.yml +57 -103
  134. data/config/locales/uk.yml +3 -54
  135. data/config/locales/zh-CN.yml +2 -99
  136. data/config/locales/zh-TW.yml +3 -116
  137. data/db/migrate/20240110203500_add_withdrawn_at_field_to_proposals.rb +27 -0
  138. data/db/migrate/20240110203501_create_decidim_proposals_proposal_state.rb +14 -0
  139. data/db/migrate/20240110203502_add_state_id_to_decidim_proposals_proposals.rb +13 -0
  140. data/db/migrate/20240110203503_remove_state_from_decidim_proposals_proposals.rb +11 -0
  141. data/db/migrate/20240110203504_create_default_proposal_states.rb +31 -0
  142. data/db/migrate/20240209092404_change_color_fields_on_proposals_states.rb +54 -0
  143. data/decidim-proposals.gemspec +2 -2
  144. data/lib/decidim/api/proposal_type.rb +4 -0
  145. data/lib/decidim/proposals/admin_engine.rb +8 -0
  146. data/lib/decidim/proposals/admin_filter.rb +37 -0
  147. data/lib/decidim/proposals/component.rb +8 -5
  148. data/lib/decidim/proposals/engine.rb +1 -15
  149. data/lib/decidim/proposals/import/proposal_answer_creator.rb +6 -6
  150. data/lib/decidim/proposals/import/proposal_creator.rb +1 -1
  151. data/lib/decidim/proposals/markdown_to_proposals.rb +2 -8
  152. data/lib/decidim/proposals/proposal_serializer.rb +5 -3
  153. data/lib/decidim/proposals/seeds.rb +60 -51
  154. data/lib/decidim/proposals/test/factories.rb +64 -8
  155. data/lib/decidim/proposals/version.rb +1 -1
  156. data/lib/decidim/proposals.rb +84 -12
  157. data/lib/tasks/proposals/upgrade/decidim_proposals_upgrade_tasks.rake +32 -0
  158. metadata +50 -36
  159. data/app/events/decidim/proposals/accepted_proposal_event.rb +0 -17
  160. data/app/events/decidim/proposals/evaluating_proposal_event.rb +0 -11
  161. data/app/events/decidim/proposals/rejected_proposal_event.rb +0 -17
  162. data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb +0 -44
  163. data/app/queries/decidim/proposals/similar_proposals.rb +0 -67
  164. data/app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb +0 -0
  165. data/app/views/decidim/proposals/proposals/_proposal_badge.html.erb +0 -3
  166. data/app/views/decidim/proposals/proposals/compare.html.erb +0 -24
  167. data/app/views/decidim/proposals/proposals/complete.html.erb +0 -31
  168. data/lib/tasks/proposals/upgrade/decdim_proposal_upgrade_tasks.rake +0 -34
@@ -31,6 +31,19 @@ en:
31
31
  cost: Cost
32
32
  cost_report: Cost report
33
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
34
47
  proposals_copy:
35
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.
36
49
  origin_component_id: Component to copy the proposals from
@@ -62,22 +75,19 @@ en:
62
75
  attributes:
63
76
  base:
64
77
  not_official: Are not official
65
- supported: Have received support or endorsements
78
+ voted: Have received votes or endorsements
66
79
  proposals_split:
67
80
  attributes:
68
81
  base:
69
82
  not_official: Are not official
70
- supported: Have received support or endorsements
83
+ voted: Have received votes or endorsements
71
84
  models:
72
- decidim/proposals/accepted_proposal_event: Proposal accepted
73
85
  decidim/proposals/admin/update_proposal_category_event: Proposal category changed
74
86
  decidim/proposals/admin/update_proposal_scope_event: Proposal scope changed
75
87
  decidim/proposals/creation_enabled_event: Proposal creation enabled
76
88
  decidim/proposals/endorsing_enabled_event: Proposal endorsing enabled
77
- decidim/proposals/evaluating_proposal_event: Proposal is being evaluated
78
89
  decidim/proposals/proposal_mentioned_event: Proposal mentioned
79
90
  decidim/proposals/publish_proposal_event: Proposal published
80
- decidim/proposals/rejected_proposal_event: Proposal rejected
81
91
  decidim/proposals/voting_enabled_event: Proposal voting enabled
82
92
  activerecord:
83
93
  models:
@@ -91,8 +101,8 @@ en:
91
101
  one: Note
92
102
  other: Notes
93
103
  decidim/proposals/proposal_vote:
94
- one: Support
95
- other: Supports
104
+ one: Vote
105
+ other: Votes
96
106
  decidim:
97
107
  admin:
98
108
  filters:
@@ -104,6 +114,8 @@ en:
104
114
  values:
105
115
  'false': Proposals
106
116
  'true': Amendments
117
+ proposal_state_id_eq:
118
+ label: State
107
119
  scope_id_eq:
108
120
  label: Scope
109
121
  state_eq:
@@ -132,7 +144,7 @@ en:
132
144
  comment: Comment
133
145
  create: Create
134
146
  endorse: Endorse
135
- vote: Support
147
+ vote: Vote
136
148
  vote_comment: Vote comment
137
149
  withdraw: Withdraw
138
150
  name: Proposals
@@ -143,7 +155,8 @@ en:
143
155
  amendments_wizard_help_text: Amendments Wizard help text
144
156
  announcement: Announcement
145
157
  attachments_allowed: Allow attachments
146
- can_accumulate_supports_beyond_threshold: Can accumulate supports beyond threshold
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
147
160
  collaborative_drafts_enabled: Collaborative drafts enabled
148
161
  comments_enabled: Comments enabled
149
162
  comments_max_length: Comments max length (Leave 0 for default value)
@@ -154,12 +167,12 @@ en:
154
167
  most_commented: Most commented
155
168
  most_endorsed: Most endorsed
156
169
  most_followed: Most followed
157
- most_voted: Most supported
170
+ most_voted: Most voted
158
171
  random: Random
159
172
  recent: Recent
160
173
  with_more_authors: With more authors
161
174
  geocoding_enabled: Geocoding enabled
162
- minimum_votes_per_user: Minimum supports per user
175
+ minimum_votes_per_user: Minimum votes per user
163
176
  new_proposal_body_template: New proposal body template
164
177
  new_proposal_body_template_help: You can define prefilled text that the new Proposals will have
165
178
  new_proposal_help_text: New proposal help text
@@ -175,14 +188,12 @@ en:
175
188
  proposal_length: Maximum proposal body length
176
189
  proposal_limit: Proposal limit per participant
177
190
  proposal_wizard_step_1_help_text: Proposal wizard "Create" step help text
178
- proposal_wizard_step_2_help_text: Proposal wizard "Compare" step help text
179
- proposal_wizard_step_3_help_text: Proposal wizard "Complete" step help text
180
- 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
181
192
  resources_permissions_enabled: Actions permissions can be set for each proposal
182
193
  scope_id: Scope
183
194
  scopes_enabled: Scopes enabled
184
195
  threshold_per_proposal: Threshold per proposal
185
- vote_limit: Support limit per participant
196
+ vote_limit: Vote limit per participant
186
197
  step:
187
198
  amendment_creation_enabled: Amendment creation enabled
188
199
  amendment_creation_enabled_help: Participant can amend proposals.
@@ -208,7 +219,7 @@ en:
208
219
  most_commented: Most commented
209
220
  most_endorsed: Most endorsed
210
221
  most_followed: Most followed
211
- most_voted: Most supported
222
+ most_voted: Most voted
212
223
  random: Random
213
224
  recent: Recent
214
225
  with_more_authors: With more authors
@@ -218,9 +229,9 @@ en:
218
229
  publish_answers_immediately: Publish proposal answers immediately
219
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>.
220
231
  suggested_hashtags: Hashtags suggested to participants for new proposals
221
- votes_blocked: Supports blocked
222
- votes_enabled: Supports enabled
223
- votes_hidden: Supports hidden (if supports are enabled, checking this will hide the number of supports)
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)
224
235
  events:
225
236
  proposals:
226
237
  admin:
@@ -269,28 +280,6 @@ en:
269
280
  email_outro: You have received this notification because you are following %{participatory_space_title}. You can stop receiving notifications following the previous link.
270
281
  email_subject: Proposals endorsing has started for %{participatory_space_title}
271
282
  notification_title: You can now start <a href="%{resource_path}">endorsing proposals</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
272
- proposal_accepted:
273
- affected_user:
274
- email_intro: 'Your proposal "%{resource_title}" has been accepted. You can read the answer in this page:'
275
- email_outro: You have received this notification because you are an author of "%{resource_title}".
276
- email_subject: Your proposal has been accepted
277
- notification_title: Your proposal <a href="%{resource_path}">%{resource_title}</a> has been accepted.
278
- follower:
279
- email_intro: 'The proposal "%{resource_title}" has been accepted. You can read the answer in this page:'
280
- email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
281
- email_subject: A proposal you are following has been accepted
282
- notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has been accepted.
283
- proposal_evaluating:
284
- affected_user:
285
- email_intro: 'Your proposal "%{resource_title}" is currently being evaluated. You can check for an answer in this page:'
286
- email_outro: You have received this notification because you are an author of "%{resource_title}".
287
- email_subject: Your proposal is being evaluated
288
- notification_title: Your proposal <a href="%{resource_path}">%{resource_title}</a> is being evaluated.
289
- follower:
290
- email_intro: 'The proposal "%{resource_title}" is currently being evaluated. You can check for an answer in this page:'
291
- email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
292
- email_subject: A proposal you are following is being evaluated
293
- notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal is being evaluated.
294
283
  proposal_mentioned:
295
284
  email_intro: Your proposal "%{mentioned_proposal_title}" has been mentioned <a href="%{resource_url}">in this space</a> in the comments.
296
285
  email_outro: You have received this notification because you are an author of "%{resource_title}".
@@ -307,17 +296,17 @@ en:
307
296
  email_subject: New proposal "%{resource_title}" added to %{participatory_space_title}
308
297
  notification_title: The proposal <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title} by %{author}.
309
298
  notification_title_official: The official proposal <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title}.
310
- proposal_rejected:
299
+ proposal_state_changed:
311
300
  affected_user:
312
- email_intro: 'Your proposal "%{resource_title}" has been rejected. You can read the answer in this page:'
301
+ email_intro: 'The proposal "%{resource_title}" has changed its state to "%{state}". You can read the answer in this page:'
313
302
  email_outro: You have received this notification because you are an author of "%{resource_title}".
314
- email_subject: Your proposal has been rejected
315
- notification_title: Your proposal <a href="%{resource_path}">%{resource_title}</a> has been rejected.
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}".
316
305
  follower:
317
- email_intro: 'The proposal "%{resource_title}" has been rejected. You can read the answer in this page:'
306
+ email_intro: 'The proposal "%{resource_title}" has changed its state to "%{state}". You can read the answer in this page:'
318
307
  email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
319
- email_subject: A proposal you are following has been rejected
320
- notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal has been rejected.
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}".
321
310
  proposal_update_category:
322
311
  email_intro: 'An admin has updated the category of your proposal "%{resource_title}", check it out in this page:'
323
312
  email_outro: You have received this notification because you are the author of the proposal.
@@ -329,10 +318,10 @@ en:
329
318
  email_subject: The %{resource_title} proposal scope has been updated
330
319
  notification_title: The <a href="%{resource_path}">%{resource_title}</a> proposal scope has been updated by an admin.
331
320
  voting_enabled:
332
- email_intro: 'You can support proposals in %{participatory_space_title}! Start participating in this page:'
321
+ email_intro: 'You can vote proposals in %{participatory_space_title}! Start participating in this page:'
333
322
  email_outro: You have received this notification because you are following %{participatory_space_title}. You can stop receiving notifications following the previous link.
334
- email_subject: Proposal support has started for %{participatory_space_title}
335
- notification_title: You can now start <a href="%{resource_path}">supporting proposals</a> in <a href="%{participatory_space_url}">%{participatory_space_title}</a>
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>
336
325
  gamification:
337
326
  badges:
338
327
  accepted_proposals:
@@ -349,14 +338,14 @@ en:
349
338
  proposal_votes:
350
339
  conditions:
351
340
  - Browse and spend some time reading other people's proposals
352
- - Give support to the proposals you like or find interesting
353
- description: This badge is granted when you support other people's proposals.
354
- description_another: This participant has given support to %{score} proposals.
355
- description_own: You have given support to %{score} proposals.
356
- name: Proposal supports
357
- next_level_in: Give support to %{score} more proposals to reach the next level!
358
- unearned_another: This participant has not given support to any proposals yet.
359
- unearned_own: You have given support to no proposals yet.
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.
360
349
  proposals:
361
350
  conditions:
362
351
  - Choose the participation space of your interest with submission for proposals enabled
@@ -382,9 +371,9 @@ en:
382
371
  object: proposals
383
372
  title: Proposals
384
373
  votes:
385
- description: Number of supports to proposals
386
- object: supports
387
- title: Supports
374
+ description: Number of votes to proposals
375
+ object: votes
376
+ title: Votes
388
377
  participatory_spaces:
389
378
  highlighted_proposals:
390
379
  last: Last proposals
@@ -392,9 +381,13 @@ en:
392
381
  proposals:
393
382
  actions:
394
383
  answer_proposal: Answer proposal
384
+ delete_proposal_state_confirm: Are you sure you want to delete this state?
385
+ destroy: Delete state
395
386
  edit_proposal: Edit proposal
387
+ edit_proposal_state: Edit state
396
388
  import: Import proposals from another component
397
389
  new: New proposal
390
+ new_proposal_state: New status
398
391
  participatory_texts: Participatory texts
399
392
  show: Show proposal
400
393
  title: Actions
@@ -472,11 +465,7 @@ en:
472
465
  success: Participatory text successfully updated.
473
466
  proposal_answers:
474
467
  form:
475
- accepted: Accepted
476
468
  answer_proposal: Answer
477
- evaluating: Evaluating
478
- not_answered: Not answered
479
- rejected: Rejected
480
469
  title: Answer for proposal %{title}
481
470
  proposal_notes:
482
471
  create:
@@ -487,6 +476,25 @@ en:
487
476
  submit: Submit
488
477
  leave_your_note: Leave your note
489
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
490
498
  proposals:
491
499
  answer:
492
500
  invalid: There has been a problem answering this proposal.
@@ -515,9 +523,11 @@ en:
515
523
  publish: Publish
516
524
  publish_answers: Publish answers
517
525
  select_component: Select a component
526
+ select_valuators: Select one or more valuators
518
527
  selected: selected
519
528
  split: Split proposals
520
529
  split_button: Split
530
+ statuses: Statuses
521
531
  title: Proposals
522
532
  unassign_from_valuator: Unassign from valuator
523
533
  unassign_from_valuator_button: Unassign
@@ -547,7 +557,7 @@ en:
547
557
  remove_assignment: Remove assignment
548
558
  remove_assignment_confirmation: Are you sure you want to remove the valuator from this proposal?
549
559
  valuators: Valuators
550
- votes_count: Supports count
560
+ votes_count: Votes count
551
561
  update_category:
552
562
  invalid: 'These proposals already had the %{subject_name} category: %{proposals}.'
553
563
  select_a_category: Please select a category.
@@ -608,11 +618,8 @@ en:
608
618
  participants: Participants
609
619
  user_groups: Groups
610
620
  filter_state_values:
611
- accepted: Accepted
612
621
  all: All
613
- evaluating: Evaluating
614
622
  not_answered: Not answered
615
- rejected: Rejected
616
623
  filter_type_values:
617
624
  all: All
618
625
  amendments: Amendments
@@ -745,6 +752,9 @@ en:
745
752
  valuator: Valuator
746
753
  valuators: Valuators
747
754
  votes: Votes
755
+ proposal_state:
756
+ css_class: CSS class
757
+ title: Status
748
758
  new:
749
759
  limit_reached: You cannot create new proposals since you have exceeded the limit.
750
760
  participatory_text_proposal:
@@ -754,15 +764,8 @@ en:
754
764
  comment: Comment
755
765
  proposal_votes:
756
766
  create:
757
- error: There was a problem supporting the proposal.
767
+ error: There was a problem voting the proposal.
758
768
  proposals:
759
- compare:
760
- continue: Continue
761
- no_similars_found: Well done! No similar proposals found
762
- title: Similar Proposals
763
- complete:
764
- send: Send
765
- title: Complete your proposal
766
769
  dynamic_map_instructions:
767
770
  description: The coordinates will be updated when clicking on 'preview' button. However, the address does not change.
768
771
  instructions: You can move the point on the map.
@@ -778,7 +781,9 @@ en:
778
781
  discard: Discard this draft
779
782
  discard_confirmation: Are you sure you want to discard this proposal draft?
780
783
  send: Preview
781
- title: Edit proposal draft
784
+ title: Edit Proposal Draft
785
+ edit_form_fields:
786
+ marker_added: Marker added to the map.
782
787
  filters:
783
788
  activity: My activity
784
789
  all: All
@@ -791,13 +796,15 @@ en:
791
796
  search: Search
792
797
  state: Status
793
798
  type: Type
794
- voted: Supported
799
+ voted: Voted
795
800
  index:
796
801
  click_here: See all proposals
797
802
  collaborative_drafts_list: Access collaborative drafts
798
803
  count:
799
804
  one: "%{count} proposal"
800
805
  other: "%{count} proposals"
806
+ grid_mode: Grid mode
807
+ list_mode: List mode
801
808
  new_proposal: New proposal
802
809
  see_all: See all proposals
803
810
  see_all_withdrawn: See all withdrawn proposals
@@ -810,7 +817,7 @@ en:
810
817
  most_commented: Most commented
811
818
  most_endorsed: Most endorsed
812
819
  most_followed: Most followed
813
- most_voted: Most supported
820
+ most_voted: Most voted
814
821
  random: Random
815
822
  recent: Recent
816
823
  with_more_authors: With more authors
@@ -848,49 +855,45 @@ en:
848
855
  proposal_accepted_reason: 'This proposal has been accepted because:'
849
856
  proposal_in_evaluation_reason: This proposal is being evaluated
850
857
  proposal_rejected_reason: 'This proposal has been rejected because:'
851
- withdraw_btn_hint: You can withdraw your proposal if you change your mind, as long as you have not received any support. The proposal is not deleted, it will appear in the list of withdrawn proposals.
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.
852
859
  withdraw_confirmation_html: Are you sure you want to withdraw this proposal?<br><br><strong>This action cannot be cancelled!</strong>
853
860
  withdraw_proposal: Withdraw proposal
854
861
  update:
855
862
  title: Update proposal
856
863
  vote_button:
857
- already_voted: Already supported
858
- already_voted_hover: Withdraw support
859
- maximum_votes_reached: Support limit reached
860
- no_votes_remaining: No supports remaining
861
- vote: Support
862
- votes_blocked: Supports disabled
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
863
870
  votes_count:
864
871
  count:
865
- one: Support
866
- other: Supports
872
+ one: Vote
873
+ other: Votes
867
874
  voting_rules:
868
- can_accumulate_supports_beyond_threshold:
869
- description: Each proposal can accumulate more than %{limit} supports
875
+ can_accumulate_votes_beyond_threshold:
876
+ description: Each proposal can accumulate more than %{limit} votes
870
877
  minimum_votes_per_user:
871
- description: You must distribute a minimum of %{votes} supports among different proposals.
872
- given_enough_votes: You have given enough supports.
873
- supports_remaining: You have to support %{remaining_votes} more proposals for your supports to be taken into account.
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.
874
881
  proposal_limit:
875
882
  description: You can create up to %{limit} proposals.
876
883
  threshold_per_proposal:
877
- description: In order to be validated proposals need to reach %{limit} supports.
878
- title: 'Supports are subject to the following rules:'
884
+ description: In order to be validated proposals need to reach %{limit} votes.
885
+ title: 'Votes are subject to the following rules:'
879
886
  vote_limit:
880
- description: You can support up to %{limit} proposals.
881
- votes: Remaining %{number} supports
887
+ description: You can vote up to %{limit} proposals.
888
+ votes: Remaining %{number} votes
882
889
  wizard_aside:
883
890
  back: Back
884
891
  back_from_step_1: Back to proposals
885
- back_from_step_2: Back to proposals
886
- back_from_step_3: Back to compare proposals
887
- back_from_step_4: Back to edit draft
892
+ back_from_step_2: Back to edit
888
893
  wizard_steps:
889
894
  current_step: Current step
890
895
  step_1: Create your proposal
891
- step_2: Compare
892
- step_3: Complete
893
- step_4: Publish your proposal
896
+ step_2: Publish your proposal
894
897
  title: Proposal creation steps
895
898
  proposals_picker:
896
899
  choose_proposals: Choose proposals
@@ -911,7 +914,7 @@ en:
911
914
  title: Versions
912
915
  withdraw:
913
916
  errors:
914
- has_supports: This proposal cannot be withdrawn because it already has supports.
917
+ has_votes: This proposal cannot be withdrawn because it already has votes.
915
918
  resource_links:
916
919
  copied_from_component:
917
920
  proposal_proposal: Related proposals
@@ -923,4 +926,4 @@ en:
923
926
  statistics:
924
927
  proposals_accepted: Accepted Proposals
925
928
  proposals_count: Proposals
926
- supports_count: Supports
929
+ votes_count: Votes