decidim-core 0.18.1 → 0.19.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of decidim-core might be problematic. Click here for more details.

Files changed (275) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/config/decidim_core_manifest.js +3 -0
  3. data/app/assets/javascripts/decidim/social_share.js +2 -0
  4. data/app/assets/stylesheets/decidim/extras/_social_share.css.scss +36 -0
  5. data/app/assets/stylesheets/decidim/modules/_input-gallery.scss +24 -0
  6. data/app/assets/stylesheets/decidim/modules/_navbar.scss +1 -1
  7. data/app/cells/decidim/activities_cell.rb +13 -8
  8. data/app/cells/decidim/activity_cell.rb +19 -5
  9. data/app/cells/decidim/address/details.erb +2 -2
  10. data/app/cells/decidim/amendable/amenders_list/show.erb +1 -1
  11. data/app/cells/decidim/amendable/amenders_list_cell.rb +5 -1
  12. data/app/cells/decidim/amendable/announcement_cell.rb +22 -9
  13. data/app/cells/decidim/amendable/wizard_step_form_cell.rb +121 -0
  14. data/app/cells/decidim/announcement_cell.rb +1 -0
  15. data/app/cells/decidim/author_cell.rb +7 -0
  16. data/app/cells/decidim/card_m_cell.rb +3 -1
  17. data/app/cells/decidim/coauthorships_cell.rb +3 -1
  18. data/app/cells/decidim/collapsible_authors_cell.rb +1 -0
  19. data/app/cells/decidim/collapsible_list_cell.rb +1 -0
  20. data/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb +1 -0
  21. data/app/cells/decidim/content_blocks/last_activity_cell.rb +3 -2
  22. data/app/cells/decidim/content_blocks/metrics_cell.rb +1 -0
  23. data/app/cells/decidim/content_blocks/stats_cell.rb +1 -0
  24. data/app/cells/decidim/content_blocks/sub_hero_cell.rb +1 -0
  25. data/app/cells/decidim/diff_cell.rb +1 -1
  26. data/app/cells/decidim/fingerprint/show.erb +1 -1
  27. data/app/cells/decidim/follow_button_cell.rb +3 -0
  28. data/app/cells/decidim/members_cell.rb +1 -0
  29. data/app/cells/decidim/notifications/show.erb +1 -1
  30. data/app/cells/decidim/profile_cell.rb +1 -0
  31. data/app/cells/decidim/profile_sidebar_cell.rb +4 -0
  32. data/app/cells/decidim/search_results_cell.rb +1 -0
  33. data/app/cells/decidim/search_results_section/show.erb +1 -1
  34. data/app/cells/decidim/tos_page_cell.rb +1 -0
  35. data/app/cells/decidim/user_group_pending_invitations_list_cell.rb +1 -0
  36. data/app/cells/decidim/user_group_pending_requests_list_cell.rb +1 -0
  37. data/app/cells/decidim/wizard_step_form/wizard_aside.erb +14 -0
  38. data/app/cells/decidim/wizard_step_form/wizard_header.erb +18 -0
  39. data/app/cells/decidim/wizard_step_form_cell.rb +112 -0
  40. data/app/commands/decidim/amendable/accept.rb +1 -1
  41. data/app/commands/decidim/amendable/create_draft.rb +70 -0
  42. data/app/commands/decidim/amendable/destroy_draft.rb +40 -0
  43. data/app/commands/decidim/amendable/promote.rb +13 -11
  44. data/app/commands/decidim/amendable/publish_draft.rb +76 -0
  45. data/app/commands/decidim/amendable/update_draft.rb +54 -0
  46. data/app/commands/decidim/amendable/withdraw.rb +31 -15
  47. data/app/commands/decidim/create_follow.rb +1 -0
  48. data/app/commands/decidim/create_omniauth_registration.rb +22 -4
  49. data/app/commands/decidim/create_registration.rb +5 -0
  50. data/app/commands/decidim/delete_follow.rb +1 -0
  51. data/app/commands/decidim/search.rb +1 -0
  52. data/app/controllers/concerns/decidim/action_authorization.rb +2 -0
  53. data/app/controllers/concerns/decidim/amendments_controller.rb +148 -28
  54. data/app/controllers/concerns/decidim/devise_controllers.rb +3 -2
  55. data/app/controllers/concerns/decidim/force_authentication.rb +38 -0
  56. data/app/controllers/concerns/decidim/impersonate_users.rb +1 -0
  57. data/app/controllers/concerns/decidim/locale_switcher.rb +44 -17
  58. data/app/controllers/concerns/decidim/needs_tos_accepted.rb +8 -0
  59. data/app/controllers/concerns/decidim/orderable.rb +36 -0
  60. data/app/controllers/concerns/decidim/participatory_space_context.rb +2 -0
  61. data/app/controllers/concerns/decidim/safe_redirect.rb +24 -0
  62. data/app/controllers/decidim/application_controller.rb +19 -2
  63. data/app/controllers/decidim/devise/confirmations_controller.rb +6 -0
  64. data/app/controllers/decidim/devise/invitations_controller.rb +8 -4
  65. data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +4 -1
  66. data/app/controllers/decidim/errors_controller.rb +3 -0
  67. data/app/controllers/decidim/follows_controller.rb +2 -2
  68. data/app/controllers/decidim/messaging/conversations_controller.rb +2 -2
  69. data/app/controllers/decidim/profiles_controller.rb +4 -1
  70. data/app/controllers/decidim/scopes_controller.rb +16 -4
  71. data/app/events/decidim/amendable/amendment_base_event.rb +4 -0
  72. data/app/forms/decidim/account_form.rb +1 -1
  73. data/app/forms/decidim/amendable/create_form.rb +3 -19
  74. data/app/forms/decidim/amendable/edit_form.rb +22 -0
  75. data/app/forms/decidim/amendable/form.rb +42 -20
  76. data/app/forms/decidim/amendable/promote_form.rb +4 -7
  77. data/app/forms/decidim/amendable/publish_form.rb +21 -0
  78. data/app/forms/decidim/amendable/reject_form.rb +1 -1
  79. data/app/forms/decidim/amendable/review_form.rb +9 -4
  80. data/app/forms/decidim/invite_user_form.rb +1 -0
  81. data/app/forms/decidim/notifications_settings_form.rb +1 -0
  82. data/app/forms/decidim/registration_form.rb +4 -3
  83. data/app/forms/decidim/user_group_form.rb +1 -0
  84. data/app/forms/decidim/user_interests_form.rb +1 -0
  85. data/app/helpers/decidim/amendments_helper.rb +33 -19
  86. data/app/helpers/decidim/cells_helper.rb +2 -0
  87. data/app/helpers/decidim/layout_helper.rb +1 -0
  88. data/app/helpers/decidim/map_helper.rb +1 -1
  89. data/app/helpers/decidim/meta_tags_helper.rb +1 -0
  90. data/app/helpers/decidim/resource_reference_helper.rb +1 -0
  91. data/app/jobs/decidim/event_publisher_job.rb +60 -0
  92. data/app/jobs/decidim/metric_job.rb +1 -0
  93. data/app/models/decidim/action_log.rb +12 -0
  94. data/app/models/decidim/amendment.rb +31 -2
  95. data/app/models/decidim/attachment.rb +2 -0
  96. data/app/models/decidim/authorization.rb +1 -0
  97. data/app/models/decidim/category.rb +1 -0
  98. data/app/models/decidim/component.rb +7 -0
  99. data/app/models/decidim/content_block.rb +1 -0
  100. data/app/models/decidim/follow.rb +3 -0
  101. data/app/models/decidim/identity.rb +1 -0
  102. data/app/models/decidim/impersonation_log.rb +2 -0
  103. data/app/models/decidim/newsletter.rb +1 -0
  104. data/app/models/decidim/participatory_process_user_role.rb +1 -0
  105. data/app/models/decidim/participatory_space_private_user.rb +1 -0
  106. data/app/models/decidim/permission_action.rb +2 -0
  107. data/app/models/decidim/report.rb +1 -0
  108. data/app/models/decidim/scope.rb +1 -0
  109. data/app/models/decidim/searchable_resource.rb +1 -1
  110. data/app/models/decidim/static_page.rb +1 -0
  111. data/app/models/decidim/user.rb +2 -0
  112. data/app/permissions/decidim/permissions.rb +18 -14
  113. data/app/permissions/decidim/user_manager_permissions.rb +9 -2
  114. data/app/presenters/decidim/admin_log/organization_presenter.rb +1 -0
  115. data/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb +1 -1
  116. data/app/presenters/decidim/admin_log/user_presenter.rb +1 -1
  117. data/app/presenters/decidim/hashtag_presenter.rb +1 -1
  118. data/app/presenters/decidim/log/base_presenter.rb +1 -0
  119. data/app/presenters/decidim/log/diff_presenter.rb +1 -1
  120. data/app/presenters/decidim/log/value_types/area_presenter.rb +1 -0
  121. data/app/presenters/decidim/log/value_types/area_type_presenter.rb +1 -0
  122. data/app/presenters/decidim/log/value_types/currency_presenter.rb +1 -0
  123. data/app/presenters/decidim/log/value_types/date_presenter.rb +1 -0
  124. data/app/presenters/decidim/log/value_types/locale_presenter.rb +1 -0
  125. data/app/presenters/decidim/log/value_types/percentage_presenter.rb +1 -0
  126. data/app/presenters/decidim/log/value_types/scope_presenter.rb +1 -0
  127. data/app/presenters/decidim/log/value_types/scope_type_presenter.rb +1 -0
  128. data/app/presenters/decidim/metric_charts_presenter.rb +1 -0
  129. data/app/presenters/decidim/metric_object_presenter.rb +4 -0
  130. data/app/queries/decidim/metric_manage.rb +3 -0
  131. data/app/queries/decidim/metric_measure.rb +1 -0
  132. data/app/queries/decidim/metrics/followers_metric_manage.rb +3 -0
  133. data/app/queries/decidim/metrics/participants_metric_manage.rb +4 -0
  134. data/app/queries/decidim/similar_emendations.rb +56 -0
  135. data/app/resolvers/decidim/core/metric_resolver.rb +1 -0
  136. data/app/services/decidim/action_authorizer.rb +1 -0
  137. data/app/services/decidim/action_logger.rb +1 -0
  138. data/app/services/decidim/activity_search.rb +1 -0
  139. data/app/services/decidim/email_notification_generator.rb +4 -0
  140. data/app/services/decidim/notification_generator.rb +2 -0
  141. data/app/services/decidim/notification_generator_for_recipient.rb +0 -1
  142. data/app/services/decidim/resource_search.rb +1 -1
  143. data/app/services/decidim/traceability.rb +1 -0
  144. data/app/uploaders/decidim/application_uploader.rb +1 -0
  145. data/app/uploaders/decidim/attachment_uploader.rb +16 -0
  146. data/app/uploaders/decidim/avatar_uploader.rb +0 -2
  147. data/app/uploaders/decidim/data_portability_uploader.rb +1 -0
  148. data/app/uploaders/decidim/homepage_image_uploader.rb +0 -2
  149. data/app/uploaders/decidim/image_uploader.rb +15 -1
  150. data/app/uploaders/decidim/oauth_application_logo_uploader.rb +0 -1
  151. data/app/uploaders/decidim/official_image_footer_uploader.rb +0 -1
  152. data/app/uploaders/decidim/official_image_header_uploader.rb +0 -1
  153. data/app/uploaders/decidim/open_data_uploader.rb +1 -0
  154. data/app/validators/etiquette_validator.rb +5 -0
  155. data/app/views/decidim/account/delete.html.erb +2 -2
  156. data/app/views/decidim/account/show.html.erb +1 -1
  157. data/app/views/decidim/amendments/_edit_form_fields.html.erb +16 -13
  158. data/app/views/decidim/amendments/_similar_emendation.html.erb +24 -0
  159. data/app/views/decidim/amendments/compare_draft.html.erb +21 -0
  160. data/app/views/decidim/amendments/edit_draft.html.erb +31 -0
  161. data/app/views/decidim/amendments/new.html.erb +5 -17
  162. data/app/views/decidim/amendments/preview_draft.html.erb +32 -0
  163. data/app/views/decidim/amendments/review.html.erb +5 -3
  164. data/app/views/decidim/application/_document.html.erb +1 -1
  165. data/app/views/decidim/application/_photos.html.erb +1 -1
  166. data/app/views/decidim/data_portability/show.html.erb +1 -1
  167. data/app/views/decidim/devise/invitations/edit.html.erb +2 -2
  168. data/app/views/decidim/devise/sessions/new.html.erb +1 -1
  169. data/app/views/decidim/doorkeeper/authorizations/new.html.erb +3 -3
  170. data/app/views/decidim/export_mailer/data_portability_export.html.erb +1 -1
  171. data/app/views/decidim/searches/index.js.erb +6 -0
  172. data/app/views/decidim/shared/_address_details.html.erb +2 -2
  173. data/app/views/decidim/shared/_embed_modal.html.erb +1 -1
  174. data/app/views/decidim/shared/_share_modal.html.erb +7 -4
  175. data/app/views/layouts/decidim/_application.html.erb +0 -1
  176. data/app/views/layouts/decidim/_head.html.erb +13 -12
  177. data/app/views/layouts/decidim/_logo.html.erb +1 -1
  178. data/app/views/layouts/decidim/_social_media_links.html.erb +5 -5
  179. data/app/views/layouts/decidim/_user_menu.html.erb +1 -1
  180. data/app/views/layouts/decidim/_wrapper.html.erb +2 -2
  181. data/app/views/layouts/decidim/mailer.html.erb +2 -2
  182. data/config/locales/ar.yml +27 -17
  183. data/config/locales/ca.yml +79 -15
  184. data/config/locales/cs.yml +73 -14
  185. data/config/locales/de.yml +62 -12
  186. data/config/locales/en.yml +80 -16
  187. data/config/locales/eo-UY.yml +16 -0
  188. data/config/locales/es-MX.yml +73 -11
  189. data/config/locales/es-PY.yml +73 -11
  190. data/config/locales/es.yml +79 -15
  191. data/config/locales/eu.yml +6 -13
  192. data/config/locales/fi-plain.yml +75 -11
  193. data/config/locales/fi.yml +80 -16
  194. data/config/locales/fr.yml +70 -16
  195. data/config/locales/gl.yml +6 -13
  196. data/config/locales/hu.yml +80 -17
  197. data/config/locales/id-ID.yml +6 -12
  198. data/config/locales/it.yml +56 -14
  199. data/config/locales/nl.yml +76 -12
  200. data/config/locales/no.yml +11 -2
  201. data/config/locales/pl.yml +6 -15
  202. data/config/locales/pt-BR.yml +6 -13
  203. data/config/locales/pt.yml +6 -13
  204. data/config/locales/ru.yml +7 -2
  205. data/config/locales/sv.yml +34 -18
  206. data/config/locales/tr-TR.yml +15 -12
  207. data/config/locales/uk.yml +7 -2
  208. data/config/routes.rb +7 -0
  209. data/db/migrate/20180226140756_add_version_to_action_logs.rb +1 -0
  210. data/db/migrate/20180305132906_rename_features_to_components.rb +1 -0
  211. data/db/migrate/20190412131728_fix_user_names.rb +1 -1
  212. data/db/migrate/20190610093742_add_force_users_to_authenticate_before_access_organization.rb +10 -0
  213. data/db/migrate/20190618075906_add_confidential_to_doorkeeper_application.rb +13 -0
  214. data/db/migrate/{20190925091507_add_uniq_index_to_decidim_metrics.rb → 20190829092826_add_uniq_index_to_decidim_metrics.rb} +0 -0
  215. data/lib/decidim/amendable.rb +87 -13
  216. data/lib/decidim/attributes/localized_date.rb +5 -0
  217. data/lib/decidim/attributes/time_with_zone.rb +5 -0
  218. data/lib/decidim/authorable.rb +3 -0
  219. data/lib/decidim/authorization_form_builder.rb +2 -2
  220. data/lib/decidim/component_manifest.rb +2 -0
  221. data/lib/decidim/content_parsers.rb +2 -0
  222. data/lib/decidim/content_parsers/hashtag_parser.rb +1 -1
  223. data/lib/decidim/content_parsers/link_parser.rb +10 -0
  224. data/lib/decidim/content_parsers/newline_parser.rb +20 -0
  225. data/lib/decidim/content_parsers/user_parser.rb +1 -1
  226. data/lib/decidim/content_processor.rb +2 -0
  227. data/lib/decidim/content_renderers.rb +1 -0
  228. data/lib/decidim/content_renderers/hashtag_renderer.rb +1 -1
  229. data/lib/decidim/content_renderers/link_renderer.rb +24 -0
  230. data/lib/decidim/content_renderers/user_renderer.rb +2 -2
  231. data/lib/decidim/core.rb +11 -0
  232. data/lib/decidim/core/engine.rb +2 -28
  233. data/lib/decidim/core/test.rb +4 -1
  234. data/lib/decidim/core/test/factories.rb +35 -8
  235. data/lib/decidim/core/test/shared_examples/amendable/create_amendment_draft_examples.rb +50 -0
  236. data/lib/decidim/core/test/shared_examples/amendable/destroy_amendment_draft_examples.rb +39 -0
  237. data/lib/decidim/core/test/shared_examples/amendable/promote_amendment_examples.rb +27 -3
  238. data/lib/decidim/core/test/shared_examples/amendable/{create_amendment_examples.rb → publish_amendment_draft_examples.rb} +26 -17
  239. data/lib/decidim/core/test/shared_examples/amendable/update_amendment_draft_examples.rb +42 -0
  240. data/lib/decidim/core/test/shared_examples/amendable/withdraw_amendment_examples.rb +19 -11
  241. data/lib/decidim/core/test/shared_examples/has_attachment_collections.rb +1 -1
  242. data/lib/decidim/core/test/shared_examples/has_attachments.rb +1 -1
  243. data/lib/decidim/core/test/shared_examples/simple_event.rb +4 -0
  244. data/lib/decidim/core/version.rb +1 -1
  245. data/lib/decidim/data_portability_file_zipper.rb +3 -0
  246. data/lib/decidim/events/author_event.rb +1 -0
  247. data/lib/decidim/events/base_event.rb +12 -22
  248. data/lib/decidim/events/coauthor_event.rb +1 -0
  249. data/lib/decidim/events/simple_event.rb +3 -0
  250. data/lib/decidim/exporters/csv.rb +1 -0
  251. data/lib/decidim/fingerprintable.rb +1 -0
  252. data/lib/decidim/followable.rb +8 -0
  253. data/lib/decidim/form_builder.rb +24 -3
  254. data/lib/decidim/gamification.rb +4 -0
  255. data/lib/decidim/gamification/badge_status.rb +1 -0
  256. data/lib/decidim/has_category.rb +2 -0
  257. data/lib/decidim/has_component.rb +2 -7
  258. data/lib/decidim/has_private_users.rb +8 -1
  259. data/lib/decidim/has_settings.rb +12 -8
  260. data/lib/decidim/hashtaggable.rb +4 -0
  261. data/lib/decidim/metric_operation_manifest.rb +1 -0
  262. data/lib/decidim/nicknamizable.rb +1 -0
  263. data/lib/decidim/participable.rb +1 -0
  264. data/lib/decidim/participatory_space_resourceable.rb +1 -0
  265. data/lib/decidim/randomable.rb +20 -0
  266. data/lib/decidim/search_resource_fields_mapper.rb +2 -0
  267. data/lib/decidim/searchable.rb +2 -0
  268. data/lib/decidim/settings_manifest.rb +10 -1
  269. data/lib/decidim/stats_registry.rb +1 -0
  270. data/lib/decidim/view_model.rb +1 -1
  271. data/lib/tasks/decidim_data_portability_tasks.rake +1 -0
  272. data/lib/tasks/decidim_metrics_tasks.rake +2 -0
  273. data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.no.js +12 -12
  274. metadata +140 -82
  275. data/app/commands/decidim/amendable/create.rb +0 -80
