decidim-proposals 0.26.2 → 0.27.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (133) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb +9 -1
  3. data/app/cells/decidim/proposals/proposal_m_cell.rb +5 -7
  4. data/app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb +1 -1
  5. data/app/commands/decidim/proposals/admin/answer_proposal.rb +1 -1
  6. data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb +1 -1
  7. data/app/commands/decidim/proposals/admin/create_proposal.rb +8 -2
  8. data/app/commands/decidim/proposals/admin/create_proposal_note.rb +2 -2
  9. data/app/commands/decidim/proposals/admin/discard_participatory_text.rb +1 -1
  10. data/app/commands/decidim/proposals/admin/import_participatory_text.rb +1 -1
  11. data/app/commands/decidim/proposals/admin/import_proposals.rb +1 -1
  12. data/app/commands/decidim/proposals/admin/merge_proposals.rb +1 -1
  13. data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb +1 -1
  14. data/app/commands/decidim/proposals/admin/publish_answers.rb +1 -1
  15. data/app/commands/decidim/proposals/admin/split_proposals.rb +1 -1
  16. data/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb +1 -1
  17. data/app/commands/decidim/proposals/admin/update_participatory_text.rb +1 -1
  18. data/app/commands/decidim/proposals/admin/update_proposal.rb +8 -2
  19. data/app/commands/decidim/proposals/admin/update_proposal_category.rb +5 -3
  20. data/app/commands/decidim/proposals/admin/update_proposal_scope.rb +3 -3
  21. data/app/commands/decidim/proposals/create_collaborative_draft.rb +5 -5
  22. data/app/commands/decidim/proposals/create_proposal.rb +1 -1
  23. data/app/commands/decidim/proposals/destroy_proposal.rb +1 -1
  24. data/app/commands/decidim/proposals/publish_collaborative_draft.rb +1 -1
  25. data/app/commands/decidim/proposals/publish_proposal.rb +1 -1
  26. data/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb +1 -1
  27. data/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb +1 -1
  28. data/app/commands/decidim/proposals/unvote_proposal.rb +1 -1
  29. data/app/commands/decidim/proposals/update_collaborative_draft.rb +1 -1
  30. data/app/commands/decidim/proposals/update_proposal.rb +8 -2
  31. data/app/commands/decidim/proposals/vote_proposal.rb +1 -1
  32. data/app/commands/decidim/proposals/withdraw_collaborative_draft.rb +1 -1
  33. data/app/commands/decidim/proposals/withdraw_proposal.rb +1 -1
  34. data/app/controllers/concerns/decidim/proposals/orderable.rb +7 -5
  35. data/app/controllers/decidim/proposals/admin/proposals_controller.rb +7 -7
  36. data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb +8 -8
  37. data/app/controllers/decidim/proposals/proposal_votes_controller.rb +1 -1
  38. data/app/controllers/decidim/proposals/proposals_controller.rb +24 -17
  39. data/app/forms/decidim/proposals/admin/import_participatory_text_form.rb +4 -4
  40. data/app/forms/decidim/proposals/admin/proposal_base_form.rb +4 -4
  41. data/app/forms/decidim/proposals/admin/proposal_form.rb +2 -0
  42. data/app/forms/decidim/proposals/admin/proposals_fork_form.rb +2 -2
  43. data/app/forms/decidim/proposals/admin/proposals_import_form.rb +1 -1
  44. data/app/forms/decidim/proposals/proposal_form.rb +11 -4
  45. data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb +3 -0
  46. data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb +4 -0
  47. data/app/helpers/decidim/proposals/application_helper.rb +4 -6
  48. data/app/helpers/decidim/proposals/proposal_cells_helper.rb +1 -3
  49. data/app/helpers/decidim/proposals/proposal_wizard_helper.rb +7 -7
  50. data/app/models/decidim/proposals/collaborative_draft.rb +10 -0
  51. data/app/models/decidim/proposals/collaborative_draft_collaborator_request.rb +0 -2
  52. data/app/models/decidim/proposals/proposal.rb +47 -8
  53. data/app/queries/decidim/proposals/filtered_proposals.rb +1 -1
  54. data/app/queries/decidim/proposals/similar_proposals.rb +1 -1
  55. data/app/services/decidim/proposals/proposal_search.rb +16 -71
  56. data/app/views/decidim/proposals/admin/proposals/_form.html.erb +1 -1
  57. data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb +1 -1
  58. data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb +26 -0
  59. data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +8 -16
  60. data/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb +4 -4
  61. data/app/views/decidim/proposals/collaborative_drafts/edit.html.erb +3 -1
  62. data/app/views/decidim/proposals/collaborative_drafts/new.html.erb +3 -1
  63. data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +13 -36
  64. data/app/views/decidim/proposals/proposals/_filters.html.erb +5 -5
  65. data/app/views/decidim/proposals/proposals/_proposals.html.erb +5 -5
  66. data/app/views/decidim/proposals/proposals/complete.html.erb +3 -1
  67. data/app/views/decidim/proposals/proposals/edit.html.erb +3 -1
  68. data/app/views/decidim/proposals/proposals/edit_draft.html.erb +3 -1
  69. data/app/views/decidim/proposals/proposals/new.html.erb +3 -1
  70. data/config/locales/am-ET.yml +1 -0
  71. data/config/locales/ar.yml +1 -9
  72. data/config/locales/bg.yml +1 -4
  73. data/config/locales/ca.yml +9 -6
  74. data/config/locales/cs.yml +9 -6
  75. data/config/locales/da.yml +1 -0
  76. data/config/locales/de.yml +1 -9
  77. data/config/locales/el.yml +1 -6
  78. data/config/locales/en.yml +8 -6
  79. data/config/locales/eo.yml +1 -0
  80. data/config/locales/es-MX.yml +10 -7
  81. data/config/locales/es-PY.yml +10 -7
  82. data/config/locales/es.yml +10 -7
  83. data/config/locales/et.yml +1 -0
  84. data/config/locales/eu.yml +1 -9
  85. data/config/locales/fi-plain.yml +9 -6
  86. data/config/locales/fi.yml +9 -6
  87. data/config/locales/fr-CA.yml +9 -6
  88. data/config/locales/fr.yml +9 -6
  89. data/config/locales/ga-IE.yml +1 -2
  90. data/config/locales/gl.yml +8 -9
  91. data/config/locales/hr.yml +1 -0
  92. data/config/locales/hu.yml +8 -6
  93. data/config/locales/id-ID.yml +1 -5
  94. data/config/locales/is-IS.yml +2 -2
  95. data/config/locales/it.yml +2 -9
  96. data/config/locales/ja.yml +9 -6
  97. data/config/locales/ko.yml +1 -0
  98. data/config/locales/lb.yml +1 -0
  99. data/config/locales/lt.yml +1 -0
  100. data/config/locales/lv.yml +1 -6
  101. data/config/locales/mt.yml +1 -0
  102. data/config/locales/nl.yml +2 -9
  103. data/config/locales/no.yml +1 -6
  104. data/config/locales/om-ET.yml +1 -0
  105. data/config/locales/pl.yml +1 -9
  106. data/config/locales/pt-BR.yml +2 -10
  107. data/config/locales/pt.yml +1 -9
  108. data/config/locales/ro-RO.yml +2 -9
  109. data/config/locales/ru.yml +1 -1
  110. data/config/locales/si-LK.yml +1 -0
  111. data/config/locales/sk.yml +1 -6
  112. data/config/locales/sl.yml +1 -0
  113. data/config/locales/so-SO.yml +1 -0
  114. data/config/locales/sr-CS.yml +1 -2
  115. data/config/locales/sv.yml +8 -12
  116. data/config/locales/sw-KE.yml +1 -0
  117. data/config/locales/ti-ER.yml +1 -0
  118. data/config/locales/tr-TR.yml +1 -9
  119. data/config/locales/uk.yml +1 -1
  120. data/config/locales/val-ES.yml +1 -0
  121. data/config/locales/vi.yml +1 -0
  122. data/config/locales/zh-CN.yml +1 -9
  123. data/config/locales/zh-TW.yml +1 -0
  124. data/db/migrate/20180529110230_move_authorships_to_coauthorships.rb +1 -0
  125. data/lib/decidim/proposals/component.rb +19 -14
  126. data/lib/decidim/proposals/import/proposal_answer_creator.rb +21 -19
  127. data/lib/decidim/proposals/test/factories.rb +1 -1
  128. data/lib/decidim/proposals/version.rb +1 -1
  129. metadata +25 -28
  130. data/app/services/decidim/proposals/collaborative_draft_search.rb +0 -59
  131. data/app/views/decidim/proposals/admin/proposals/_js-callout.html.erb +0 -6
  132. data/app/views/decidim/proposals/admin/proposals/update_category.js.erb +0 -26
  133. data/app/views/decidim/proposals/admin/proposals/update_scope.js.erb +0 -27
