decidim-core 0.23.6 → 0.24.0.rc1

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 (455) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/app/assets/images/decidim/icons.svg +1 -1
  4. data/app/assets/javascripts/decidim/core/bundle.js +1 -1
  5. data/app/assets/javascripts/decidim/core/bundle.js.map +1 -1
  6. data/app/assets/javascripts/decidim/editor/history_override.js.es6 +117 -0
  7. data/app/assets/javascripts/decidim/editor/linebreak_module.js.es6 +83 -0
  8. data/app/assets/javascripts/decidim/editor/modified_backspace_offset1.js.es6 +98 -0
  9. data/app/assets/javascripts/decidim/editor/modified_backspace_offset_any.js.es6 +48 -0
  10. data/app/assets/javascripts/decidim/editor/modified_backspace_utils.js.es6 +31 -0
  11. data/app/assets/javascripts/decidim/editor/modified_enter.js.es6 +118 -0
  12. data/app/assets/javascripts/decidim/editor.js.es6 +15 -4
  13. data/app/assets/javascripts/decidim/form_filter.component.js.es6 +25 -0
  14. data/app/assets/javascripts/decidim/geocoding/attach_input.js.es6 +41 -4
  15. data/app/assets/javascripts/decidim/input_character_counter.js.es6 +6 -1
  16. data/app/assets/javascripts/decidim/map/controller/markers.js.es6 +27 -9
  17. data/app/assets/javascripts/decidim/session_timeouter.js.es6 +78 -0
  18. data/app/assets/javascripts/decidim.js.es6 +1 -0
  19. data/app/assets/stylesheets/decidim/_variables.scss +9 -0
  20. data/app/assets/stylesheets/decidim/email.scss +14 -2
  21. data/app/assets/stylesheets/decidim/extras/_external-links.scss +0 -1
  22. data/app/assets/stylesheets/decidim/extras/_process_stats.scss +1 -1
  23. data/app/assets/stylesheets/decidim/extras/_results-per-page.scss +1 -0
  24. data/app/assets/stylesheets/decidim/modules/_author-avatar.scss +2 -2
  25. data/app/assets/stylesheets/decidim/modules/_buttons.scss +2 -2
  26. data/app/assets/stylesheets/decidim/modules/_cards.scss +18 -1
  27. data/app/assets/stylesheets/decidim/modules/_collapsible-list.scss +1 -1
  28. data/app/assets/stylesheets/decidim/modules/_comments.scss +5 -1
  29. data/app/assets/stylesheets/decidim/modules/_conference-speaker.scss +4 -3
  30. data/app/assets/stylesheets/decidim/modules/_data-picker.scss +7 -0
  31. data/app/assets/stylesheets/decidim/modules/_extra.scss +4 -0
  32. data/app/assets/stylesheets/decidim/modules/_forms.scss +4 -0
  33. data/app/assets/stylesheets/decidim/modules/_loading-spinner.scss +34 -0
  34. data/app/assets/stylesheets/decidim/modules/_modules.scss +1 -1
  35. data/app/assets/stylesheets/decidim/modules/_opinion-toggle.scss +1 -1
  36. data/app/assets/stylesheets/decidim/modules/_reveal.scss +6 -0
  37. data/app/assets/stylesheets/decidim/modules/_signup.scss +1 -0
  38. data/app/assets/stylesheets/decidim/modules/{_process-stats.scss → _space-stats.scss} +1 -1
  39. data/app/cells/decidim/activity/show.erb +1 -1
  40. data/app/cells/decidim/activity_cell.rb +11 -14
  41. data/app/cells/decidim/address/details.erb +5 -5
  42. data/app/cells/decidim/address_cell.rb +0 -21
  43. data/app/cells/decidim/announcement/show.erb +4 -4
  44. data/app/cells/decidim/announcement_cell.rb +22 -2
  45. data/app/cells/decidim/author/flag_user.erb +10 -0
  46. data/app/cells/decidim/author/profile_minicard.erb +1 -1
  47. data/app/cells/decidim/author_cell.rb +9 -1
  48. data/app/cells/decidim/card_m/top.erb +1 -1
  49. data/app/cells/decidim/card_m_cell.rb +1 -1
  50. data/app/cells/decidim/content_blocks/cta/show.erb +14 -0
  51. data/app/cells/decidim/content_blocks/cta_cell.rb +35 -0
  52. data/app/cells/decidim/content_blocks/cta_settings_form/show.erb +9 -0
  53. data/app/cells/decidim/content_blocks/cta_settings_form_cell.rb +13 -0
  54. data/app/cells/decidim/content_blocks/hero_cell.rb +14 -0
  55. data/app/cells/decidim/content_blocks/highlighted_elements/elements.erb +0 -0
  56. data/app/cells/decidim/content_blocks/highlighted_elements/heading.erb +0 -0
  57. data/app/cells/decidim/content_blocks/highlighted_elements/show.erb +4 -0
  58. data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb +51 -0
  59. data/app/cells/decidim/content_blocks/highlighted_elements_settings_form/show.erb +3 -0
  60. data/app/cells/decidim/content_blocks/highlighted_elements_settings_form_cell.rb +28 -0
  61. data/app/cells/decidim/content_blocks/last_activity_cell.rb +11 -0
  62. data/app/cells/decidim/content_blocks/metrics_cell.rb +0 -6
  63. data/app/cells/decidim/content_blocks/stats_cell.rb +0 -6
  64. data/app/cells/decidim/date/show.erb +31 -0
  65. data/app/cells/decidim/date_cell.rb +50 -0
  66. data/app/cells/decidim/endorsement_buttons_cell.rb +3 -3
  67. data/app/cells/decidim/flag_modal/flag_user.erb +24 -0
  68. data/app/cells/decidim/flag_modal/show.erb +24 -0
  69. data/app/cells/decidim/flag_modal_cell.rb +25 -0
  70. data/app/cells/decidim/profile/inaccessible.erb +9 -0
  71. data/app/cells/decidim/profile_cell.rb +9 -1
  72. data/app/cells/decidim/profile_sidebar/show.erb +10 -1
  73. data/app/cells/decidim/profile_sidebar_cell.rb +1 -0
  74. data/app/cells/decidim/reported_content/show.erb +5 -0
  75. data/app/cells/decidim/reported_content_cell.rb +44 -0
  76. data/app/cells/decidim/scopes_picker/scope_picker_prompt.erb +3 -0
  77. data/app/cells/decidim/scopes_picker/scope_picker_values.erb +5 -0
  78. data/app/cells/decidim/scopes_picker/show.erb +14 -0
  79. data/app/cells/decidim/scopes_picker_cell.rb +93 -0
  80. data/app/cells/decidim/tos_page/announcement.erb +1 -1
  81. data/app/cells/decidim/tos_page/form.erb +15 -13
  82. data/app/cells/decidim/tos_page_cell.rb +10 -8
  83. data/app/cells/decidim/translation_bar_cell.rb +1 -1
  84. data/app/cells/decidim/user_conversation/conversation_header.erb +1 -1
  85. data/app/cells/decidim/user_conversations_cell.rb +1 -1
  86. data/app/commands/decidim/create_report.rb +11 -1
  87. data/app/commands/decidim/create_user_report.rb +67 -0
  88. data/app/commands/decidim/destroy_account.rb +0 -2
  89. data/app/commands/decidim/gallery_methods.rb +2 -2
  90. data/app/commands/decidim/multiple_attachments_methods.rb +14 -10
  91. data/app/commands/decidim/search.rb +5 -2
  92. data/app/commands/decidim/update_notifications_settings.rb +1 -0
  93. data/app/commands/decidim/update_user_group.rb +1 -0
  94. data/app/controllers/concerns/decidim/devise_controllers.rb +1 -1
  95. data/app/controllers/concerns/decidim/flaggable.rb +5 -1
  96. data/app/controllers/concerns/decidim/force_authentication.rb +11 -3
  97. data/app/controllers/concerns/decidim/locale_switcher.rb +5 -0
  98. data/app/controllers/concerns/decidim/needs_permission.rb +7 -1
  99. data/app/controllers/concerns/decidim/orderable.rb +3 -1
  100. data/app/controllers/concerns/decidim/user_blocked_checker.rb +26 -0
  101. data/app/controllers/decidim/application_controller.rb +22 -0
  102. data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +3 -1
  103. data/app/controllers/decidim/devise/sessions_controller.rb +10 -6
  104. data/app/controllers/decidim/errors_controller.rb +1 -1
  105. data/app/controllers/decidim/locales_controller.rb +1 -1
  106. data/app/controllers/decidim/profiles_controller.rb +6 -0
  107. data/app/controllers/decidim/report_users_controller.rb +42 -0
  108. data/app/controllers/decidim/scopes_controller.rb +19 -10
  109. data/app/controllers/decidim/timeouts_controller.rb +28 -0
  110. data/app/controllers/decidim/user_activities_controller.rb +5 -0
  111. data/app/controllers/decidim/user_timeline_controller.rb +1 -0
  112. data/app/events/decidim/demoted_membership_event.rb +2 -2
  113. data/app/events/decidim/invited_to_group_event.rb +2 -2
  114. data/app/events/decidim/join_request_accepted_event.rb +2 -2
  115. data/app/events/decidim/join_request_created_event.rb +2 -2
  116. data/app/events/decidim/join_request_rejected_event.rb +2 -2
  117. data/app/events/decidim/promoted_to_admin_event.rb +2 -2
  118. data/app/events/decidim/removed_from_group_event.rb +2 -2
  119. data/app/forms/decidim/account_form.rb +2 -2
  120. data/app/forms/decidim/invite_user_form.rb +2 -2
  121. data/app/forms/decidim/messaging/conversation_form.rb +1 -1
  122. data/app/forms/decidim/messaging/message_form.rb +1 -1
  123. data/app/forms/decidim/notifications_settings_form.rb +20 -0
  124. data/app/forms/url_validator.rb +20 -0
  125. data/app/helpers/decidim/action_authorization_helper.rb +2 -0
  126. data/app/helpers/decidim/application_helper.rb +1 -3
  127. data/app/helpers/decidim/cells_helper.rb +6 -0
  128. data/app/helpers/decidim/filters_helper.rb +9 -0
  129. data/app/helpers/decidim/messaging/conversation_helper.rb +11 -1
  130. data/app/helpers/decidim/newsletters_helper.rb +7 -9
  131. data/app/helpers/decidim/scopes_helper.rb +1 -1
  132. data/app/jobs/decidim/block_user_job.rb +11 -0
  133. data/app/jobs/decidim/export_job.rb +2 -2
  134. data/app/jobs/decidim/find_and_update_descendants_job.rb +48 -0
  135. data/app/jobs/decidim/machine_translation_resource_job.rb +3 -0
  136. data/app/jobs/decidim/machine_translation_save_job.rb +29 -0
  137. data/app/jobs/decidim/update_search_indexes_job.rb +11 -0
  138. data/app/jobs/decidim/user_report_job.rb +11 -0
  139. data/app/mailers/decidim/block_user_mailer.rb +21 -0
  140. data/app/mailers/decidim/reported_mailer.rb +33 -3
  141. data/app/mailers/decidim/user_report_mailer.rb +21 -0
  142. data/app/models/decidim/area.rb +0 -1
  143. data/app/models/decidim/area_type.rb +1 -1
  144. data/app/models/decidim/attachment.rb +3 -2
  145. data/app/models/decidim/attachment_collection.rb +1 -1
  146. data/app/models/decidim/authorization.rb +4 -0
  147. data/app/models/decidim/category.rb +6 -1
  148. data/app/models/decidim/impersonation_log.rb +5 -7
  149. data/app/models/decidim/metric.rb +2 -2
  150. data/app/models/decidim/moderation.rb +12 -0
  151. data/app/models/decidim/organization.rb +5 -1
  152. data/app/models/decidim/scope.rb +5 -2
  153. data/app/models/decidim/scope_type.rb +1 -1
  154. data/app/models/decidim/share_token.rb +1 -1
  155. data/app/models/decidim/static_page.rb +11 -1
  156. data/app/models/decidim/static_page_topic.rb +4 -0
  157. data/app/models/decidim/user.rb +13 -8
  158. data/app/models/decidim/user_base_entity.rb +13 -13
  159. data/app/models/decidim/user_block.rb +10 -0
  160. data/app/models/decidim/user_group.rb +1 -4
  161. data/app/models/decidim/user_moderation.rb +22 -0
  162. data/app/models/decidim/user_report.rb +31 -0
  163. data/app/permissions/decidim/permissions.rb +1 -3
  164. data/app/permissions/decidim/report_user_permissions.rb +13 -0
  165. data/app/presenters/decidim/admin_log/impersonation_log_presenter.rb +39 -0
  166. data/app/presenters/decidim/admin_log/organization_presenter.rb +1 -2
  167. data/app/presenters/decidim/admin_log/user_moderation_presenter.rb +63 -0
  168. data/app/presenters/decidim/admin_log/user_presenter.rb +18 -9
  169. data/app/presenters/decidim/home_stats_presenter.rb +3 -3
  170. data/app/presenters/decidim/log/diff_presenter.rb +4 -3
  171. data/app/presenters/decidim/log/resource_presenter.rb +4 -4
  172. data/app/presenters/decidim/log/user_presenter.rb +1 -1
  173. data/app/presenters/decidim/menu_presenter.rb +12 -7
  174. data/app/presenters/decidim/nil_presenter.rb +0 -2
  175. data/app/presenters/decidim/user_presenter.rb +1 -1
  176. data/app/queries/decidim/metrics/blocked_users_metric_manage.rb +26 -0
  177. data/app/queries/decidim/metrics/followers_metric_manage.rb +3 -0
  178. data/app/queries/decidim/metrics/participants_metric_manage.rb +3 -0
  179. data/app/queries/decidim/metrics/reported_users_metric_manage.rb +26 -0
  180. data/app/queries/decidim/metrics/user_reports_metric_manage.rb +26 -0
  181. data/app/queries/decidim/user_groups/accepted_memberships.rb +1 -1
  182. data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
  183. data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
  184. data/app/services/decidim/activity_search.rb +1 -3
  185. data/app/services/decidim/base_diff_renderer.rb +1 -1
  186. data/app/services/decidim/data_portability_exporter.rb +1 -0
  187. data/app/services/decidim/email_notification_generator.rb +2 -2
  188. data/app/services/decidim/events_manager.rb +1 -1
  189. data/app/services/decidim/open_data_exporter.rb +36 -7
  190. data/app/services/decidim/zip_stream/zip_stream_writer.rb +3 -3
  191. data/app/uploaders/decidim/application_uploader.rb +22 -2
  192. data/app/uploaders/decidim/attachment_uploader.rb +2 -4
  193. data/app/uploaders/decidim/downloader.rb +9 -0
  194. data/app/uploaders/decidim/image_uploader.rb +9 -21
  195. data/app/uploaders/decidim/open_data_uploader.rb +5 -0
  196. data/app/uploaders/decidim/record_image_uploader.rb +2 -2
  197. data/app/validators/etiquette_validator.rb +0 -7
  198. data/app/validators/uploader_content_type_validator.rb +4 -2
  199. data/app/views/decidim/application/_document.html.erb +1 -1
  200. data/app/views/decidim/block_user_mailer/notify.html.erb +7 -0
  201. data/app/views/decidim/devise/confirmations/new.html.erb +1 -1
  202. data/app/views/decidim/devise/registrations/edit.html.erb +1 -1
  203. data/app/views/decidim/devise/unlocks/new.html.erb +1 -1
  204. data/app/views/decidim/messaging/conversations/_conversation.html.erb +1 -1
  205. data/app/views/decidim/messaging/conversations/_messages.html.erb +1 -1
  206. data/app/views/decidim/messaging/conversations/_show.html.erb +4 -4
  207. data/app/views/decidim/notifications_settings/show.html.erb +11 -0
  208. data/app/views/decidim/pages/_standalone.html.erb +3 -1
  209. data/app/views/decidim/reported_mailer/report.html.erb +9 -17
  210. data/app/views/decidim/shared/_check_boxes_tree.html.erb +3 -3
  211. data/app/views/decidim/shared/_component_announcement.html.erb +2 -2
  212. data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb +1 -1
  213. data/app/views/decidim/user_report_mailer/notify.html.erb +7 -0
  214. data/app/views/decidim/widgets/_data_picker.html.erb +1 -1
  215. data/app/views/layouts/decidim/_application.html.erb +1 -0
  216. data/app/views/layouts/decidim/_js_configuration.html.erb +1 -1
  217. data/app/views/layouts/decidim/_main_footer.html.erb +6 -4
  218. data/app/views/layouts/decidim/_timeout_modal.html.erb +21 -0
  219. data/config/initializers/active_support.rb +7 -0
  220. data/config/initializers/devise.rb +1 -1
  221. data/config/initializers/omniauth.rb +1 -1
  222. data/config/locales/ar.yml +1 -7
  223. data/config/locales/bg.yml +1 -13
  224. data/config/locales/ca.yml +46 -17
  225. data/config/locales/cs.yml +118 -53
  226. data/config/locales/de.yml +83 -18
  227. data/config/locales/el.yml +1 -14
  228. data/config/locales/en.yml +79 -14
  229. data/config/locales/eo.yml +0 -1
  230. data/config/locales/es-MX.yml +31 -14
  231. data/config/locales/es-PY.yml +31 -14
  232. data/config/locales/es.yml +34 -17
  233. data/config/locales/eu.yml +4 -10
  234. data/config/locales/fi-plain.yml +80 -16
  235. data/config/locales/fi.yml +85 -21
  236. data/config/locales/fr-CA.yml +79 -14
  237. data/config/locales/fr.yml +76 -11
  238. data/config/locales/gl.yml +1 -15
  239. data/config/locales/hu.yml +1 -12
  240. data/config/locales/id-ID.yml +1 -7
  241. data/config/locales/is-IS.yml +0 -9
  242. data/config/locales/it.yml +72 -19
  243. data/config/locales/ja.yml +1 -14
  244. data/config/locales/lv.yml +1 -12
  245. data/config/locales/nl.yml +38 -13
  246. data/config/locales/no.yml +7 -14
  247. data/config/locales/pl.yml +81 -14
  248. data/config/locales/pt-BR.yml +1 -7
  249. data/config/locales/pt.yml +1 -14
  250. data/config/locales/ro-RO.yml +15 -25
  251. data/config/locales/ru.yml +7 -12
  252. data/config/locales/sk.yml +2 -13
  253. data/config/locales/sr-CS.yml +0 -9
  254. data/config/locales/sv.yml +5 -27
  255. data/config/locales/tr-TR.yml +65 -14
  256. data/config/locales/uk.yml +7 -9
  257. data/config/locales/zh-CN.yml +1 -14
  258. data/config/routes.rb +9 -4
  259. data/db/migrate/20170713131206_add_admin_to_users.rb +1 -1
  260. data/db/migrate/20180206143340_fix_reference_for_all_resources.rb +2 -0
  261. data/db/migrate/20180314085339_rename_maximum_votes_per_proposal_to_threshold_per_proposal.rb +2 -2
  262. data/db/migrate/20200929171508_remove_show_statistics_from_organizations.rb +7 -0
  263. data/db/migrate/20201010124755_create_decidim_user_moderations.rb +12 -0
  264. data/db/migrate/20201010124756_create_decidim_user_reports.rb +16 -0
  265. data/db/migrate/20201010224433_add_suspension_fields_to_decidim_users.rb +8 -0
  266. data/db/migrate/20201011074641_create_decidim_user_suspensions.rb +14 -0
  267. data/db/migrate/20201011081626_add_current_suspension_id_to_decidim_users.rb +7 -0
  268. data/db/migrate/20201013071533_add_reported_content_to_moderations.rb +7 -0
  269. data/db/migrate/20201019074554_add_locale_to_moderation_reports.rb +7 -0
  270. data/db/migrate/20201127114444_encrypt_authorization_metadatas.rb +35 -0
  271. data/db/migrate/20201128130723_add_allow_public_access_to_static_pages.rb +17 -0
  272. data/db/migrate/20201218144706_update_table_block_user_functionality.rb +8 -0
  273. data/db/migrate/20201218145252_rename_decidim_user_fields_for_block_functionality.rb +9 -0
  274. data/db/migrate/20210208134328_add_email_on_moderations_to_users.rb +7 -0
  275. data/db/seeds.rb +14 -13
  276. data/lib/decidim/amendable.rb +3 -2
  277. data/{app/functions/decidim/core → lib/decidim/api/functions}/component_finder_base.rb +1 -1
  278. data/{app/functions/decidim/core → lib/decidim/api/functions}/component_list.rb +4 -4
  279. data/{app/functions/decidim/core → lib/decidim/api/functions}/component_list_base.rb +3 -1
  280. data/lib/decidim/api/functions/needs_api_default_order.rb +24 -0
  281. data/{app/functions/decidim/core → lib/decidim/api/functions}/needs_api_filter_and_order.rb +0 -0
  282. data/{app/functions/decidim/core → lib/decidim/api/functions}/participatory_space_finder_base.rb +2 -2
  283. data/{app/functions/decidim/core → lib/decidim/api/functions}/participatory_space_list_base.rb +3 -1
  284. data/{app/functions/decidim/core → lib/decidim/api/functions}/user_entity_finder.rb +1 -4
  285. data/{app/functions/decidim/core → lib/decidim/api/functions}/user_entity_list.rb +1 -3
  286. data/{app/types/decidim/core → lib/decidim/api/input_filters}/base_input_filter.rb +0 -0
  287. data/{app/types/decidim/core → lib/decidim/api/input_filters}/component_input_filter.rb +20 -22
  288. data/{app/types/decidim/core → lib/decidim/api/input_filters}/has_hastaggable_input_filter.rb +1 -1
  289. data/{app/types/decidim/core → lib/decidim/api/input_filters}/has_localized_input_filter.rb +3 -3
  290. data/{app/types/decidim/core → lib/decidim/api/input_filters}/has_publishable_input_filter.rb +6 -6
  291. data/{app/types/decidim/core → lib/decidim/api/input_filters}/has_timestamp_input_filter.rb +12 -12
  292. data/{app/types/decidim/core → lib/decidim/api/input_filters}/participatory_space_input_filter.rb +0 -1
  293. data/lib/decidim/api/input_filters/user_entity_input_filter.rb +89 -0
  294. data/{app/types/decidim/core → lib/decidim/api/input_sorts}/base_input_sort.rb +3 -2
  295. data/{app/types/decidim/core → lib/decidim/api/input_sorts}/component_input_sort.rb +10 -11
  296. data/{app/types/decidim/core → lib/decidim/api/input_sorts}/has_endorsable_input_sort.rb +2 -4
  297. data/{app/types/decidim/core → lib/decidim/api/input_sorts}/has_localized_input_sort.rb +3 -3
  298. data/{app/types/decidim/core → lib/decidim/api/input_sorts}/has_publishable_input_sort.rb +1 -1
  299. data/lib/decidim/api/input_sorts/has_timestamp_input_sort.rb +12 -0
  300. data/{app/types/decidim/core → lib/decidim/api/input_sorts}/participatory_space_input_sort.rb +1 -1
  301. data/{app/types/decidim/core → lib/decidim/api/input_sorts}/user_entity_input_sort.rb +4 -4
  302. data/lib/decidim/api/{amendable_entity_interface.rb → interfaces/amendable_entity_interface.rb} +5 -5
  303. data/lib/decidim/api/interfaces/amendable_interface.rb +17 -0
  304. data/lib/decidim/api/{attachable_interface.rb → interfaces/attachable_interface.rb} +3 -3
  305. data/lib/decidim/api/interfaces/author_interface.rb +32 -0
  306. data/lib/decidim/api/interfaces/authorable_interface.rb +23 -0
  307. data/lib/decidim/api/{categorizable_interface.rb → interfaces/categorizable_interface.rb} +3 -3
  308. data/lib/decidim/api/interfaces/coauthorable_interface.rb +30 -0
  309. data/lib/decidim/api/interfaces/component_interface.rb +22 -0
  310. data/lib/decidim/api/interfaces/endorsable_interface.rb +19 -0
  311. data/lib/decidim/api/{fingerprint_interface.rb → interfaces/fingerprint_interface.rb} +3 -3
  312. data/lib/decidim/api/interfaces/participatory_space_interface.rb +48 -0
  313. data/lib/decidim/api/interfaces/participatory_space_resourceable_interface.rb +25 -0
  314. data/lib/decidim/api/{scopable_interface.rb → interfaces/scopable_interface.rb} +3 -3
  315. data/lib/decidim/api/interfaces/timestamps_interface.rb +15 -0
  316. data/lib/decidim/api/interfaces/traceable_interface.rb +14 -0
  317. data/lib/decidim/api/scalars/date_time_type.rb +17 -0
  318. data/lib/decidim/api/scalars/date_type.rb +17 -0
  319. data/lib/decidim/api/types/amendment_type.rb +19 -0
  320. data/lib/decidim/api/types/area_api_type.rb +16 -0
  321. data/lib/decidim/api/types/area_type_type.rb +13 -0
  322. data/lib/decidim/api/types/attachment_type.rb +13 -0
  323. data/lib/decidim/api/types/category_type.rb +14 -0
  324. data/{app/types/decidim/core → lib/decidim/api/types}/component_type.rb +2 -4
  325. data/lib/decidim/api/types/coordinates_type.rb +21 -0
  326. data/lib/decidim/api/types/decidim_type.rb +13 -0
  327. data/lib/decidim/api/types/fingerprint_type.rb +12 -0
  328. data/lib/decidim/api/types/hashtag_type.rb +13 -0
  329. data/lib/decidim/api/types/localized_string_type.rb +13 -0
  330. data/lib/decidim/api/types/metric_history_type.rb +18 -0
  331. data/lib/decidim/api/types/metric_type.rb +13 -0
  332. data/lib/decidim/api/types/organization_type.rb +17 -0
  333. data/lib/decidim/api/types/participatory_space_link_type.rb +22 -0
  334. data/lib/decidim/api/types/participatory_space_type.rb +10 -0
  335. data/lib/decidim/api/types/scope_api_type.rb +16 -0
  336. data/lib/decidim/api/types/session_type.rb +22 -0
  337. data/lib/decidim/api/types/statistic_type.rb +20 -0
  338. data/lib/decidim/api/types/trace_version_type.rb +21 -0
  339. data/lib/decidim/api/types/translated_field_type.rb +36 -0
  340. data/lib/decidim/api/types/user_group_type.rb +64 -0
  341. data/lib/decidim/api/types/user_type.rb +67 -0
  342. data/lib/decidim/attachment_attributes.rb +57 -0
  343. data/lib/decidim/attributes/clean_string.rb +37 -0
  344. data/lib/decidim/attributes.rb +1 -0
  345. data/lib/decidim/coauthorable.rb +3 -3
  346. data/lib/decidim/component_manifest.rb +17 -0
  347. data/lib/decidim/content_block_manifest.rb +1 -1
  348. data/lib/decidim/content_parsers/hashtag_parser.rb +3 -6
  349. data/lib/decidim/content_parsers/user_group_parser.rb +2 -5
  350. data/lib/decidim/content_parsers/user_parser.rb +2 -5
  351. data/lib/decidim/content_processor.rb +1 -1
  352. data/lib/decidim/content_renderers/hashtag_renderer.rb +3 -6
  353. data/lib/decidim/core/api.rb +71 -16
  354. data/lib/decidim/core/engine.rb +35 -6
  355. data/lib/decidim/core/test/factories.rb +53 -15
  356. data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +1 -1
  357. data/lib/decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples.rb +1 -1
  358. data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb +1 -1
  359. data/lib/decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples.rb +1 -1
  360. data/lib/decidim/core/test/shared_examples/categorizable_interface_examples.rb +6 -14
  361. data/lib/decidim/core/test/shared_examples/comments_examples.rb +11 -9
  362. data/lib/decidim/core/test/shared_examples/component_type.rb +1 -1
  363. data/lib/decidim/core/test/shared_examples/controller_render_views.rb +28 -0
  364. data/lib/decidim/core/test/shared_examples/follows_examples.rb +1 -1
  365. data/lib/decidim/core/test/shared_examples/logo_email.rb +1 -1
  366. data/lib/decidim/core/test/shared_examples/map_examples.rb +1 -1
  367. data/lib/decidim/core/test/shared_examples/process_announcements_examples.rb +1 -1
  368. data/lib/decidim/core/test/shared_examples/reportable.rb +8 -0
  369. data/lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb +1 -1
  370. data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +2 -3
  371. data/lib/decidim/core/test/shared_examples/searchable_results_examples.rb +46 -0
  372. data/lib/decidim/core/test/shared_examples/static_pages_examples.rb +43 -0
  373. data/lib/decidim/core/test.rb +2 -0
  374. data/lib/decidim/core/version.rb +1 -1
  375. data/lib/decidim/core.rb +11 -3
  376. data/lib/decidim/diffy_extension.rb +2 -2
  377. data/lib/decidim/exporters/csv.rb +3 -2
  378. data/lib/decidim/exporters/export_data.rb +1 -1
  379. data/lib/decidim/faker/internet.rb +17 -0
  380. data/lib/decidim/faker/localized.rb +43 -20
  381. data/lib/decidim/file_validator_humanizer.rb +6 -4
  382. data/lib/decidim/form_builder.rb +33 -22
  383. data/lib/decidim/gamification/badge_scorer.rb +3 -2
  384. data/lib/decidim/gamification/base_event.rb +2 -2
  385. data/lib/decidim/geocodable.rb +2 -0
  386. data/lib/decidim/has_category.rb +1 -1
  387. data/lib/decidim/has_private_users.rb +1 -1
  388. data/lib/decidim/importers/import_manifest.rb +36 -0
  389. data/lib/decidim/map/autocomplete.rb +11 -1
  390. data/lib/decidim/metric_operation.rb +5 -6
  391. data/lib/decidim/participatory_space_resourceable.rb +1 -3
  392. data/lib/decidim/query_extensions.rb +90 -69
  393. data/lib/decidim/randomable.rb +6 -1
  394. data/lib/decidim/record_encryptor.rb +131 -0
  395. data/lib/decidim/reportable.rb +26 -0
  396. data/lib/decidim/resource_manifest.rb +3 -0
  397. data/lib/decidim/resourceable.rb +6 -6
  398. data/lib/decidim/scopable.rb +1 -1
  399. data/lib/decidim/search_resource_fields_mapper.rb +1 -1
  400. data/lib/decidim/searchable.rb +9 -0
  401. data/lib/decidim/settings_manifest.rb +2 -1
  402. data/lib/decidim/shareable_with_token.rb +0 -1
  403. data/lib/decidim/translatable_attributes.rb +2 -1
  404. data/lib/decidim/translatable_resource.rb +10 -0
  405. data/lib/decidim/user_reportable.rb +33 -0
  406. data/lib/decidim/view_model.rb +26 -0
  407. data/lib/premailer/adapter/decidim.rb +4 -4
  408. data/lib/tasks/decidim_data_portability_tasks.rake +4 -4
  409. data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.ko.js +18 -0
  410. data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.vi.js +14 -0
  411. data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.zh-CN.js +14 -0
  412. data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.zh-TW.js +14 -0
  413. metadata +190 -95
  414. data/app/functions/decidim/core/participatory_space_finder.rb +0 -11
  415. data/app/functions/decidim/core/participatory_space_list.rb +0 -11
  416. data/app/helpers/decidim/cache_helper.rb +0 -14
  417. data/app/types/decidim/core/amendment_type.rb +0 -26
  418. data/app/types/decidim/core/area_api_type.rb +0 -16
  419. data/app/types/decidim/core/area_type_type.rb +0 -14
  420. data/app/types/decidim/core/attachment_type.rb +0 -14
  421. data/app/types/decidim/core/category_type.rb +0 -16
  422. data/app/types/decidim/core/coordinates_type.rb +0 -19
  423. data/app/types/decidim/core/date_time_type.rb +0 -12
  424. data/app/types/decidim/core/date_type.rb +0 -13
  425. data/app/types/decidim/core/decidim_type.rb +0 -19
  426. data/app/types/decidim/core/fingerprint_type.rb +0 -15
  427. data/app/types/decidim/core/has_timestamp_input_sort.rb +0 -12
  428. data/app/types/decidim/core/hashtag_type.rb +0 -13
  429. data/app/types/decidim/core/localized_string_type.rb +0 -14
  430. data/app/types/decidim/core/metric_history_type.rb +0 -17
  431. data/app/types/decidim/core/metric_type.rb +0 -14
  432. data/app/types/decidim/core/organization_type.rb +0 -20
  433. data/app/types/decidim/core/participatory_space_link_type.rb +0 -24
  434. data/app/types/decidim/core/participatory_space_type.rb +0 -12
  435. data/app/types/decidim/core/scope_api_type.rb +0 -16
  436. data/app/types/decidim/core/session_type.rb +0 -19
  437. data/app/types/decidim/core/statistic_type.rb +0 -22
  438. data/app/types/decidim/core/trace_version_type.rb +0 -29
  439. data/app/types/decidim/core/translated_field_type.rb +0 -45
  440. data/app/types/decidim/core/user_entity_input_filter.rb +0 -81
  441. data/app/types/decidim/core/user_group_type.rb +0 -51
  442. data/app/types/decidim/core/user_type.rb +0 -52
  443. data/app/views/decidim/shared/_announcement.html.erb +0 -1
  444. data/app/views/decidim/shared/_flag_modal.html.erb +0 -20
  445. data/db/migrate/20210302150803_invalidate_all_sessions_for_deleted_users.rb +0 -11
  446. data/lib/decidim/api/amendable_interface.rb +0 -18
  447. data/lib/decidim/api/author_interface.rb +0 -29
  448. data/lib/decidim/api/authorable_interface.rb +0 -22
  449. data/lib/decidim/api/coauthorable_interface.rb +0 -29
  450. data/lib/decidim/api/component_interface.rb +0 -20
  451. data/lib/decidim/api/endorsable_interface.rb +0 -22
  452. data/lib/decidim/api/participatory_space_interface.rb +0 -47
  453. data/lib/decidim/api/participatory_space_resourceable_interface.rb +0 -21
  454. data/lib/decidim/api/timestamps_interface.rb +0 -21
  455. data/lib/decidim/api/traceable_interface.rb +0 -14