@@ -142,9 +142,6 @@ pt-BR:
142
142
  promote_confirm_text: Tem certeza de que deseja promover essa emenda?
143
143
  promote_help_text: Você pode promover esta emendação e publicá-la como um %{model_name}independente
144
144
  section_heading: Alterações (%{count})
145
- created:
146
- error: Ocorreu um erro ao criar a emenda
147
- success: A emenda foi criada com sucesso
148
145
  emendation:
149
146
  actions:
150
147
  button_accept: Aceitar
@@ -163,10 +160,6 @@ pt-BR:
163
160
  foi retirada pelo autor.
164
161
  new:
165
162
  amendment_author: Autor de alteração
166
- back: Costas
167
- heading: Crie sua emenda
168
- help_text: Você está alterando o %{model_name}
169
- send: Enviar emenda
170
163
  promoted:
171
164
  error: Houve erros ao promover a emenda
172
165
  success: Emendação promovida com sucesso
@@ -178,6 +171,12 @@ pt-BR:
178
171
  heading: Revise a emenda
179
172
  help_text: Você está revisando uma emenda ao %{model_name}
180
173
  send: Aceitar alteração
174
+ wizard_step_form:
175
+ steps:
176
+ '1': Crie sua emenda
177
+ '2': Compare your amendment
178
+ '3': Complete your amendment
179
+ '4': Publish your amendment
181
180
  anonymous_user: Anônimo