@@ -83,7 +83,7 @@
83
83
  </div>
84
84
 
85
85
  <div class="row column">
86
- <%= form.upload :file, optional: false %>
86
+ <%= form.upload :file %>
87
87
  <% if params[:id].present? %>
88
88
  <% if proposal.documents.present? %>
89
89
  <%= form.hidden_field :id, value: proposal.documents.first.id %>
@@ -1,4 +1,4 @@
1
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
1
+ $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
2
2
 
3
3
  <% proposal_ids.each do |id| %>
4
4
  $(".table-list [data-id='<%= id %>']")
@@ -0,0 +1,26 @@
1
+ <% if flash.now[:error].present? %>
2
+ $("<%= form_selector %> <%= attribute_selector %>").addClass("is-invalid-input")
3
+ $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
4
+ <% end %>
5
+
6
+ <% if flash.now[:alert].present? %>
7
+ $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
8
+ $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
9
+ <% end %>
10
+
11
+ <% if flash.now[:notice].present? %>
12
+ $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
13
+
14
+ <% proposal_ids.each do |id| %>
15
+ $(".table-list [data-id='<%= id %>']")
16
+ .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
17
+ <% end %>
18
+
19
+ $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
20
+ $(".js-check-all").prop('checked', false);
21
+ $(".js-check-all-resources").prop('checked', false);
22
+ window.hideBulkActionsButton();
23
+ window.hideBulkActionForms();
24
+ window.showOtherActionsButtons();
25
+ window.selectedResourcesCountUpdate();
26
+ <% end %>
@@ -63,21 +63,13 @@
63
63
  <% if component_settings.attachments_allowed? %>