@@ -63,7 +63,6 @@ ru:
63
63
  file_no_exists: Файла не существует
64
64
  notice: Идет сохранение в виде файла. Вы получите электронное письмо, когда оно будет завершено.
65
65
  delete:
66
- alert: Это действие нельзя будет отменить. Если вы удалите свою учетную запись, вы не сможете больше входить в систему.
67
66
  confirm:
68
67
  close: Закрыть окно
69
68
  ok: Да, я хочу удалить свою учетную запись
@@ -109,7 +108,6 @@ ru:
109
108
  update: "%{user_name} обновил настройки организации"
110
109
  participatory_space_private_user:
111
110
  create: "%{user_name} пригласил %{resource_name} стать частным участником"
112
- create_via_csv: "%{user_name} пригласил %{resource_name} через csv стать частным участником"
113
111
  delete: "%{user_name} удалил участника %{resource_name} как приватного участника"
114
112
  scope:
115
113
  create: "%{user_name} добавил охват %{resource_name}"
@@ -286,7 +284,6 @@ ru:
286
284
  ready: Готово
287
285
  show:
288
286
  download_data: Загрузить данные
289
- download_data_description: Файл со всеми сведениями, связанными с учетной записью, будет отправлен на <strong>%{user_email}</strong>
290
287
  request_data: Запросить данные