182
181
  application:
183
182
  collection:
@@ -315,7 +314,6 @@ pt-BR:
315
314
  email_already_exists: Outra conta está usando o mesmo endereço de e-mail
316
315
  new:
317
316
  complete_profile: Complete o seu perfil
318
- nickname_help: Seu identificador curto e exclusivo em %{organization}
319
317
  sign_up: Por favor, complete o seu perfil
320
318
  subtitle: Por favor, preencha o seguinte formulário para completar a inscrição
321
319
  username_help: Nome público que aparece em suas postagens. Com o objetivo de garantir o anonimato, pode ser qualquer nome.
@@ -324,7 +322,6 @@ pt-BR:
324
322
  already_have_an_account?: Você já tem uma conta?
325
323
  newsletter: Receba um boletim informativo ocasional com informações relevantes
326
324
  newsletter_title: Permissão de contato
327
- nickname_help: Seu identificador curto e exclusivo em %{organization}
328
325
  sign_in: Iniciar sessão
329
326
  sign_up: Inscreva-se
330
327
  sign_up_as:
@@ -1159,11 +1156,7 @@ pt-BR:
1159
1156
  long_words: contém palavras muito longas (mais de 35 caracteres)
1160
1157
  must_start_with_caps: deve começar com letra maiúscula