64
64
  <fieldset class="attachments_container">
65
65
  <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
66
- <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
67
- <div class="field">
68
- <%= nested_form.text_field :title %>
69
- </div>
70
-
71
- <div class="field">
72
- <%= nested_form.upload :file, optional: false %>
73
- <% if @form.errors[:attachment].present? %>
74
- <% @form.errors[:attachment].each do |message| %>
75
- <small class="form-error is-visible">
76
- <%= message %>
77
- </small>
78
- <% end %>
79
- <% end %>
80
- </div>
81
- <% end %>
66
+ <div class="row column">
67
+ <%= form.attachment :documents,
68
+ multiple: false,
69
+ label: t("decidim.proposals.collaborative_drafts.new.add_file"),
70
+ button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
71
+ button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
72
+ help_i18n_scope: "decidim.forms.file_help.file" %>
73
+ </div>
82
74
  </fieldset>
83
75
  <% end %>
@@ -4,7 +4,7 @@
4
4
  <div class="filters__section">
5
5
  <div class="filters__search">
6
6
  <div class="input-group">
7
- <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
7
+ <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
8
8
  <div class="input-group-button">
9
9
  <button type="submit" class="button" aria-controls="collaborative_drafts">
10
10
  <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -14,18 +14,18 @@
14
14
  </div>
15
15
  </div>
16
16
 
17
- <%= form.check_boxes_tree :state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
17
+ <%= form.check_boxes_tree :with_any_state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
18
18
 
19
19
  <% if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any? %>
20
20
  <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "collaborative_drafts" %>
21
21
  <% end %>
22
22
 
23
23
  <% if current_component.has_subscopes? %>
24
- <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
24
+ <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
25
25
  <% end %>
26
26
 
27
27
  <% if current_component.categories.any? %>