291
288
  datepicker:
292
289
  help_text: 'Ожидаемый формат: %{datepicker_format}'
@@ -296,7 +293,6 @@ ru:
296
293
  email_already_exists: Другая учетная запись использует тот же адрес электронной почты
297
294
  new:
298
295
  complete_profile: Заполните профиль
299
- nickname_help: Ваш псевдоним в %{organization}
300
296
  sign_up: Пожалуйста, заполните свой профиль
301
297
  subtitle: Пожалуйста, заполните следующую форму, чтобы завершить регистрацию
302
298
  username_help: Общедоступное имя, которое отображается в ваших сообщениях. В целях обеспечения анонимности оно может быть любым.
@@ -305,7 +301,6 @@ ru:
305
301
  already_have_an_account?: У вас уже есть учетная запись?
306
302
  newsletter: Получать время от времени рассылку со свежими новостями
307
303
  newsletter_title: Разрешение на связь с вами
308
- nickname_help: Ваш псевдоним в %{organization}
309
304
  password_help: "Минимум %{minimun_characters} символов, не должен быть слишком распространенным (например, 123456) и должен отличаться от вашего имени и электронной почты."
310
305
  sign_in: Войти
311
306
  sign_up: Зарегистрироваться
@@ -395,7 +390,6 @@ ru:
395
390
  notification_title: Страница <a href="%{resource_path}">профиля</a> участника %{name} (%{nickname}), за которым вы следите, была обновлена.