1161
1158
  nesting_too_deep: não pode estar dentro de uma subcategoria
1162
- not_found: não encontrado
1163
1159
  not_locked: não estava trancado
1164
- not_saved:
1165
- one: '1 erro proibiu que este %{resource} fosse salvo:'
1166
- other: "%{count} erros proibiram este %{resource} de ser salvo:"
1167
1160
  too_many_marks: está usando muitos sinais de pontuação consecutivos (por exemplo,! e?)
1168
1161
  too_much_caps: está usando muitas letras maiúsculas (mais de 25% do texto)
1169
1162
  too_short: é muito curto (menos de 15 caracteres)
@@ -142,9 +142,6 @@ pt:
142
142
  promote_confirm_text: Tem certeza de que deseja promover essa emenda?
143
143
  promote_help_text: Você pode promover esta emendação e publicá-la como um %{model_name}independente
144
144
  section_heading: Alterações (%{count})
145
- created:
146
- error: Ocorreu um erro ao criar a emenda
147
- success: A emenda foi criada com sucesso
148
145
  emendation:
149
146
  actions:
150
147
  button_accept: Aceitar
@@ -163,10 +160,6 @@ pt:
163
160
  foi retirada pelo autor.
164
161
  new:
165
162
  amendment_author: Autor de alteração