28
- <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
28
+ <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
29
29
  <% end %>
30
30
 
31
31
  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
@@ -28,4 +28,6 @@
28
28
  </div>
29
29
  </div>
30
30
 
31
- <%= javascript_pack_tag "decidim_proposals" %>
31
+ <% content_for :js_content do %>
32
+ <%= javascript_pack_tag "decidim_proposals" %>
33
+ <% end %>
@@ -21,4 +21,6 @@
21
21
  <div class="columns large-3"></div>
22
22
  </div>
23
23
 
24
- <%= javascript_pack_tag "decidim_proposals" %>
24
+ <% content_for :js_content do %>
25
+ <%= javascript_pack_tag "decidim_proposals" %>
26
+ <% end %>
@@ -67,49 +67,26 @@
67
67
  <% if component_settings.attachments_allowed? && @proposal %>
68
68
  <fieldset class="gallery__container photos_container">
69
69
  <legend><%= t("gallery_legend", scope: "decidim.proposals.proposals.edit") %></legend>
70
-
71
- <% if @form.photos.any? %>
72
- <% @form.photos.each do |photo| %>
73
- <div class="callout gallery__item" id="attachment_<%= photo.id %>" data-closable>
74
- <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.filename %>
75
- <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
76
- <button class="close-button"
77
- aria-label="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
78
- title="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
79
- type="button"
80
- data-close>
81
- <span aria-hidden="true">&times;</span>
82
- </button>
83
- </div>
84
- <% end %>
85
- <% end %>
86
-
87
70
  <div class="row column">
88
- <%= form.file_field :add_photos, multiple: false, label: t("add_images", scope: "decidim.proposals.proposals.edit") %>
71
+ <%= form.attachment :photos,
72
+ multiple: false,
73
+ label: t("decidim.proposals.proposals.edit.add_image"),
74
+ button_label: t("decidim.proposals.proposals.edit.add_image"),
75
+ button_edit_label: t("decidim.proposals.proposals.edit.edit_image"),
76
+ help_i18n_scope: "decidim.forms.file_help.image",
77
+ extension_allowlist: Decidim::OrganizationSettings.for(current_organization).upload_allowed_file_extensions_image %>
89
78
  </div>
90
79
  </fieldset>
91
80
 
92
81
  <fieldset class="attachments_container gallery__container documents_container">
93
82
  <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
94
-
95
- <% if @form.documents.any? %>
96
- <% @form.documents.each do |document| %>
97
- <div class="callout" id="attachment_<%= document.id %>" data-closable>
98
- <%= link_to translated_attribute(document.title), document.url %>
99
- <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
100
- <%= form.hidden_field :documents, multiple: true, value: document.id, id: "document-#{document.id}" %>
101
- <button class="close-button"
102
- aria-label="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
103
- title="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
104
- type="button" data-close>
105
- <span aria-hidden="true">&times;</span>
106
- </button>
107
- </div>
108
- <% end %>
109
- <% end %>
110
-
111
83
  <div class="row column">
112
- <%= form.file_field :add_documents, multiple: true, label: t("add_documents", scope: "decidim.proposals.proposals.edit") %>
84
+ <%= form.attachment :documents,
85
+ multiple: true,
86
+ label: t("decidim.proposals.proposals.edit.add_documents"),
87
+ button_label: t("decidim.proposals.proposals.edit.add_documents"),
88
+ button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
89
+ help_i18n_scope: "decidim.forms.file_help.file" %>
113
90
  </div>
114
91
  </fieldset>
115
92
  <% end %>
@@ -4,7 +4,7 @@
4
4
  <div class="filters__section">
5
5
  <div class="filters__search">
6
6
  <div class="input-group">
7
- <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
7
+ <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
8
8
  <div class="input-group-button">
9
9
  <button type="submit" class="button" aria-controls="proposals">
10
10
  <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -17,19 +17,19 @@
17
17
  <%= form.hidden_field "state_withdraw", value: params.dig("filter", "state_withdraw") %>
18
18
 
19
19
  <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
20
- <%= form.check_boxes_tree :state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
20
+ <%= form.check_boxes_tree :with_any_state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
21
21
  <% end %>