396
391
  export_mailer:
397
392
  data_portability_export:
398
- click_button: 'Нажмите следующую кнопку, чтобы загрузить данные. <br/> Файл будет доступен до %{date}.'
399
393
  download: Скачать
400
394
  export:
401
395
  ready: К настоящему прилагается в архивированном виде сохраненный вами файл.
@@ -590,14 +584,16 @@ ru:
590
584
  debates_count: Обсуждения
591
585
  endorsements_count: Выражений поддержки
592
586
  headline: Текущее состояние %{organization}
593
- meetings_count: Встречи
587
+ meetings_count: Встреч
594
588
  orders_count: Голосов
589
+ pages_count: Страниц
595
590
  processes_count: Движений
596
- projects_count: Проекты
591
+ projects_count: Проектов
597
592
  proposals_accepted: Принятые предложения
598
- proposals_count: Предложения
599
- results_count: Итоги
593
+ proposals_count: Предложений
594
+ results_count: Итогов
600
595
  surveys_count: Опросов
596
+ users_count: Участников
601
597
  votes_count: Голосов
602
598
  sub_hero:
603
599
  register: Зарегистрироваться
@@ -647,7 +643,6 @@ ru:
647
643
  subject: Ресурс был автоматически скрыт
648
644
  report:
649
645
  hello: Здравствуйте, %{name}!