166
- back: Costas
167
- heading: Crie sua emenda
168
- help_text: Você está alterando o %{model_name}
169
- send: Enviar emenda
170
163
  promoted:
171
164
  error: Houve erros ao promover a emenda
172
165
  success: Emendação promovida com sucesso
@@ -178,6 +171,12 @@ pt:
178
171
  heading: Revise a emenda
179
172
  help_text: Você está revisando uma emenda ao %{model_name}
180
173
  send: Aceitar alteração
174
+ wizard_step_form:
175
+ steps:
176
+ '1': Crie sua emenda
177
+ '2': Compare your amendment
178
+ '3': Complete your amendment
179
+ '4': Publish your amendment
181
180
  anonymous_user: Anônimo
182
181
  application:
183
182
  collection:
@@ -315,7 +314,6 @@ pt:
315
314
  email_already_exists: Outra conta está usando o mesmo endereço de e-mail
316
315
  new:
317
316
  complete_profile: Complete o seu perfil
318
- nickname_help: Seu identificador curto e exclusivo em %{organization}
319
317
  sign_up: Por favor, complete o seu perfil
320
318
  subtitle: Por favor, preencha o seguinte formulário para completar a inscrição
321
319
  username_help: Nome público que aparece em suas postagens. Com o objetivo de garantir o anonimato, pode ser qualquer nome.
@@ -324,7 +322,6 @@ pt:
324
322
  already_have_an_account?: Já tem uma conta?
325
323
  newsletter: Receba um boletim informativo ocasional com informações relevantes
326
324
  newsletter_title: Permissão de contato
327
- nickname_help: Seu identificador curto e exclusivo em %{organization}
328
325
  sign_in: Entrar
329
326
  sign_up: Inscreva-se
330
327
  sign_up_as:
@@ -1159,11 +1156,7 @@ pt:
1159
1156
  long_words: contém palavras muito longas (mais de 35 caracteres)
1160
1157
  must_start_with_caps: deve começar com letra maiúscula
1161
1158
  nesting_too_deep: não pode estar dentro de uma subcategoria
1162
- not_found: não encontrado
1163
1159
  not_locked: não estava trancado
1164
- not_saved:
1165
- one: '1 erro proibiu que este %{resource} fosse salvo:'
1166
- other: "%{count} erros proibiram este %{resource} de ser salvo:"
1167
1160
  too_many_marks: está usando muitos sinais de pontuação consecutivos (por exemplo,! e?)
1168
1161
  too_much_caps: está usando muitas letras maiúsculas (mais de 25% do texto)
1169
1162
  too_short: é muito curto (menos de 15 caracteres)
@@ -110,6 +110,13 @@ ru:
110
110
  user_group:
111
111
  reject: "%{user_name} отклонил подтверждение группы участников %{resource_name}"
112
112
  verify: "%{user_name} подтвердил группу участников %{resource_name}"
113
+ amendments:
114
+ wizard_step_form:
115
+ steps:
116
+ '1': Create your amendment
117
+ '2': Compare your amendment
118
+ '3': Complete your amendment
119
+ '4': Publish your amendment
113
120
  anonymous_user: Анонимный
114
121
  application:
115
122
  collection:
@@ -225,7 +232,6 @@ ru:
225
232
  email_already_exists: Другая учетная запись использует тот же адрес электронной почты
226
233
  new:
227
234
  complete_profile: Заполните профиль
228
- nickname_help: Ваш короткий, уникальный псевдоним в %{organization}
229
235
  sign_up: Пожалуйста, заполните свой профиль
230
236
  subtitle: Пожалуйста, заполните следующую форму, чтобы завершить регистрацию
231
237
  username_help: Общедоступное имя, которое отображается в ваших сообщениях. В целях обеспечения анонимности оно может быть любым.