22
22
 
23
23
  <% if current_component.has_subscopes? %>
24
- <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
24
+ <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
25
25
  <% end %>
26
26
 
27
27
  <% if current_component.categories.any? %>
28
- <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
28
+ <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
29
29
  <% end %>
30
30
 
31
31
  <% if component_settings.official_proposals_enabled %>
32
- <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
32
+ <%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
33
33
  <% end %>
34
34
 
35
35
  <% if current_user %>
@@ -1,7 +1,7 @@
1
- <% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
1
+ <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
2
2
  <div class="callout warning">
3
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)),
4
+ go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[with_availability]" => nil)),
5
5
  ).html_safe %>
6
6
  </div>
7
7
  <% end %>
@@ -37,10 +37,10 @@
37
37
 
38
38
  <div class="row">
39
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) %>
40
+ <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
41
+ <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[with_availability]" => nil) %>
42
42
  <% else %>
43
- <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { state_withdraw: "withdrawn", state: [""] }) %>
43
+ <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", state: [""] }) %>
44
44
  <% end %>
45
45
  </div>
46
46
  </div>
@@ -21,4 +21,6 @@
21
21
  <div class="columns large-3"></div>
22
22
  </div>
23
23
 
24
- <%= javascript_pack_tag "decidim_proposals" %>
24
+ <% content_for :js_content do %>
25
+ <%= javascript_pack_tag "decidim_proposals" %>
26
+ <% end %>
@@ -28,4 +28,6 @@
28
28
  </div>
29
29
  </div>
30
30
 
31
- <%= javascript_pack_tag "decidim_proposals" %>
31
+ <% content_for :js_content do %>
32
+ <%= javascript_pack_tag "decidim_proposals" %>
33
+ <% end %>
@@ -23,4 +23,6 @@
23
23
  <div class="columns large-3"></div>
24
24
  </div>
25
25
 
26
- <%= javascript_pack_tag "decidim_proposals" %>
26
+ <% content_for :js_content do %>
27
+ <%= javascript_pack_tag "decidim_proposals" %>
28
+ <% end %>
@@ -35,4 +35,6 @@
35
35
  <div class="columns large-3"></div>
36
36
  </div>
37
37
 
38
- <%= javascript_pack_tag "decidim_proposals" %>
38
+ <% content_for :js_content do %>
39
+ <%= javascript_pack_tag "decidim_proposals" %>
40
+ <% end %>
@@ -1 +1,2 @@
1
+ ---
1
2
  am:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  ar:
2
3
  activemodel:
3
4
  attributes:
@@ -36,10 +37,6 @@ ar:
36
37
  valuator_role_id: اسم المُقيِّم
37
38
  errors:
38
39
  models:
39
- participatory_text:
40
- attributes:
41
- document:
42
- invalid_document_type: 'نوع المستند غير صالح. التنسيقات المقبولة هي: %{valid_mime_types}'
43
40
  proposal:
44
41
  attributes:
45
42
  add_documents:
@@ -432,7 +429,6 @@ ar:
432
429
  all: الكل
433
430
  filter_origin_values:
434
431
  all: الكل
435
- citizens: المواطنون
436
432
  meetings: اجتماعات
437
433
  official: الرسمية
438
434
  user_groups: المجموعات
@@ -610,12 +606,8 @@ ar:
610
606
  many: "%{count} مقترحات"
611
607
  other: "%{count} مقترحات"
612
608
  edit:
613
- add_documents: المستندات
614
- add_images: ملف
615
609
  attachment_legend: "(اختياري) إضافة مرفق"
616
610
  back: الى الخلف
617
- delete_document: حذف المستند
618
- delete_image: حذف الصورة
619
611
  select_a_category: الرجاء تحديد الفئة
620
612
  send: إرسال
621
613
  title: تعديل الاقتراح
@@ -1,3 +1,4 @@
1
+ ---
1
2
  bg:
2
3
  activemodel:
3
4
  attributes:
@@ -36,10 +37,6 @@ bg:
36
37
  valuator_role_id: Име на проверяващ
37
38
  errors:
38
39
  models:
39
- participatory_text:
40
- attributes:
41
- document:
42
- invalid_document_type: 'Невалиден тип документ. Допустимите формати са: %{valid_mime_types}'
43
40
  proposal:
44
41
  attributes:
45
42
  add_documents:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  ca:
2
3
  activemodel:
3
4
  attributes:
@@ -45,7 +46,7 @@ ca:
45
46
  participatory_text:
46
47
  attributes:
47
48
  document:
48
- invalid_document_type: 'Tipus de document no vàlid. Els formats acceptats són: %{valid_mime_types}'
49
+ allowed_file_content_types: 'Tipus de document invàlid. Els formats que s''accepten són: %{types}'
49
50
  proposal:
50
51
  attributes:
51
52
  add_documents:
@@ -594,9 +595,9 @@ ca:
594
595
  all: Totes
595
596
  filter_origin_values:
596
597
  all: Totes
597
- citizens: Ciutadania
598
598
  meetings: Trobades
599
599
  official: Oficial
600
+ participants: Participants
600
601
  user_groups: Grups
601
602
  filter_scope_values:
602
603
  all: Totes
@@ -659,6 +660,8 @@ ca:
659
660
  filter_by: Filtra per
660
661
  unfold: Desplega
661
662
  new:
663
+ add_file: Afegir fitxer
664
+ edit_file: Editar el fitxer
662
665
  send: Continua
663
666
  new_collaborative_draft_button:
664
667
  new_collaborative_draft: Nou esborrany col·laboratiu
@@ -769,12 +772,12 @@ ca:
769
772
  description: Les coordenades s'actualitzaran quan facis clic en el botó 'previsualitzar'. No obstant això, la direcció no canvia.
770
773
  instructions: Pots moure la ubicació en el mapa.
771
774
  edit:
772
- add_documents: Documents
773
- add_images: Arxiu
775
+ add_documents: Afegir documents
776
+ add_image: Afegir imatge
774
777
  attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
775
778
  back: Torna
776
- delete_document: Eliminar document
777
- delete_image: Eliminar imatge
779
+ edit_documents: Editar documents
780
+ edit_image: Editar imatge
778
781
  gallery_legend: "(Opcional) Afegir una imatge a la targeta de proposta"
779
782
  select_a_category: Si us plau, selecciona una categoria
780
783
  send: Envia
@@ -1,3 +1,4 @@
1
+ ---
1
2
  cs:
2
3
  activemodel:
3
4
  attributes:
@@ -45,7 +46,7 @@ cs:
45
46
  participatory_text:
46
47
  attributes:
47
48
  document:
48
- invalid_document_type: 'Neplatný typ dokumentu. Přijaté formáty jsou: %{valid_mime_types}'
49
+ allowed_file_content_types: 'Neplatný typ dokumentu. Přijatelné formáty jsou: %{types}'
49
50
  proposal:
50
51
  attributes:
51
52
  add_documents:
@@ -608,9 +609,9 @@ cs:
608
609
  all: Vše
609
610
  filter_origin_values:
610
611
  all: Vše
611
- citizens: Občané
612
612
  meetings: Setkání
613
613
  official: Oficiální
614
+ participants: Účastníci
614
615
  user_groups: Skupiny uživatelů
615
616
  filter_scope_values:
616
617
  all: Vše
@@ -675,6 +676,8 @@ cs:
675
676
  filter_by: Filtrovat podle
676
677
  unfold: Rozvinout
677
678
  new:
679
+ add_file: Přidat soubor
680
+ edit_file: Upravit soubor
678
681
  send: Pokračovat
679
682
  new_collaborative_draft_button:
680
683
  new_collaborative_draft: Nový návrh spolupráce
@@ -789,12 +792,12 @@ cs:
789
792
  description: Souřadnice budou aktualizovány po kliknutí na tlačítko 'náhled'. Adresa se však nemění.
790
793
  instructions: Můžete přesunout bod na mapě.
791
794
  edit:
792
- add_documents: Dokumenty
793
- add_images: Soubor
795
+ add_documents: Přidat dokumenty
796
+ add_image: Přidat obrázek
794
797
  attachment_legend: "(Volitelné) Přidání přílohy"
795
798
  back: Zadní