650
- manage_moderations: Управление действиями по модерации
651
646
  report_html: <p>О следующем <a href="%{url}">содержимом</a> была передана жалоба администраторам.</p>
652
647
  subject: О ресурсе была передана жалоба администраторам
653
648
  reports:
@@ -814,7 +809,7 @@ ru:
814
809
  errors:
815
810
  messages:
816
811
  already_confirmed: уже был подтвержден, попробуйте войти
817
- content_type_whitelist_error: этот тип файла недопустим
812
+ content_type_allowlist_error: этот тип файла недопустим
818
813
  cycle_detected: родитель охвата не может быть одним из его потомков
819
814
  file_size_is_less_than_or_equal_to: размер файла должен быть меньше или равен %{count}
820
815
  nesting_too_deep: не может быть внутри подкатегории
@@ -33,7 +33,6 @@ sk:
33
33
  decidim/profile_updated_event: Profil aktualizovaný
34
34
  decidim/promote_to_admin: Povýšený na správcu skupiny
35
35
  decidim/removed_from_group: Odstránený zo skupiny
36
- decidim/resource_endorsed_event: Zdroj podporený
37
36
  activerecord:
38
37
  attributes:
39
38
  decidim/user:
@@ -87,7 +86,6 @@ sk:
87
86
  file_no_exists: Súbor neexistuje
88
87
  notice: Sťahovanie Vašich dát momentálne prebieha. Po dokončení dostanete e-mail.
89
88
  delete:
90
- alert: Táto akcia sa nedá vrátiť späť. Ak odstránite svoj účet, nebudete sa viac môcť prihlásiť.
91
89
  confirm:
92
90
  close: Zavrieť okno
93
91
  ok: Áno, chcem zmazať účet
@@ -133,7 +131,6 @@ sk:
133
131
  update: "%{user_name} aktualizoval nastavenia organizácie"
134
132
  participatory_space_private_user:
135
133
  create: "%{user_name} pozval %{resource_name} aby sa stal súkromným používateľom"
136
- create_via_csv: "%{user_name} pozval %{resource_name} cez CSV aby sa stal súkromným účastníkom"
137
134
  delete: "%{user_name} odstránil užívateľa %{resource_name} ako súkromného účastníka"
138
135
  scope:
139
136
  create: "%{user_name} vytvoril %{resource_name} rozsah"
@@ -397,7 +394,6 @@ sk:
397
394
  ready: Pripravený
398
395
  show:
399
396
  download_data: Stiahnuť dáta
400
- download_data_description: Súbor so všetkými informáciami pridruženými k účtu bude odoslaný na <strong>%{user_email} </strong>
401
397
  request_data: Vyžiadať dáta
402
398
  datepicker:
403
399
  help_text: 'Očakávaný formát:%{datepicker_format}'
@@ -407,7 +403,6 @@ sk:
407
403
  email_already_exists: Iný účet používa rovnakú e-mailovú adresu
408
404
  new:
409
405
  complete_profile: Kompletné profil
410
- nickname_help: Vaša prezývka v %{organization}
411
406
  sign_up: Prosím, vyplňte svoj profil
412
407
  subtitle: Pre dokončenie registrácie vyplňte prosím nasledujúci formulár
413
408
  username_help: Verejné meno, ktoré sa zobrazí vo vašich príspevkoch. S cieľom zaručiť anonymitu môže byť akékoľvek meno.
@@ -416,7 +411,6 @@ sk:
416
411
  already_have_an_account?: Už máte účet?
417
412
  newsletter: Dostávajte príležitostný spravodajca s relevantnými informáciami
418
413
  newsletter_title: Povolenie kontaktu
419
- nickname_help: Vaša prezývka v %{organization}
420
414
  password_help: "%{minimun_characters} minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
421
415
  sign_in: Prihlásiť sa
422
416
  sign_up: Zaregistrovať sa
@@ -602,7 +596,6 @@ sk:
602
596
  notification_title: <a href="%{resource_path}"> profilová stránka </a> od%{name} (%{nickname}), ktorú sledujete, bola aktualizovaná.
603
597
  export_mailer:
604
598
  data_portability_export:
605
- click_button: 'Kliknite na tlačítko pre stiahnutie Vašich dát. <br/> Súbor bude dostupný do %{date}. <br/> Budete potrebovať <a href=''https://www.7-zip.org/''>7-Zip software</a> na jeho otvorenie a rozbalenie. Heslo: %{password}'
606
599
  download: Stiahnutie
607
600
  export:
608
601
  ready: V prílohe nájdete exportovanú exportovanú verziu.
@@ -632,7 +625,6 @@ sk:
632
625
  create:
633
626
  button: Sledovať
634
627
  error: Pri sledovaní tohto zdroja sa vyskytla chyba.
635
- participatory_space: Už sledujete participatívny priestor
636
628
  destroy:
637
629
  button: Ukončiť sledovanie
638
630
  error: Pri sledovaní tohto zdroja sa vyskytla chyba.
@@ -841,8 +833,6 @@ sk:
841
833
  send: Poslat
842
834
  title: Spusťte konverzaci
843
835
  metrics:
844
- download:
845
- csv: Stiahnuť údaje (CSV)
846
836
  followers:
847
837
  description: Počet účastníkov, ktorí sledujú tento participatívny priestor
848
838
  object: sledujúci
@@ -963,7 +953,7 @@ sk:
963
953
  projects_count: Projekty
964
954
  proposals_accepted: Prijaté návrhy
965
955
  proposals_count: Návrhy
966
- results_count: Výsledky
956
+ results_count: Výsledok
967
957
  surveys_count: Prieskumy
968
958
  users_count: Účastníci
969
959
  votes_count: Hlasy
@@ -1037,7 +1027,6 @@ sk:
1037
1027
  subject: Zdroj bol automaticky skrytý
1038
1028
  report:
1039
1029
  hello: Zdravím %{name},
1040
- manage_moderations: Správa moderovanie
1041
1030
  report_html: <p> Bol nahlásený nasledujúce <a href="%{url}"> obsah </a>. </ p>
1042
1031
  subject: Bol ohlásený zdroj
1043
1032
  reports:
@@ -1297,7 +1286,7 @@ sk:
1297
1286
  messages:
1298
1287
  already_confirmed: bolo už potvrdené, skúste prosím prihlásiť
1299
1288
  confirmation_period_expired: musí byť potvrdené v rámci %{period}, požiadajte o nový
1300
- content_type_whitelist_error: typ súboru nie je platný
1289
+ content_type_allowlist_error: typ súboru nie je platný
1301
1290
  cycle_detected: rodič odbore nemôže byť jedným z jeho potomkov
1302
1291
  expired: uplynula, požiadajte o novú
1303
1292
  file_size_is_less_than_or_equal_to: veľkosť súboru musí byť menšia alebo rovná%{count}
@@ -1,7 +1,4 @@
1
1
  sr:
2
- activemodel:
3
- models:
4
- decidim/resource_endorsed_event: Resurs podržan
5
2
  activerecord:
6
3
  models:
7
4
  decidim/endorsement:
@@ -47,12 +44,6 @@ sr:
47
44
  email_outro: Dobili ste ovo obaveštenje jer pratite %{endorser_nickname}. Možete da prestanete da dobijate obaveštenja, ukoliko pratite prethodni link.
48
45
  email_subject: "%{endorser_nickname} je podržao nešto"
49
46
  notification_title: <a href="%{endorser_path}">%{endorser_name}%{endorser_nickname}</a> je podržao <a href="%{resource_path}">%{resource_title}</a>%{resource_type}.