@@ -234,7 +240,6 @@ ru:
234
240
  already_have_an_account?: У вас уже есть учетная запись?
235
241
  newsletter: Получать время от времени рассылку со свежими новостями
236
242
  newsletter_title: Разрешение на связь с вами
237
- nickname_help: Ваш короткий, уникальный псевдоним в %{organization}
238
243
  sign_in: Войти
239
244
  sign_up: Зарегистрироваться
240
245
  sign_up_as:
@@ -3,6 +3,14 @@ sv:
3
3
  attributes:
4
4
  account:
5
5
  delete_reason: Skäl att ta bort ditt konto
6
+ group:
7
+ about: Om
8
+ avatar: Profilbild
9
+ document_number: Dokumentnummer
10
+ email: E-post
11
+ name: Namn
12
+ nickname: Smeknamn
13
+ phone: Telefon
6
14
  report:
7
15
  details: Ytterligare kommentarer
8
16
  user:
@@ -142,9 +150,10 @@ sv:
142
150
  promote_confirm_text: Vill du stötta detta ändringsförslag?
143
151
  promote_help_text: Du kan stötta detta ändringsförslag och lägga fram det som ett oberoende %{model_name}
144
152
  section_heading: Ändringar (%{count})
145
- created:
146
- error: Ett fel uppstod när ändringen skulle skapas
147
- success: Ändringen har skapats
153
+ compare_draft:
154
+ continue: Fortsätt
155
+ edit_draft:
156
+ send: Förhandsvisa
148
157
  emendation:
149
158
  actions:
150
159
  button_accept: Acceptera
@@ -152,21 +161,20 @@ sv:
152
161
  help_text: Granska ändringarna och bifall eller avslå detta ändringsförslag. Ett meddelande kommer att skickas till dess författare.
153
162
  announcement:
154
163
  accepted: |-
155
- Detta ändringsförslag för %{amendable_type} %{amendable_link} blev
156
- godkänt <strong>%{announcement_date}</strong>.
164
+ Detta ändringsförslag till %{amendable_type} %{proposal_link} blev
165
+ godkänt <strong>%{date}</strong>.
157
166
  evaluating: |-
158
- Detta ändringsförslag för %{amendable_type} %{amendable_link}
167
+ Detta ändringsförslag till %{amendable_type} %{proposal_link}
159
168
  utvärderas just nu.
160
169
  rejected: "Detta ändringsförslag till %{amendable_type} %{amendable_link}\navslogs <strong>%{announcement_date}</strong>."
161
170
  withdrawn: |-
162
- Detta ändringsförslag till %{amendable_type} %{amendable_link}
163
- har dragits tillbaka av författaren.
171
+ Detta ändringsförslag till %{amendable_type} %{proposal_link} har dragits tillbaka av författaren.
164
172
  new:
165
173
  amendment_author: Förslagsställare
166
- back: Tillbaka
167
- heading: Skapa ändringsförslag
168
- help_text: Du ändrar %{model_name}
169
- send: Skicka ändringsförslag
174
+ send: Skapa
175
+ preview_draft:
176
+ modify: Ändra
177
+ publish: Publicera
170
178
  promoted:
171
179
  error: Det gick inte att publicera ändringen som ett nytt förslag
172
180
  success: Ändringsförslaget har publicerats som ett nytt förslag
@@ -178,6 +186,12 @@ sv:
178
186
  heading: Granska ändringsförslaget
179
187
  help_text: Du granskar ett ändringsförslag till %{model_name}
180
188
  send: Godkänn ändring
189
+ wizard_step_form:
190
+ steps:
191
+ '1': Skapa ändringsförslag
192
+ '2': Compare your amendment
193
+ '3': Complete your amendment
194
+ '4': Publish your amendment
181
195
  anonymous_user: Anonym
182
196
  application:
183
197
  collection:
@@ -315,7 +329,6 @@ sv:
315
329
  email_already_exists: Ett annat konto använder samma e-postadress
316
330
  new:
317
331
  complete_profile: Slutför profil
318
- nickname_help: Ditt alias (@användarnamn) i %{organization}
319
332
  sign_up: Var god slutför din profil
320
333
  subtitle: Slutför registreringen genom att fylla i följande formulär
321
334
  username_help: Offentligt namn som visas i dina inlägg. Du kan ange ett annat namn än ditt eget, om du vill vara anonym.
@@ -324,7 +337,6 @@ sv:
324
337
  already_have_an_account?: Har du redan ett konto?
325
338
  newsletter: Få enstaka nyhetsbrev med relevant information
326
339
  newsletter_title: Kontakttillstånd
327
- nickname_help: Ditt alias (@användarnamn) i %{organization}
328
340
  password_help: "Minst %{minimun_characters} tecken, får inte vara för vanligt (som 123456) och måste vara skilt från ditt användarnamn och din e-postadress."
329
341
  sign_in: Logga in
330
342
  sign_up: Registrera dig
@@ -1005,6 +1017,11 @@ sv:
1005
1017
  welcome_notification:
1006
1018
  default_body: <p>Hej {{name}}, välkommen och tack för att du gick med i {{organization}}!</p><ul><li>Om du vill få en snabb uppfattning om vad du kan göra här, ta en titt på <a href="{{help_url}}">hjälpavsnittet</a>.</li><li>När du har läst det får du ditt första märke. Här är en <a href="{{badges_url}}">lista över alla märken</a> som du kan få när du deltar i {{organization}}</li><li>Sist men inte minst, prata med andra och dela med dig av hur det är att vara engagerad i och delta i {{organization}}. Lämna förslag, ge kommentarer, debattera, fundera över hur man kan bidra till det gemensamma bästa, framför övertygande argument, lyssna och läs för att själv bli övertygad, uttryck dina idéer på ett konkret och direkt sätt, svara med tålamod eller kraft, försvara dina idéer och ha ett öppet sinne för samarbete och andra människors idéer.</li></ul>