796
- delete_document: Smazat dokument
797
- delete_image: Smazat obrázek
799
+ edit_documents: Upravit dokumenty
800
+ edit_image: Upravit obrázek
798
801
  gallery_legend: "(Volitelné) Přidejte obrázek na kartu návrhu"
799
802
  select_a_category: Vyberte kategorii
800
803
  send: Poslat
@@ -1 +1,2 @@
1
+ ---
1
2
  da:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  de:
2
3
  activemodel:
3
4
  attributes:
@@ -42,10 +43,6 @@ de:
42
43
  valuator_role_id: Name des Schätzers
43
44
  errors:
44
45
  models:
45
- participatory_text:
46
- attributes:
47
- document:
48
- invalid_document_type: 'Ungültiger Dokumenttyp Zulässige Formate sind: %{valid_mime_types}'
49
46
  proposal:
50
47
  attributes:
51
48
  add_documents:
@@ -527,7 +524,6 @@ de:
527
524
  all: Alle
528
525
  filter_origin_values:
529
526
  all: Alle
530
- citizens: Einzelpersonen
531
527
  meetings: Meetings
532
528
  official: Offiziell
533
529
  user_groups: Benutzergruppen
@@ -699,12 +695,8 @@ de:
699
695
  one: "%{count} Vorschlag"
700
696
  other: "%{count} Vorschläge"
701
697
  edit:
702
- add_documents: Unterlagen
703
- add_images: Datei
704
698
  attachment_legend: "(Optional) Fügen Sie einen Anhang hinzu"
705
699
  back: Zurück
706
- delete_document: Dokument löschen
707
- delete_image: Bild löschen
708
700
  gallery_legend: "(Optional) Ein Bild zur Vorschlagskarte hinzufügen"
709
701
  select_a_category: Bitte wählen sie eine Kategorie
710
702
  send: Abschicken
@@ -1,3 +1,4 @@
1
+ ---
1
2
  el:
2
3
  activemodel:
3
4
  attributes:
@@ -38,10 +39,6 @@ el:
38
39
  valuator_role_id: Όνομα εκτιμητή
39
40
  errors:
40
41
  models:
41
- participatory_text:
42
- attributes:
43
- document:
44
- invalid_document_type: 'Μη έγκυρος τύπος εγγράφου. Οι αποδεκτές μορφές είναι: %{valid_mime_types}'
45
42
  proposal:
46
43
  attributes:
47
44
  add_documents:
@@ -487,7 +484,6 @@ el:
487
484
  all: Όλα
488
485
  filter_origin_values:
489
486
  all: Όλα
490
- citizens: Πολίτες
491
487
  meetings: Συσκέψεις
492
488
  official: Επίσημη
493
489
  user_groups: Ομάδες
@@ -655,7 +651,6 @@ el:
655
651
  one: "%{count} πρόταση"
656
652
  other: "%{count} προτάσεις"
657
653
  edit:
658
- add_documents: Έγγραφα
659
654
  attachment_legend: "(Προαιρετικά) Προσθήκη συνημμένου"
660
655
  back: Πίσω
661
656
  select_a_category: Επιλέξτε μια κατηγορία
@@ -46,7 +46,7 @@ en:
46
46
  participatory_text:
47
47
  attributes:
48
48
  document:
49
- invalid_document_type: 'Invalid document type. Accepted formats are: %{valid_mime_types}'
49
+ allowed_file_content_types: 'Invalid document type. Accepted formats are: %{types}'
50
50
  proposal:
51
51
  attributes:
52
52
  add_documents:
@@ -595,9 +595,9 @@ en:
595
595
  all: All
596
596
  filter_origin_values:
597
597
  all: All
598
- citizens: Citizens
599
598
  meetings: Meetings
600
599
  official: Official
600
+ participants: Participants
601
601
  user_groups: Groups
602
602
  filter_scope_values:
603
603
  all: All
@@ -660,6 +660,8 @@ en:
660
660
  filter_by: Filter by
661
661
  unfold: Unfold
662
662
  new:
663
+ add_file: Add file
664
+ edit_file: Edit file
663
665
  send: Continue
664
666
  new_collaborative_draft_button:
665
667
  new_collaborative_draft: New collaborative draft
@@ -770,12 +772,12 @@ en:
770
772
  description: The coordinates will be updated when clicking on 'preview' button. However, the address does not change.
771
773
  instructions: You can move the point on the map.
772
774
  edit:
773
- add_documents: Documents
774
- add_images: File
775
+ add_documents: Add documents
776
+ add_image: Add image
775
777
  attachment_legend: "(Optional) Add an attachment"
776
778
  back: Back
777
- delete_document: Delete Document
778
- delete_image: Delete Image
779
+ edit_documents: Edit documents
780
+ edit_image: Edit image
779
781
  gallery_legend: "(Optional) Add an image to the proposal card"
780
782
  select_a_category: Please select a category
781
783
  send: Send
@@ -1 +1,2 @@
1
+ ---
1
2
  eo:
@@ -1,3 +1,4 @@
1
+ ---
1
2
  es-MX:
2
3
  activemodel:
3
4
  attributes:
@@ -45,7 +46,7 @@ es-MX:
45
46
  participatory_text:
46
47
  attributes:
47
48
  document:
48
- invalid_document_type: 'Tipo de documento no válido. Los formatos aceptados son: %{valid_mime_types}'
49
+ allowed_file_content_types: 'Tipo de documento inválido. Los formatos que se aceptan son: %{types}'
49
50
  proposal:
50
51
  attributes:
51
52
  add_documents:
@@ -197,7 +198,7 @@ es-MX:
197
198
  automatic_hashtags: Hashtags añadidos a todas las propuestas.
198
199
  comments_blocked: Comentarios bloqueados
199
200
  creation_enabled: Las participantes pueden crear propuestas
200
- creation_enabled_readonly: Esta opción se desactiva cuando activas la funcionalidad de Textos Participativos. Para subir propuestas como texto participativo haga clic en el botón Textos Participativos y siga las instrucciones.
201
+ creation_enabled_readonly: Esta opción se desactiva cuando activas la funcionalidad de Textos Participativos. Para subir propuestas como texto participativo haz clic en el botón Textos Participativos y sigue las instrucciones.
201
202
  default_sort_order: Orden predeterminado de propuestas
202
203
  default_sort_order_help: Por defecto significa que si los apoyos están habilitados, las propuestas se mostrarán en orden aleatorio, y si los apoyos están bloqueados, se ordenarán por las más apoyadas.
203
204
  default_sort_order_options:
@@ -594,9 +595,9 @@ es-MX:
594
595
  all: Todos
595
596
  filter_origin_values:
596
597
  all: Todos
597
- citizens: Ciudadanía
598
598
  meetings: Encuentros
599
599
  official: Oficial
600
+ participants: Participantes
600
601
  user_groups: Grupos de Usuarios
601
602
  filter_scope_values:
602
603
  all: Todos
@@ -659,6 +660,8 @@ es-MX:
659
660
  filter_by: Filtrado por
660
661
  unfold: Desplegar
661
662
  new:
663
+ add_file: Añadir archivo
664
+ edit_file: Editar fichero
662
665
  send: Continuar
663
666
  new_collaborative_draft_button:
664
667
  new_collaborative_draft: Nuevo borrador colaborativo
@@ -769,12 +772,12 @@ es-MX:
769
772
  description: Las coordenadas se actualizarán cuando hagas clic en el botón 'previsualizar'. Sin embargo, la dirección no cambia.
770
773
  instructions: Puedes mover la ubicación en el mapa.
771
774
  edit:
772
- add_documents: Documentos
773
- add_images: Archivo
775
+ add_documents: Añadir documentos
776
+ add_image: Añadir imagen
774
777
  attachment_legend: "(Opcional) Agregar un archivo adjunto"
775
778
  back: Atrás
776
- delete_document: Borrar Documento
777
- delete_image: Borrar imagen
779
+ edit_documents: Editar documentos
780
+ edit_image: Editar imagen
778
781
  gallery_legend: "(Opcional) Añadir una imagen a la tarjeta de propuesta"
779
782
  select_a_category: Por favor, selecciona una categoría
780
783
  send: Enviar