50
- export_mailer:
51
- data_portability_export:
52
- click_button: 'Kliknite na sledeće dugme da bi preuzeli svoje podatke u obliku datoteke.<br/> Moći ćete da pristupite ovom linku do %{date}. <br/> Biće vam potreban program kao što je <a href=''https://www.7-zip.org/''>7-zip</a> da bi ga otvorili. Šifra za otpakivanje datoteke:%{password}'
53
- follows:
54
- create:
55
- participatory_space: Već pratite prostor za diskusiju
56
47
  messaging:
57
48
  conversations:
58
49
  add_conversation_users:
@@ -35,7 +35,6 @@ sv:
35
35
  decidim/profile_updated_event: Profilen har uppdaterats
36
36
  decidim/promote_to_admin: Befordrad till gruppadministratör
37
37
  decidim/removed_from_group: Borttagen från gruppen
38
- decidim/resource_endorsed_event: Instäm med resurs
39
38
  activerecord:
40
39
  attributes:
41
40
  decidim/user:
@@ -65,7 +64,6 @@ sv:
65
64
  errors:
66
65
  general: Fel vid bearbetning av bild
67
66
  image_too_big: Bilden är för stor
68
- not_inside_organization: Den här filen är inte bifogad till någon organisation
69
67
  date:
70
68
  formats:
71
69
  decidim_short: "%d/%m/%Y"
@@ -83,7 +81,6 @@ sv:
83
81
  file_no_exists: Filen finns inte
84
82
  notice: Dina uppgifter hämtas för närvarande. Du får ett e-postmeddelande när det är klart.
85
83
  delete:
86
- alert: Den här åtgärden kan inte ångras. Om du tar bort ditt konto kommer du inte att kunna logga in.
87
84
  confirm:
88
85
  close: Stäng fönster
89
86
  ok: Ja, radera mitt konto
@@ -129,7 +126,6 @@ sv:
129
126
  update: "%{user_name} uppdaterade organisationsinställningarna"
130
127
  participatory_space_private_user:
131
128
  create: "%{user_name} uppmanade %{resource_name} att vara en privat deltagare"
132
- create_via_csv: "%{user_name} bjöd in %{resource_name} till att vara en privat deltagare via CSV"
133
129
  delete: "%{user_name} tog deltagaren %{resource_name} som en privat deltagare"
134
130
  scope:
135
131
  create: "%{user_name} skapade omfattningen %{resource_name}"
@@ -352,8 +348,6 @@ sv:
352
348
  dummy_global_translatable_text: Översättningsbar exempeltext
353
349
  enable_pads_creation: Aktivera skapande av memo
354
350
  resources_permissions_enabled: Resursbehörigheter på
355
- scope_id: Omfång
356
- scopes_enabled: Omfång aktiverade
357
351
  step:
358
352
  amendment_creation_enabled: Tillåt att skapa ändringsförslag
359
353
  amendment_promotion_enabled: Tillåt att annonsera ändringsförslag
@@ -398,7 +392,6 @@ sv:
398
392
  ready: Klar
399
393
  show:
400
394
  download_data: Hämta data
401
- download_data_description: En fil med all information som är kopplad till kontot kommer att skickas till <strong>%{user_email}</strong>
402
395
  request_data: Begär data
403
396
  datepicker:
404
397
  help_text: 'Förväntat format: %{datepicker_format}'
@@ -408,7 +401,6 @@ sv:
408
401
  email_already_exists: Ett annat konto använder samma e-postadress
409
402
  new:
410
403
  complete_profile: Komplettera profil
411
- nickname_help: Ditt alias i %{organization}
412
404
  sign_up: Var god slutför din profil
413
405
  subtitle: Slutför registreringen genom att fylla i följande formulär
414
406
  username_help: Offentligt namn som visas i dina inlägg. Du kan ange ett annat namn än ditt eget, om du vill vara anonym.
@@ -417,7 +409,6 @@ sv:
417
409
  already_have_an_account?: Har du redan ett konto?
418
410
  newsletter: Få enstaka nyhetsbrev med relevant information
419
411
  newsletter_title: Kontakttillstånd
420
- nickname_help: Ditt alias i %{organization}
421
412
  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."
422
413
  sign_in: Logga in
423
414
  sign_up: Registrera dig
@@ -439,7 +430,6 @@ sv:
439
430
  buttons:
440
431
  check: Kontrollera och fortsätt
441
432
  close_modal: Stäng modal
442
- uncheck: Behåll avmarkeringen
443
433
  notice: |-
444
434
  <p>Hej, är du säker på att du inte vill få nyhetsbrevet?<br>
445
435
  Överväg gärna en gång till att markera kryssrutan för nyhetsbrev nedan.<br>
@@ -618,7 +608,6 @@ sv:
618
608
  notification_title: <a href="%{resource_path}">Profilsidan</a> för %{name} (%{nickname}), som du följer, har uppdaterats.
619
609
  export_mailer:
620
610
  data_portability_export:
621
- click_button: 'Hämta dina data genom att klicka på Nästa. <br/> Filen kommer att vara tillgänglig till och med %{date}. <br/> Du behöver <a href=''https://www.7-zip.org/''>7-Zip</a> för att öppna den. Lösenord: %{password}'
622
611
  download: Hämta
623
612
  export:
624
613
  ready: En komprimerad version av exporten är bifogad.
@@ -651,7 +640,6 @@ sv:
651
640
  create:
652
641
  button: Följ
653
642
  error: Det gick inte att följa resursen.
654
- participatory_space: Du följer redan deltagarutrymmet
655
643
  destroy:
656
644
  button: Sluta följa
657
645
  error: Det gick inte att sluta följa den här resursen.
@@ -668,7 +656,6 @@ sv:
668
656
  file:
669
657
  explanation: 'Vägledning för fil:'
670
658
  message_1: Måste vara en bild eller ett dokument.
671
- message_2: För bilder, använd helst landskapsbilder, tjänsten grödor bilden.
672
659
  image:
673
660
  explanation: 'Vägledning för bild:'
674
661
  message_1: Helst en landskapsbild som inte har någon text.
@@ -888,9 +875,6 @@ sv:
888
875
  show: Visa konversation med %{sender}
889
876
  create:
890
877
  error: Konversationen har inte startat. Försök igen senare
891
- error_modal:
892
- close: Stäng fönster
893
- ok: OK
894
878
  index:
895
879
  ago: sedan
896
880
  close: Stäng modal
@@ -908,14 +892,11 @@ sv:
908
892
  show:
909
893
  back: Tillbaka till alla konversationer
910
894
  chat_with: Konversation med
911
- not_allowed: Den här användaren accepterar inte fler direkta meddelanden.
912
895
  title: Samtal med %{usernames}
913
896
  start:
914
897
  send: Skicka
915
898
  title: Starta en konversation
916
899
  metrics:
917
- download:
918
- csv: Hämta data (csv)
919
900
  followers:
920
901
  description: Antal deltagare som följer detta deltagarområde
921
902
  object: följare
@@ -1057,7 +1038,6 @@ sv:
1057
1038
  error: Det uppstod ett problem med att godkänna villkoren.
1058
1039
  success: Tack! Du har godkänt användarvillkoren.
1059
1040
  form:
1060
- agreement: Jag godkänner villkoren
1061
1041
  legend: Godkänn användarvillkoren
1062
1042
  refuse:
1063
1043
  modal_body: Om du vägrar kan du inte använda plattformen, men du kan <a href="%{data_portability_path}">hämta dina data</a> eller <a href="%{delete_path}">radera ditt konto</a>.
@@ -1087,6 +1067,7 @@ sv:
1087
1067
  groups: Grupper
1088
1068
  members: Medlemmar
1089
1069
  officialized: Officiell deltagare
1070
+ send_private_message: Skicka privat meddelande
1090
1071
  timeline: Tidslinje
1091
1072
  view_full_profile: Visa fullständig profil
1092
1073
  sidebar:
@@ -1114,13 +1095,15 @@ sv:
1114
1095
  report:
1115
1096
  authors: Författare
1116
1097
  content: Rapporterat innehåll
1098
+ content_original_language: Innehållets originalspråk
1117
1099
  date: Rapporterades
1118
1100
  details: Detaljer
1119
1101
  hello: Hej %{name},
1120
- manage_moderations: Hantera moderering
1102
+ id: ID
1121
1103
  participatory_space: Plats för deltagare
1122
1104
  reason: Anledning
1123
1105
  report_html: <p>Följande <a href="%{url}">innehåll</a> har rapporterats.</p>
1106
+ see_report: Se rapport
1124
1107
  subject: En resurs har rapporterats
1125
1108
  reports:
1126
1109
  create:
@@ -1164,10 +1147,6 @@ sv:
1164
1147
  one: "%{count} resultat"
1165
1148
  other: "%{count} resultat"
1166
1149
  view_all: Visa alla (%{count})
1167
- security:
1168
- selfxss_warning:
1169
- description: Denna webbläsarfunktion är avsedd för utvecklare och du bör inte klistra in något här om du ombads att göra det. Klistra in innehåll i detta fönster kan påverka din integritet och ge hackare tillgång till ditt konto.
1170
- title: OBS!
1171
1150
  shared:
1172
1151
  confirm_modal:
1173
1152
  cancel: Avbryt
@@ -1453,7 +1432,7 @@ sv:
1453
1432
  messages:
1454
1433
  already_confirmed: var redan bekräftat, försök att logga in
1455
1434
  confirmation_period_expired: behöver bekräftas inom %{period}, be om en ny
1456
- content_type_whitelist_error: ogiltig filtyp
1435
+ content_type_allowlist_error: ogiltig filtyp
1457
1436
  cycle_detected: en omfattnings förälder kan inte vara ett av dess barn
1458
1437
  expired: har förfallit, men du kan begära en ny
1459
1438
  file_size_is_less_than_or_equal_to: Filstorleken måste vara mindre än eller lika med %{count}
@@ -1534,7 +1513,6 @@ sv:
1534
1513
  see_more: Visa mer
1535
1514
  locale:
1536
1515
  name: Svenska
1537
- name_with_error: Svenska (fel!)
1538
1516
  password_validator:
1539
1517
  domain_included_in_password: är för likt detta domännamn
1540
1518
  email_included_in_password: är för likt din e-post
@@ -35,7 +35,6 @@ tr:
35
35
  decidim/profile_updated_event: Profil güncellendi
36
36
  decidim/promote_to_admin: Grup yöneticisine yükseltildi
37
37
  decidim/removed_from_group: Gruptan kaldırıldı
38
- decidim/resource_endorsed_event: Kaynak onaylandı
39
38
  activerecord:
40
39
  attributes:
41
40
  decidim/user:
@@ -79,11 +78,11 @@ tr:
79
78
  logo: "%{organization} resmi logosu"
80
79
  skip_button: Ana içeriğe geç
81
80
  account:
81
+ blocked: Bu hesap, Şartlar ve Koşullar ihlali nedeniyle engellendi
82
82
  data_portability_export:
83
83
  file_no_exists: Dosya bulunmuyor
84
84
  notice: Verilerinizin indirilmesi şu anda devam ediyor. Tamamlandığında bir e-posta alacaksınız.
85
85
  delete:
86
- alert: Bu eylem geri alınamaz. Hesabınızı silerseniz, giriş yapamazsınız.
87
86
  confirm:
88
87
  close: Pencereyi kapat
89
88
  ok: Evet, hesabımı silmek istiyorum
@@ -113,6 +112,8 @@ tr:
113
112
  delete: "%{user_name}, %{resource_name} bileşenini %{space_name} alanından kaldırdı"
114
113
  publish: "%{user_name}, %{resource_name} bileşenini %{space_name} alanında yayınladı"
115
114
  unpublish: "%{user_name}, %{resource_name} bileşenini %{space_name} alanındaki yayından kaldırdı"
115
+ impersonation_log:
116
+ manage: "%{user_name}, %{resource_name} adlı kaynağı yönetti çünkü %{reason}"
116
117
  moderation:
117
118
  hide: "%{user_name}, %{space_name} alanında %{resource_type} türünde bir kaynak sakladı"
118
119
  unreport: "%{user_name}, %{space_name} alanında %{resource_type} türünde bir kaynağı bildirmedi"
@@ -129,7 +130,7 @@ tr:
129
130
  update: "%{user_name} kuruluş ayarlarını güncelledi"
130
131
  participatory_space_private_user:
131
132
  create: "%{user_name}, %{resource_name} adlı kullanıcıyı özel katılımcı olması için davet etti"
132
- create_via_csv: "%{user_name} özel bir kullanıcı olmak için %{resource_name} davet edildi"
133
+ create_via_csv: "%{user_name}, %{resource_name} kaynağını CSV aracılığıyla özel bir katılımcı olması için davet etti"
133
134
  delete: "%{user_name}, katılımcıyı %{resource_name} özel katılımcı özelliğini kaldırdı"
134
135
  scope:
135
136
  create: "%{user_name}, %{resource_name} kapsamı oluşturdu"
@@ -143,15 +144,21 @@ tr:
143
144
  delete: "%{user_name}, %{resource_name} statik sayfayı sildi"
144
145
  update: "%{user_name}, %{resource_name} statik sayfayı güncelledi"
145
146
  user:
147
+ block: "%{user_name}, %{resource_name} kullanıcısını engelledi"
146
148
  invite: "%{user_name} katılımcıyı %{resource_name} rolüyle davet etti: %{role}"
147
149
  officialize: "%{user_name}, katılımcıyı %{resource_name} resmileştirdi"
150
+ promote: "%{user_name}, %{resource_name} için terfi etti"
148
151
  remove_from_admin: "%{user_name}, kullanıcıyı %{resource_name} rolüyle kaldırıldı: %{role}"
149
152
  show_email: "%{user_name}, %{resource_name} katılımcının e-postasını aldı"
153
+ transfer: "%{user_name}, katılımcıyı %{resource_name} aktardı"
154
+ unblock: "%{user_name}, %{resource_name} engellemesini kaldırdı"
150
155
  unofficialize: "%{user_name}, katılımcının %{resource_name} resmiyetini kaldırdı"
151
156
  user_group:
152
157
  reject: "%{user_name}, %{resource_name} kullanıcı grubu doğrulamasını reddetti"
153
158
  verify: "%{user_name}, %{resource_name} kullanıcı grubunu doğruladı"
154
159
  verify_via_csv: "%{user_name}, bir CSV dosyası aracılığıyla %{resource_name} kullanıcı grubunu doğruladı"
160
+ user_moderation:
161
+ unreport: "%{user_name}, bir %{resource_type} - %{unreported_user_name} raporunu bildirdi"
155
162
  admin_terms_of_use:
156
163
  default_body: "<h2> YÖNETİCİ KULLANIM ŞARTLARI </h2> <p> Yerel Sistem Yöneticinizden olağan dersi almış olduğunuza güveniyoruz. Genellikle şu üç şeye indirgenir: </p> <ol> <li> Başkalarının mahremiyetine saygı gösterin. </li> <li> Tıklamadan önce düşünün. </li> <li> Büyük güç, büyük sorumluluk getirir. </li> </ol>"
157
164
  alert:
@@ -271,6 +278,8 @@ tr:
271
278
  name: Örnek yetkilendirme
272
279
  dummy_authorization_workflow:
273
280
  name: Sahte yetkilendirme iş akışı
281
+ errors:
282
+ duplicate_authorization: Bir katılımcı zaten aynı verilerle yetkilendirildi. Bir yönetici, bilgilerinizi doğrulamak için sizinle iletişime geçecektir.
274
283
  expired_at: '%{timestamp} bitti'
275
284
  expires_at: '%{timestamp} sona eriyor'
276
285
  foo_authorization:
@@ -316,6 +325,13 @@ tr:
316
325
  title: E-posta adresinizi doğrulayın
317
326
  show:
318
327
  close_modal: Pencereyi kapat
328
+ block_user_mailer:
329
+ notify:
330
+ body_1: Hesabınız kilitlendi.
331
+ body_2: 'Gerekçe: %{justification}'
332
+ greetings: Selamlar,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
333
+ hello: Merhaba,
334
+ subject: Hesabınız %{organization_name} tarafından engellendi
319
335
  collapsible_list:
320
336
  hidden_elements_count:
321
337
  one: ve %{count} daha
@@ -364,6 +380,13 @@ tr:
364
380
  dummy_step_translatable_text: Sahte Çevrilebilir Metin
365
381
  contact: İletişim
366
382
  content_blocks:
383
+ cta:
384
+ name: Resim, metin ve Harekete Geçirici Mesaj düğmesi
385
+ cta_settings_form:
386
+ background_image: Arka plan resmi
387
+ button_text: Harekete Geçirici Mesaj metni
388
+ button_url: Harekete Geçirici Mesaj URL'si
389
+ description: Açıklama
367
390
  footer_sub_hero:
368
391
  name: Dipnot alt afişi
369
392
  hero:
@@ -373,6 +396,11 @@ tr:
373
396
  welcome_text: Hoşgeldin Mesajı
374
397
  highlighted_content_banner:
375
398
  name: Vurgulanan içerik banner'ı
399
+ highlighted_elements_settings_form:
400
+ orders:
401
+ label: 'Öğeleri sıralama ölçütü:'
402
+ random: Rastgele
403
+ recent: En yeni
376
404
  how_to_participate:
377
405
  name: Nasıl katılacağım
378
406
  html:
@@ -397,7 +425,6 @@ tr:
397
425
  ready: Hazır
398
426
  show:
399
427
  download_data: Verileri indir
400
- download_data_description: Hesapla ilişkili tüm bilgilerin bulunduğu bir dosya <strong>%{user_email}</strong>gönderilecektir.
401
428
  request_data: Veri talep et
402
429
  datepicker:
403
430
  help_text: 'Beklenen format: %{datepicker_format}'
@@ -407,7 +434,7 @@ tr:
407
434
  email_already_exists: Başka bir hesap aynı e-posta adresini kullanıyor
408
435
  new:
409
436
  complete_profile: Profilini tamamla
410
- nickname_help: Benzersiz tanımlayıcınız %{organization}
437
+ nickname_help: Takma adınız %{organization}. Yalnızca harf, rakam, "-" ve "_" içerebilir.
411
438
  sign_up: Lütfen profilinizi tamamlayın
412
439
  subtitle: Kayıt işlemini tamamlamak için lütfen aşağıdaki formu doldurunuz.