1007
1019
  default_subject: Tack för att du gick med i {{organization}}!
1020
+ wizard_step_form:
1021
+ wizard_aside:
1022
+ back: Tillbaka
1023
+ wizard_header:
1024
+ see_steps: visa steg
1008
1025
  devise:
1009
1026
  confirmations:
1010
1027
  confirmed: Din e-postadress har bekräftats.
@@ -1161,11 +1178,7 @@ sv:
1161
1178
  long_words: innehåller ord som är för långa (över 35 tecken)
1162
1179
  must_start_with_caps: måste börja med en stor bokstav
1163
1180
  nesting_too_deep: kan inte vara inuti en underkategori
1164
- not_found: hittades inte
1165
1181
  not_locked: låstes inte
1166
- not_saved:
1167
- one: 'Ett fel hindrade %{resource} från att sparas:'
1168
- other: "%{count} fel hindrade %{resource} från att sparas:"
1169
1182
  too_many_marks: använder för många på varandra följande skiljetecken (t.ex. ! och ?)
1170
1183
  too_much_caps: använder för många stora bokstäver (över 25% av texten)
1171
1184
  too_short: är för kort (under 15 tecken)
@@ -1239,12 +1252,15 @@ sv:
1239
1252
  qq: Qzone
1240
1253
  reddit: Reddit
1241
1254
  share_to: Dela till %{name}
1255
+ telegram: Telegram
1242
1256
  tumblr: Tumblr
1243
1257
  twitter: Twitter
1244
1258
  vkontakte: VKontakte
1245
1259
  wechat: WeChat
1246
1260
  wechat_footer: Öppna din WeChat, klicka på "Discover" -knappen och klicka sedan på "Scan QR Code" -menyn.
1247
1261
  weibo: Sina Weibo
1262
+ whatsapp_app: WhatsApp
1263
+ whatsapp_web: WhatsApp
1248
1264
  xing: Xing
1249
1265
  time:
1250
1266
  formats:
@@ -142,9 +142,15 @@ tr:
142
142
  promote_confirm_text: Bu yayılımı arttırmak istediğinize emin misiniz?
143
143
  promote_help_text: Bu ödemenizi tanıtabilir ve bağımsız olarak yayınlayabilirsiniz %{model_name}
144
144
  section_heading: Değişiklikler (%{count})
145
+ compare_draft:
146
+ continue: Devam et
147
+ no_similars_found: Hiç benzer düzeltme bulunamadı.
148
+ title: Benzer Düzeltmeler
145
149
  created:
146
- error: Değişiklik oluşturulurken bir hata oluştu
147
- success: Değişiklik başarıyla oluşturuldu
150
+ error: Değişiklik tasarısı oluşturulurken bir hata oluştu.
151
+ success: Değişiklik tasarısı başarı ile oluşturuldu.
152
+ destroy_draft:
153
+ error: Değişiklik tasarısını silerken bir hata oluştu.
148
154
  emendation:
149
155
  actions:
150
156
  button_accept: Kabul etmek
@@ -163,10 +169,6 @@ tr:
163
169
  için bu değişiklik yazar tarafından geri çekilmiştir.
164
170
  new:
165
171
  amendment_author: Değişiklik yazarı
166
- back: Geri
167
- heading: Değişikliğinizi oluşturun
168
- help_text: '%{model_name}değiştiriyorsun'
169
- send: Değişiklik gönder
170
172
  promoted:
171
173
  error: Düzeltmeyi teşvik ederken hatalar oluştu
172
174
  success: Emendation başarıyla tanıtıldı
@@ -178,6 +180,12 @@ tr:
178
180
  heading: Değişikliği gözden geçirin
179
181
  help_text: '%{model_name}yapılan bir değişikliği inceliyorsunuz'
180
182
  send: Değişikliği kabul et
183
+ wizard_step_form:
184
+ steps:
185
+ '1': Değişikliğinizi oluşturun
186
+ '2': Compare your amendment
187
+ '3': Complete your amendment
188
+ '4': Publish your amendment
181
189
  anonymous_user: Anonim
182
190
  application:
183
191
  collection:
@@ -299,6 +307,7 @@ tr:
299
307
  name: Alt kahraman afişi
300
308
  core:
301
309
  actions:
310
+ login_before_access: Lütfen, erişmeden önce hesabınızla giriş yapın
302
311
  unauthorized: Bu eylemi gerçekleştirmek için yetkiniz yok
303
312
  data_portability:
304
313
  export:
@@ -315,7 +324,6 @@ tr:
315
324
  email_already_exists: Başka bir hesap aynı e-posta adresini kullanıyor
316
325
  new:
317
326
  complete_profile: Tam profil
318
- nickname_help: İçinde kısa, benzersiz tanıtıcı %{organization}
319
327
  sign_up: Lütfen profilinizi tamamlayın
320
328
  subtitle: Kayıt işlemini tamamlamak için lütfen aşağıdaki formu doldurunuz.
321
329
  username_help: Yayınlarınızda görünen genel ad. Anonimlik garantilemek amacıyla herhangi bir isim olabilir.
@@ -324,7 +332,6 @@ tr:
324
332
  already_have_an_account?: Zaten hesabınız var mı?
325
333
  newsletter: İlgili bilgiler içeren bir ara bülteni alın
326
334
  newsletter_title: İletişim izni