413
440
  username_help: Gönderilerinizde görünen genel ad. Anonimliği garanti etmek amacıyla herhangi bir isim olabilir.
@@ -416,7 +443,7 @@ tr:
416
443
  already_have_an_account?: Zaten hesabınız var mı?
417
444
  newsletter: Ara sıra ilgili bilgileri içeren bir haber bülteni alın
418
445
  newsletter_title: İletişim izni
419
- nickname_help: Benzersiz tanımlayıcınız %{organization}
446
+ nickname_help: Takma adınız %{organization}. Yalnızca harf, rakam, "-" ve "_" içerebilir.
420
447
  password_help: "Asgari %{minimun_characters} karakter, çok yaygın olmamalı (örnek: 123456) ve takma adınızdan ve eposta adresinizden farklı olmalıdır."
421
448
  sign_in: Oturum aç
422
449
  sign_up: kaydol
@@ -608,6 +635,14 @@ tr:
608
635
  notification_title: '%{user_group_name} kullanıcı grubu profilini güncelledi ve doğrulanmadan bırakıldı. Artık bunu <a href="%{groups_admin_path}"> yönetici panelinde </a> doğrulayabilirsiniz.'
609
636
  notification_event:
610
637
  notification_title: Bir olay <a href="%{resource_path}">%{resource_title}</a>.
638
+ reports:
639
+ resource_hidden:
640
+ email_intro: Bir yönetici, %{resource_type}'nizi %{report_reasons} olarak bildirildiği için kaldırdı.
641
+ email_outro: Bu bildirimi, kaldırılan içeriğin yazarı olduğunuz için aldınız.
642
+ email_subject: '%{resource_type} kaldırıldı'
643
+ notification_title: |-
644
+ Bir yönetici, %{resource_type}'nizi %{report_reasons} olarak bildirildiği için kaldırdı. </br>
645
+ <i>%{resource_content} </i>
611
646
  resource_endorsed:
612
647
  email_intro: 'Takip ettiğiniz %{endorser_name} %{endorser_nickname}, "%{resource_title}" ögesini az önce onayladı ve sizin için ilginç olabileceğini düşünüyoruz. Kontrol edin ve katkıda bulunun:'
613
648
  email_outro: Bu bildirimi %{endorser_nickname} adlı kişiyi takip ettiğiniz için aldınız. Önceki bağlantıyı izleyerek bildirim almayı durdurabilirsiniz.
@@ -621,7 +656,6 @@ tr:
621
656
  notification_title: <a href="%{resource_path}">profil sayfası</a> arasında %{name} (%{nickname} izlediğiniz), güncellendi.
622
657
  export_mailer:
623
658
  data_portability_export:
624
- click_button: 'Verilerinizi indirmek için sonraki düğmeye tıklayın. <br/> Dosyaya %{date}kadar sahip olacaksınız.'
625
659
  download: İndir
626
660
  export:
627
661
  ready: Lütfen dışa aktarımınızın sıkıştırılmış bir sürümünü ekte bulun.
@@ -654,7 +688,6 @@ tr:
654
688
  create:
655
689
  button: Takip et
656
690
  error: Bu kaynağı takip eden bir hata oluştu.
657
- participatory_space: <span class = "show-for-sr">%{resource_name} </span> hali hazırda takip ediliyor
658
691
  destroy:
659
692
  button: Takibi bırak
660
693
  error: Bu kaynağı takip etmekten bir hata oluştu.
@@ -671,7 +704,7 @@ tr:
671
704
  file:
672
705
  explanation: 'Dosya kılavuzu:'
673
706
  message_1: Bir resim veya bir belge olmalı.
674
- message_2: Resimler için tercihen yatay resimleri kullanın, bu servis resmi kırpar.
707
+ message_2: Resimler için tercihen yatay resimleri kullanın, bu servis resmi kırpar. CSV dosyaları için, sütunlar arasındaki ayırıcı virgül (",") olmalıdır
675
708
  image:
676
709
  explanation: 'Dosya kılavuzu:'
677
710
  message_1: Tercihen herhangi bir metin içermeyen yatay bir resim.
@@ -913,7 +946,6 @@ tr:
913
946
  show:
914
947
  back: Tüm görüşmelere dön
915
948
  chat_with: ile görüşme
916
- not_allowed: Bu kullanıcı artık doğrudan mesaj kabul etmiyor.
917
949
  title: '%{usernames} ile görüşme'
918
950
  start:
919
951
  send: Gönder
@@ -1034,7 +1066,7 @@ tr:
1034
1066
  comments_count: Yorumlar
1035
1067
  conferences_count: Konferanslar
1036
1068
  debates_count: Tartışmalar
1037
- endorsements_count: Cirolar
1069
+ endorsements_count: Onaylar
1038
1070
  headline: Mevcut durum %{organization}
1039
1071
  meetings_count: Toplantılar
1040
1072
  orders_count: Oylar
@@ -1042,7 +1074,7 @@ tr:
1042
1074
  processes_count: Süreçler
1043
1075
  projects_count: Projeler
1044
1076
  proposals_accepted: Kabul Edilen Teklifler
1045
- proposals_count: Teklif
1077
+ proposals_count: Teklifler
1046
1078
  results_count: Sonuçlar
1047
1079
  surveys_count: Anketler
1048
1080
  users_count: Katılımcılar
@@ -1081,6 +1113,7 @@ tr:
1081
1113
  not_allowed: Bu içeriği görüntüleme izniniz bulunmuyor
1082
1114
  profile:
1083
1115
  deleted: Katılımcı silindi
1116
+ inaccessible_message: Bu profile, Şartlar ve Koşullar ihlali nedeniyle erişilemez!
1084
1117
  view: Görünüm
1085
1118
  profiles:
1086
1119
  default_officialization_text_for_user_groups: Bu grup herkese açık olarak doğrulandı, adının gerçek adıyla eşleştiği doğrulandı
@@ -1121,13 +1154,15 @@ tr:
1121
1154
  report:
1122
1155
  authors: Yazarlar
1123
1156
  content: İçeriği bildir
1157
+ content_original_language: İçerik orijinal dili
1124
1158
  date: Rapor edildi
1125
1159
  details: Ayrıntılar
1126
1160
  hello: Merhaba %{name}
1127
- manage_moderations: Denetimleri yönet
1161
+ id: ID
1128
1162
  participatory_space: Katılımcı alanı
1129
1163
  reason: Nedeni
1130
1164
  report_html: <p>Aşağıdaki <a href="%{url}">içerik</a> bildirilmiştir.</p>
1165
+ see_report: Raporu gör
1131
1166
  subject: Bir kaynak rapor edildi
1132
1167
  reports:
1133
1168
  create:
@@ -1200,6 +1235,15 @@ tr:
1200
1235
  report: Rapor
1201
1236
  spam: Tıklama, reklam, dolandırıcılık veya komut dosyası botları içerir.
1202
1237
  title: Sorun bildir
1238
+ flag_user_modal:
1239
+ already_reported: Bu içerik zaten bildirildi ve bir yönetici tarafından incelenecek.
1240
+ close: Kapat
1241
+ description: Kullanıcı hakkında uygunsuz olan nedir?
1242
+ does_not_belong: Yasadışı faaliyet, intihar tehditleri, kişisel bilgiler veya %{organization_name} kuruluşuna ait olmadığını düşündüğünüz başka bir şey içeriyor.
1243
+ offensive: Irkçılık, cinsiyetçilik, hakaretler, kişisel saldırılar, ölüm tehditleri, intihar talepleri veya her türlü nefret söylemi içerir.
1244
+ report: Bildir
1245
+ spam: Tıklama tuzağı, reklam, dolandırıcılık veya komut dosyası botları içerir.
1246
+ title: Uygunsuz Kullanıcıyı bildirin
1203
1247
  floating_help:
1204
1248
  close: Yardımı Kapat
1205
1249
  help: yardım et
@@ -1275,6 +1319,13 @@ tr:
1275
1319
  update:
1276
1320
  error: İlgi alanlarınız güncellenirken bir hata oluştu.
1277
1321
  success: İlgi alanlarınız başarıyla güncellendi.
1322
+ user_report_mailer:
1323
+ notify:
1324
+ body_1: Kullanıcı %{user}, %{token} tarafından rapor edildi
1325
+ body_2: 'Gerekçe: %{reason}'
1326
+ greetings: Selamlar,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
1327
+ hello: Merhaba %{admin},
1328
+ subject: '%{organization_name} içinde yeni bir kullanıcı bildirildi'
1278
1329
  version:
1279
1330
  show:
1280
1331
  back_to_resource: Geri git
@@ -1460,7 +1511,7 @@ tr:
1460
1511
  messages:
1461
1512
  already_confirmed: zaten onaylandı, lütfen giriş yapmayı deneyin
1462
1513
  confirmation_period_expired: '%{period}içinde onaylanması gerekiyor, lütfen yeni bir tane isteyin'
1463
- content_type_whitelist_error: dosya türü geçerli değil
1514
+ content_type_allowlist_error: dosya türü geçerli değil
1464
1515
  cycle_detected: bir kapsamın ebeveyni torunlarından biri olamaz
1465
1516
  expired: süresi doldu, lütfen yeni bir tane isteyin
1466
1517
  file_size_is_less_than_or_equal_to: dosya boyutu %{count}eşit veya daha küçük olmalıdır