327
- nickname_help: İçinde kısa, benzersiz tanıtıcı %{organization}
328
335
  password_help: "Asgari %{minimun_characters} karakter, çok yaygın olmamalı (örnek: 123456) ve takma adınızdan ve eposta adresinizden farklı olmalıdır."
329
336
  sign_in: Oturum aç
330
337
  sign_up: kaydol
@@ -1165,11 +1172,7 @@ tr:
1165
1172
  long_words: çok uzun kelimeler içeriyor (35 karakterden fazla)
1166
1173
  must_start_with_caps: büyük harfle başlamalıdır
1167
1174
  nesting_too_deep: bir alt kategorinin içinde olamaz
1168
- not_found: bulunamadı
1169
1175
  not_locked: kilitli değildi
1170
- not_saved:
1171
- one: '1 hata bu yasak %{resource} kaydedilmesini:'
1172
- other: "%{count} hataları bu yasak %{resource} kaydedilmesini:"
1173
1176
  too_many_marks: çok fazla ardışık noktalama işareti kullanıyor (örneğin! ve?)
1174
1177
  too_much_caps: çok fazla büyük harf kullanıyor (metnin% 25'inden fazlası)
1175
1178
  too_short: çok kısa (15 karakterin altında)
@@ -110,6 +110,13 @@ uk:
110
110
  user_group:
111
111
  reject: "%{user_name} відхилив підтвердження гурту учасників %{resource_name}"
112
112
  verify: "%{user_name} підтвердив гурт учасників %{resource_name}"
113
+ amendments:
114
+ wizard_step_form:
115
+ steps:
116
+ '1': Create your amendment
117
+ '2': Compare your amendment
118
+ '3': Complete your amendment
119
+ '4': Publish your amendment
113
120
  anonymous_user: Анонімний вхід
114
121
  application:
115
122
  collection:
@@ -226,7 +233,6 @@ uk:
226
233
  email_already_exists: Інший обліковий запис використовує ту ж саму адресу електронної пошти
227
234
  new:
228
235
  complete_profile: Заповнити профіль
229
- nickname_help: Ваш короткий, унікальний псевдонім в %{organization}
230
236
  sign_up: Будь ласка, заповніть свій профіль
231
237
  subtitle: Щоб завершити реєстрацію, заповніть наступну форму
232
238
  username_help: Загальнодоступне ім'я, яке відображається у ваших дописах. З метою гарантування анонімності, може бути будь-яким.
@@ -235,7 +241,6 @@ uk:
235
241
  already_have_an_account?: Вже маєте обліковий запис?
236
242
  newsletter: Отримувати іноді розсилання зі свіжими новинами
237
243
  newsletter_title: Дозвіл на зв'язок
238
- nickname_help: Ваш короткий, унікальний псевдонім в %{organization}
239
244
  sign_in: Увійти
240
245
  sign_up: Зареєструватися
241
246
  sign_up_as:
@@ -124,10 +124,17 @@ Decidim::Core::Engine.routes.draw do
124
124
  post :create
125
125
  end
126
126
  member do
127
+ get :compare_draft
128
+ get :edit_draft
129
+ patch :update_draft
130
+ delete :destroy_draft
131
+ get :preview_draft
132
+ post :publish_draft
127
133
  patch :reject
128
134
  post :promote
129
135
  get :review
130
136
  patch :accept
137
+ put :withdraw
131
138
  end
132
139
  end
133
140
 
@@ -11,6 +11,7 @@ class AddVersionToActionLogs < ActiveRecord::Migration[5.1]
11
11
  ActionLog.find_each do |action_log|
12
12
  version_id = action_log.extra.dig("version", "id")
13
13
  next unless version_id
14
+
14
15
  # rubocop:disable Rails/SkipsModelValidations
15
16
  action_log.update_column(:version_id, version_id)
16
17
  # rubocop:enable Rails/SkipsModelValidations
@@ -26,6 +26,7 @@ class RenameFeaturesToComponents < ActiveRecord::Migration[5.1]
26
26
  ActionLog.find_each do |log|
27
27
  new_extra = log.extra.dup
28
28
  next if new_extra["component"].present?
29
+
29
30
  new_extra["component"] = new_extra["feature"]
30
31
  new_extra.delete("feature")
31
32
  log.extra = new_extra
@@ -17,7 +17,7 @@ class FixUserNames < ActiveRecord::Migration[5.2]
17
17
  entity.name = entity.name.delete(characters_to_remove).strip
18
18
  sanitized_nickname = entity.nickname.delete(characters_to_remove).strip
19
19
  entity.nickname = Decidim::UserBaseEntity.nicknamize(sanitized_nickname, organization: entity.organization)
20
- entity.save!
20
+ entity.save(validate: false)
21
21
  end
22
22
  end
23
23
  end
@@ -0,0 +1,10 @@
1
+ # frozen_string_literal: true
2
+
3
+ class AddForceUsersToAuthenticateBeforeAccessOrganization < ActiveRecord::Migration[5.2]
4
+ def change
5
+ add_column :decidim_organizations,
6
+ :force_users_to_authenticate_before_access_organization,
7
+ :boolean,
8
+ default: false
9
+ end
10
+ end
@@ -0,0 +1,13 @@
1
+ # frozen_string_literal: true
2
+
3
+ class AddConfidentialToDoorkeeperApplication < ActiveRecord::Migration[5.2]
4
+ def change
5
+ add_column(
6
+ :oauth_applications,
7
+ :confidential,
8
+ :boolean,
9
+ null: false,
10
+ default: true # maintaining backwards compatibility: require secrets
11
+ )
12
+ end
13
+ end