decidim-core 0.26.2 → 0.27.0.rc2
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.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/cells/decidim/amendable/announcement_cell.rb +3 -8
- data/app/cells/decidim/announcement_cell.rb +2 -2
- data/app/cells/decidim/author_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/cta/show.erb +1 -1
- data/app/cells/decidim/content_blocks/cta_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/hero/show.erb +2 -2
- data/app/cells/decidim/content_blocks/hero_cell.rb +1 -0
- data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb +5 -5
- data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/how_to_participate/show.erb +1 -1
- data/app/cells/decidim/content_blocks/last_activity/show.erb +1 -1
- data/app/cells/decidim/content_blocks/last_activity_cell.rb +3 -3
- data/app/cells/decidim/content_blocks/stats_cell.rb +5 -4
- data/app/cells/decidim/content_blocks/sub_hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/sub_hero_cell.rb +1 -1
- data/app/cells/decidim/data_consent/category.erb +64 -0
- data/app/cells/decidim/data_consent/dialog.erb +29 -0
- data/app/cells/decidim/data_consent/modal.erb +39 -0
- data/app/cells/decidim/data_consent/show.erb +3 -0
- data/app/cells/decidim/data_consent_cell.rb +21 -0
- data/app/cells/decidim/follow_button_cell.rb +5 -7
- data/app/cells/decidim/profile_sidebar_cell.rb +1 -1
- data/app/cells/decidim/search_results_cell.rb +1 -1
- data/app/cells/decidim/tos_page/refuse_btn_modal.erb +1 -1
- data/app/cells/decidim/upload_modal/files.erb +52 -0
- data/app/cells/decidim/upload_modal/modal.erb +49 -0
- data/app/cells/decidim/upload_modal/show.erb +3 -0
- data/app/cells/decidim/upload_modal_cell.rb +205 -0
- data/app/cells/decidim/user_conversation/reply.erb +1 -1
- data/app/cells/decidim/user_conversations/add_conversation_users.erb +5 -3
- data/app/cells/decidim/version_cell.rb +2 -13
- data/app/cells/decidim/versions_list_cell.rb +2 -13
- data/app/cells/decidim/versions_list_item_cell.rb +2 -13
- data/app/commands/decidim/accept_group_invitation.rb +1 -1
- data/app/commands/decidim/accept_user_group_join_request.rb +1 -1
- data/app/commands/decidim/amendable/accept.rb +1 -1
- data/app/commands/decidim/amendable/create_draft.rb +1 -1
- data/app/commands/decidim/amendable/destroy_draft.rb +1 -1
- data/app/commands/decidim/amendable/promote.rb +1 -1
- data/app/commands/decidim/amendable/publish_draft.rb +1 -1
- data/app/commands/decidim/amendable/reject.rb +1 -1
- data/app/commands/decidim/amendable/update_draft.rb +1 -1
- data/app/commands/decidim/amendable/withdraw.rb +1 -1
- data/app/commands/decidim/attachment_methods.rb +3 -2
- data/app/commands/decidim/create_editor_image.rb +1 -1
- data/app/commands/decidim/create_follow.rb +1 -1
- data/app/commands/decidim/create_omniauth_registration.rb +2 -3
- data/app/commands/decidim/create_registration.rb +1 -2
- data/app/commands/decidim/create_report.rb +1 -1
- data/app/commands/decidim/create_user_group.rb +2 -2
- data/app/commands/decidim/create_user_report.rb +5 -3
- data/app/commands/decidim/delete_follow.rb +1 -1
- data/app/commands/decidim/demote_membership.rb +1 -1
- data/app/commands/decidim/destroy_account.rb +1 -1
- data/app/commands/decidim/endorse_resource.rb +1 -1
- data/app/commands/decidim/gallery_methods.rb +45 -10
- data/app/commands/decidim/invite_user.rb +1 -3
- data/app/commands/decidim/invite_user_again.rb +1 -1
- data/app/commands/decidim/invite_user_to_group.rb +1 -1
- data/app/commands/decidim/join_user_group.rb +1 -1
- data/app/commands/decidim/leave_user_group.rb +8 -2
- data/app/commands/decidim/messaging/reply_to_conversation.rb +2 -2
- data/app/commands/decidim/messaging/start_conversation.rb +2 -2
- data/app/commands/decidim/multiple_attachments_methods.rb +44 -5
- data/app/commands/decidim/promote_membership.rb +1 -1
- data/app/commands/decidim/reject_group_invitation.rb +1 -1
- data/app/commands/decidim/reject_user_group_join_request.rb +1 -1
- data/app/commands/decidim/remove_user_from_group.rb +1 -1
- data/app/commands/decidim/resend_confirmation_instructions.rb +18 -0
- data/app/commands/decidim/search.rb +10 -9
- data/app/commands/decidim/unendorse_resource.rb +1 -1
- data/app/commands/decidim/unsubscribe_settings.rb +1 -1
- data/app/commands/decidim/update_account.rb +5 -3
- data/app/commands/decidim/update_notifications_settings.rb +3 -2
- data/app/commands/decidim/update_password.rb +31 -0
- data/app/commands/decidim/update_user_group.rb +2 -2
- data/app/commands/decidim/update_user_interests.rb +1 -1
- data/app/commands/decidim/validate_upload.rb +15 -0
- data/app/controllers/concerns/decidim/devise_controllers.rb +0 -1
- data/app/controllers/concerns/decidim/filter_resource.rb +23 -24
- data/app/controllers/concerns/decidim/force_authentication.rb +1 -2
- data/app/controllers/concerns/decidim/http_caching_disabler.rb +1 -1
- data/app/controllers/concerns/decidim/needs_password_change.rb +43 -0
- data/app/controllers/concerns/decidim/needs_tos_accepted.rb +3 -3
- data/app/controllers/concerns/decidim/orderable.rb +1 -1
- data/app/controllers/concerns/decidim/participatory_space_context.rb +2 -2
- data/app/controllers/concerns/decidim/resource_versions_concern.rb +4 -0
- data/app/controllers/decidim/account_controller.rb +45 -0
- data/app/controllers/decidim/application_controller.rb +1 -1
- data/app/controllers/decidim/devise/invitations_controller.rb +2 -0
- data/app/controllers/decidim/devise/passwords_controller.rb +33 -0
- data/app/controllers/decidim/devise/registrations_controller.rb +7 -1
- data/app/controllers/decidim/devise/sessions_controller.rb +2 -0
- data/app/controllers/decidim/{data_portability_controller.rb → download_your_data_controller.rb} +8 -8
- data/app/controllers/decidim/groups_controller.rb +5 -0
- data/app/controllers/decidim/last_activities_controller.rb +8 -9
- data/app/controllers/decidim/manifests_controller.rb +11 -0
- data/app/controllers/decidim/newsletters_controller.rb +1 -1
- data/app/controllers/decidim/notifications_subscriptions_controller.rb +16 -0
- data/app/controllers/decidim/offline_controller.rb +7 -0
- data/app/controllers/decidim/profiles_controller.rb +1 -1
- data/app/controllers/decidim/searches_controller.rb +4 -3
- data/app/controllers/decidim/short_links_controller.rb +35 -0
- data/app/controllers/decidim/upload_validations_controller.rb +44 -0
- data/app/controllers/decidim/user_activities_controller.rb +32 -16
- data/app/controllers/decidim/user_interests_controller.rb +0 -2
- data/app/controllers/decidim/user_timeline_controller.rb +6 -8
- data/app/events/decidim/change_nickname_event.rb +21 -0
- data/app/events/decidim/resource_endorsed_event.rb +2 -1
- data/app/forms/decidim/account_form.rb +8 -7
- data/app/forms/decidim/form.rb +1 -1
- data/app/forms/decidim/messaging/conversation_form.rb +1 -1
- data/app/forms/decidim/notifications_settings_form.rb +8 -2
- data/app/forms/decidim/password_form.rb +10 -0
- data/app/forms/decidim/registration_form.rb +10 -4
- data/app/forms/decidim/upload_validation_form.rb +54 -0
- data/app/forms/decidim/user_group_form.rb +2 -2
- data/app/forms/decidim/user_interest_scope_form.rb +1 -1
- data/app/forms/decidim/user_interests_form.rb +1 -1
- data/app/forms/translatable_presence_validator.rb +2 -2
- data/app/forms/url_validator.rb +1 -1
- data/app/helpers/decidim/application_helper.rb +2 -2
- data/app/helpers/decidim/attachments_helper.rb +1 -1
- data/app/helpers/decidim/cells_paginate_helper.rb +1 -1
- data/app/helpers/decidim/datalist_select_helper.rb +40 -0
- data/app/helpers/decidim/decidim_form_helper.rb +1 -1
- data/app/helpers/decidim/filters_helper.rb +5 -1
- data/app/helpers/decidim/followable_helper.rb +1 -1
- data/app/helpers/decidim/icon_helper.rb +1 -1
- data/app/helpers/decidim/layout_helper.rb +15 -1
- data/app/helpers/decidim/map_helper.rb +12 -8
- data/app/helpers/decidim/meta_tags_helper.rb +0 -2
- data/app/helpers/decidim/notifications_settings_helper.rb +15 -0
- data/app/helpers/decidim/passwords_helper.rb +41 -0
- data/app/helpers/decidim/sanitize_helper.rb +12 -2
- data/app/helpers/decidim/searches_helper.rb +6 -6
- data/app/helpers/decidim/short_link_helper.rb +28 -0
- data/app/helpers/decidim/translations_helper.rb +2 -2
- data/app/jobs/decidim/{data_portability_export_job.rb → download_your_data_export_job.rb} +5 -5
- data/app/jobs/decidim/email_notifications_digest_generator_job.rb +21 -0
- data/app/jobs/decidim/notification_generator_for_recipient_job.rb +5 -3
- data/app/jobs/decidim/reminder_generator_job.rb +12 -0
- data/app/jobs/decidim/resend_confirmation_instructions_job.rb +11 -0
- data/app/jobs/decidim/user_report_job.rb +2 -2
- data/app/mailers/concerns/decidim/multitenant_asset_host.rb +11 -3
- data/app/mailers/decidim/application_mailer.rb +1 -1
- data/app/mailers/decidim/block_user_mailer.rb +8 -7
- data/app/mailers/decidim/export_mailer.rb +2 -2
- data/app/mailers/decidim/newsletter_mailer.rb +2 -2
- data/app/mailers/decidim/newsletters_opt_in_mailer.rb +7 -5
- data/app/mailers/decidim/notifications_digest_mailer.rb +23 -0
- data/app/mailers/decidim/user_report_mailer.rb +10 -11
- data/app/models/decidim/action_log.rb +95 -11
- data/app/models/decidim/amendment.rb +0 -1
- data/app/models/decidim/area.rb +1 -2
- data/app/models/decidim/area_type.rb +5 -0
- data/app/models/decidim/attachment.rb +6 -0
- data/app/models/decidim/attachment_collection.rb +5 -0
- data/app/models/decidim/category.rb +9 -4
- data/app/models/decidim/coauthorship.rb +0 -2
- data/app/models/decidim/contextual_help_section.rb +5 -1
- data/app/models/decidim/follow.rb +2 -2
- data/app/models/decidim/gamification/badge_score.rb +0 -1
- data/app/models/decidim/identity.rb +2 -2
- data/app/models/decidim/messaging/conversation.rb +4 -4
- data/app/models/decidim/messaging/message.rb +1 -2
- data/app/models/decidim/messaging/participation.rb +0 -2
- data/app/models/decidim/messaging/receipt.rb +0 -2
- data/app/models/decidim/notification.rb +14 -2
- data/app/models/decidim/oauth_application.rb +12 -1
- data/app/models/decidim/organization.rb +7 -7
- data/app/models/decidim/participatory_space_private_user.rb +4 -2
- data/app/models/decidim/permission_action.rb +1 -0
- data/app/models/decidim/reminder.rb +10 -0
- data/app/models/decidim/reminder_delivery.rb +7 -0
- data/app/models/decidim/reminder_record.rb +29 -0
- data/app/models/decidim/report.rb +2 -2
- data/app/models/decidim/scope.rb +3 -4
- data/app/models/decidim/scope_type.rb +5 -0
- data/app/models/decidim/share_token.rb +0 -2
- data/app/models/decidim/short_link.rb +162 -0
- data/app/models/decidim/user.rb +34 -6
- data/app/models/decidim/user_base_entity.rb +2 -1
- data/app/models/decidim/user_group.rb +3 -3
- data/app/models/decidim/user_moderation.rb +0 -2
- data/app/models/decidim/user_report.rb +2 -2
- data/app/packs/entrypoints/decidim_core.js +2 -2
- data/app/packs/entrypoints/decidim_sw.js +1 -0
- data/app/packs/src/decidim/account_form.js +68 -18
- data/app/packs/src/decidim/autocomplete.js +298 -0
- data/app/packs/src/decidim/data_consent/consent_manager.js +136 -0
- data/app/packs/src/decidim/data_consent/consent_manager.test.js +280 -0
- data/app/packs/src/decidim/data_consent/index.js +103 -0
- data/app/packs/src/decidim/datalist_select.js +36 -0
- data/app/packs/src/decidim/direct_uploads/upload_field.js +117 -0
- data/app/packs/src/decidim/direct_uploads/upload_modal.js +264 -0
- data/app/packs/src/decidim/direct_uploads/upload_utility.js +49 -0
- data/app/packs/src/decidim/direct_uploads/uploader.js +89 -0
- data/app/packs/src/decidim/external_domain_warning.js +1 -1
- data/app/packs/src/decidim/external_link.js +14 -3
- data/app/packs/src/decidim/external_link.test.js +64 -0
- data/app/packs/src/decidim/geocoding.js +10 -35
- data/app/packs/src/decidim/identity_selector_dialog.js +1 -1
- data/app/packs/src/decidim/impersonation.js +3 -3
- data/app/packs/src/decidim/input_character_counter.js +215 -22
- data/app/packs/src/decidim/input_multiple_mentions.js +87 -187
- data/app/packs/src/decidim/map/factory.js +3 -1
- data/app/packs/src/decidim/map/icon.js +2 -1
- data/app/packs/src/decidim/map/legacy.js +2 -2
- data/app/packs/src/decidim/map/svg-icon.js +248 -0
- data/app/packs/src/decidim/map.js +2 -2
- data/app/packs/src/decidim/security/selfxss_warning.js +5 -1
- data/app/packs/src/decidim/session_timeouter.js +15 -15
- data/app/packs/src/decidim/sw/a2hs.js +37 -0
- data/app/packs/src/decidim/sw/index.js +3 -0
- data/app/packs/src/decidim/sw/loader.js +18 -0
- data/app/packs/src/decidim/sw/push-permissions.js +87 -0
- data/app/packs/src/decidim/sw/sw.js +80 -0
- data/app/packs/src/decidim/vizzs/areachart.js +33 -28
- data/app/packs/src/decidim/vizzs/{metrics.js → index.js} +0 -0
- data/app/packs/src/decidim/vizzs/linechart.js +23 -18
- data/app/packs/src/decidim/vizzs/rowchart.js +15 -11
- data/app/packs/stylesheets/decidim/email.scss +66 -0
- data/app/packs/stylesheets/decidim/layouts/_user.scss +8 -0
- data/app/packs/stylesheets/decidim/modules/_autocomplete.scss +99 -0
- data/app/packs/stylesheets/decidim/modules/_cards.scss +2 -0
- data/app/packs/stylesheets/decidim/modules/_comments.scss +2 -0
- data/app/packs/stylesheets/decidim/modules/_data-consent.scss +115 -0
- data/app/packs/stylesheets/decidim/modules/_footer.scss +4 -0
- data/app/packs/stylesheets/decidim/modules/_forms.scss +5 -0
- data/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss +29 -2
- data/app/packs/stylesheets/decidim/modules/_modules.scss +3 -1
- data/app/packs/stylesheets/decidim/modules/_reveal.scss +15 -0
- data/app/packs/stylesheets/decidim/modules/_upload_modal.scss +143 -0
- data/app/packs/stylesheets/decidim/utils/_fontface.scss +3 -0
- data/app/permissions/decidim/permissions.rb +6 -6
- data/app/presenters/decidim/admin_log/area_type_presenter.rb +34 -0
- data/app/presenters/decidim/admin_log/attachment_collection_presenter.rb +35 -0
- data/app/presenters/decidim/admin_log/attachment_presenter.rb +27 -0
- data/app/presenters/decidim/admin_log/category_presenter.rb +36 -0
- data/app/presenters/decidim/admin_log/component_presenter.rb +35 -3
- data/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb +33 -0
- data/app/presenters/decidim/admin_log/organization_presenter.rb +9 -4
- data/app/presenters/decidim/admin_log/scope_type_presenter.rb +34 -0
- data/app/presenters/decidim/home_stats_presenter.rb +4 -2
- data/app/presenters/decidim/log/base_presenter.rb +1 -1
- data/app/presenters/decidim/menu_item_presenter.rb +1 -1
- data/app/presenters/decidim/metric_charts_presenter.rb +7 -1
- data/app/presenters/decidim/nil_presenter.rb +3 -1
- data/app/presenters/decidim/notification_to_mailer_presenter.rb +39 -0
- data/app/presenters/decidim/notifications_digest_presenter.rb +42 -0
- data/app/presenters/decidim/official_author_presenter.rb +4 -0
- data/app/presenters/decidim/organization_presenter.rb +22 -0
- data/app/presenters/decidim/push_notification_presenter.rb +25 -0
- data/app/presenters/decidim/stats_presenter.rb +1 -1
- data/app/presenters/decidim/user_presenter.rb +4 -1
- data/app/presenters/decidim/validation_errors_presenter.rb +1 -1
- data/app/queries/decidim/messaging/user_conversations.rb +1 -1
- data/app/queries/decidim/metric_manage.rb +1 -1
- data/app/queries/decidim/own_activities.rb +11 -0
- data/app/queries/decidim/participatory_processes_with_user_role.rb +1 -1
- data/app/{services/decidim/activity_search.rb → queries/decidim/public_activities.rb} +35 -77
- data/app/queries/decidim/public_components.rb +1 -1
- data/app/queries/decidim/similar_emendations.rb +1 -1
- data/app/queries/decidim/stats_users_count.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_user_groups.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_users.rb +1 -1
- data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/invited_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/manageable_user_groups.rb +1 -1
- data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
- data/app/scrubbers/decidim/admin_input_scrubber.rb +25 -0
- data/app/scrubbers/decidim/user_input_scrubber.rb +3 -5
- data/app/services/decidim/{data_portability_exporter.rb → download_your_data_exporter.rb} +6 -6
- data/app/services/decidim/email_notification_generator.rb +2 -2
- data/app/services/decidim/engine_resolver.rb +66 -0
- data/app/services/decidim/events_manager.rb +1 -1
- data/app/services/decidim/iframe_disabler.rb +30 -0
- data/app/services/decidim/notification_generator_for_recipient.rb +1 -1
- data/app/services/decidim/notifications_digest_sending_decider.rb +22 -0
- data/app/services/decidim/notifications_subscriptions_persistor.rb +37 -0
- data/app/services/decidim/open_data_exporter.rb +1 -1
- data/app/services/decidim/resource_search.rb +17 -164
- data/app/services/decidim/send_push_notification.rb +61 -0
- data/app/services/decidim/traceability.rb +1 -1
- data/app/uploaders/decidim/application_uploader.rb +2 -12
- data/app/uploaders/decidim/cw/attachment_uploader.rb +1 -1
- data/app/uploaders/decidim/cw/{data_portability_uploader.rb → download_your_data_uploader.rb} +3 -3
- data/app/uploaders/decidim/cw/image_uploader.rb +2 -2
- data/app/uploaders/decidim/organization_favicon_uploader.rb +3 -2
- data/app/validators/passthru_validator.rb +29 -21
- data/app/validators/password_validator.rb +25 -4
- data/app/validators/uploader_image_dimensions_validator.rb +1 -1
- data/app/views/decidim/account/_account_notification.js.erb +20 -0
- data/app/views/decidim/account/_password_fields.html.erb +2 -2
- data/app/views/decidim/account/cancel_email_change.js.erb +6 -0
- data/app/views/decidim/account/resend_confirmation_instructions.erb +1 -0
- data/app/views/decidim/account/show.html.erb +19 -6
- data/app/views/decidim/application/{_attachments.html.erb → _attachments.erb} +2 -2
- data/app/views/decidim/application/_collection.html.erb +1 -1
- data/app/views/decidim/application/{_document.html.erb → _document.erb} +0 -0
- data/app/views/decidim/application/{_documents.html.erb → _documents.erb} +2 -2
- data/app/views/decidim/application/{_photos.html.erb → _photos.erb} +0 -0
- data/app/views/decidim/devise/confirmations/new.html.erb +1 -1
- data/app/views/decidim/devise/invitations/edit.html.erb +3 -4
- data/app/views/decidim/devise/omniauth_registrations/new.html.erb +3 -3
- data/app/views/decidim/devise/passwords/edit.html.erb +7 -5
- data/app/views/decidim/devise/passwords/new.html.erb +1 -1
- data/app/views/decidim/devise/registrations/new.html.erb +5 -5
- data/app/views/decidim/devise/sessions/new.html.erb +2 -2
- data/app/views/decidim/{data_portability → download_your_data}/export.html.erb +0 -0
- data/app/views/decidim/{data_portability → download_your_data}/show.html.erb +2 -2
- data/app/views/decidim/export_mailer/download_your_data_export.html.erb +7 -0
- data/app/views/decidim/last_activities/index.html.erb +1 -1
- data/app/views/decidim/manifests/show.json.erb +31 -0
- data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb +5 -3
- data/app/views/decidim/messaging/conversations/_reply.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/_start.html.erb +1 -3
- data/app/views/decidim/messaging/conversations/create.js.erb +1 -0
- data/app/views/decidim/notifications_digest_mailer/_email_content.html.erb +11 -0
- data/app/views/decidim/notifications_digest_mailer/digest_mail.erb +27 -0
- data/app/views/decidim/notifications_settings/show.html.erb +67 -44
- data/app/views/decidim/offline/show.html.erb +9 -0
- data/app/views/decidim/pages/_standalone.html.erb +1 -1
- data/app/views/decidim/pages/_tabbed.html.erb +1 -1
- data/app/views/decidim/reported_mailer/hide.html.erb +1 -1
- data/app/views/decidim/reported_mailer/report.html.erb +1 -1
- data/app/views/decidim/scopes/picker.html.erb +1 -1
- data/app/views/decidim/searches/_filters.html.erb +2 -2
- data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb +3 -3
- data/app/views/decidim/user_interests/show.html.erb +11 -13
- data/app/views/decidim/user_report_mailer/notify.html.erb +10 -3
- data/app/views/devise/mailer/confirmation_instructions.html.erb +3 -1
- data/app/views/layouts/decidim/_application.html.erb +6 -3
- data/app/views/layouts/decidim/_data_consent_warning.html.erb +8 -0
- data/app/views/layouts/decidim/_decidim_javascript.html.erb +12 -0
- data/app/views/layouts/decidim/_head.html.erb +4 -2
- data/app/views/layouts/decidim/_js_configuration.html.erb +5 -1
- data/app/views/layouts/decidim/_main_footer.html.erb +1 -0
- data/app/views/layouts/decidim/_offline_banner.html.erb +11 -0
- data/app/views/layouts/decidim/widget.html.erb +2 -2
- data/config/assets.rb +1 -0
- data/config/locales/ar.yml +48 -45
- data/config/locales/bg.yml +15 -39
- data/config/locales/ca.yml +191 -45
- data/config/locales/cs.yml +192 -44
- data/config/locales/de.yml +227 -44
- data/config/locales/el.yml +15 -39
- data/config/locales/en.yml +187 -41
- data/config/locales/eo.yml +4 -6
- data/config/locales/es-MX.yml +190 -44
- data/config/locales/es-PY.yml +190 -44
- data/config/locales/es.yml +190 -44
- data/config/locales/eu.yml +16 -46
- data/config/locales/fi-plain.yml +188 -42
- data/config/locales/fi.yml +188 -42
- data/config/locales/fr-CA.yml +189 -43
- data/config/locales/fr.yml +196 -50
- data/config/locales/ga-IE.yml +5 -9
- data/config/locales/gl.yml +47 -39
- data/config/locales/hu.yml +312 -41
- data/config/locales/id-ID.yml +15 -38
- data/config/locales/is-IS.yml +6 -15
- data/config/locales/it.yml +23 -48
- data/config/locales/ja.yml +189 -44
- data/config/locales/lb.yml +16 -41
- data/config/locales/lt.yml +1950 -0
- data/config/locales/lv.yml +15 -37
- data/config/locales/nl.yml +41 -43
- data/config/locales/no.yml +25 -45
- data/config/locales/pl.yml +113 -41
- data/config/locales/pt-BR.yml +17 -41
- data/config/locales/pt.yml +16 -41
- data/config/locales/ro-RO.yml +20 -45
- data/config/locales/ru.yml +15 -27
- data/config/locales/sk.yml +15 -39
- data/config/locales/sl.yml +1 -0
- data/config/locales/sr-CS.yml +1 -0
- data/config/locales/sv.yml +73 -43
- data/config/locales/tr-TR.yml +15 -38
- data/config/locales/uk.yml +15 -26
- data/config/locales/zh-CN.yml +17 -39
- data/config/routes.rb +37 -4
- data/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb +1 -0
- data/db/migrate/20181030090144_destroy_deleted_users_follows.rb +1 -0
- data/db/migrate/20190412131728_fix_user_names.rb +4 -4
- data/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb +22 -0
- data/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb +14 -0
- data/db/migrate/20211208155453_create_decidim_reminders.rb +11 -0
- data/db/migrate/20211209121025_create_decidim_reminder_records.rb +11 -0
- data/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb +10 -0
- data/db/migrate/20220118121921_change_required_description_categories.rb +7 -0
- data/db/migrate/20220127113419_add_notification_settings_to_users.rb +7 -0
- data/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb +7 -0
- data/db/migrate/20220215172439_add_digest_sent_at_to_users.rb +7 -0
- data/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb +7 -0
- data/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb +15 -0
- data/db/migrate/20220518094535_add_previous_passwords_to_users.rb +20 -0
- data/db/migrate/20220524195530_create_decidim_short_links.rb +23 -0
- data/db/seeds.rb +17 -18
- data/lib/decidim/acts_as_tree.rb +47 -0
- data/lib/decidim/api/input_sorts/component_input_sort.rb +2 -1
- data/lib/decidim/api/interfaces/authorable_interface.rb +6 -5
- data/lib/decidim/asset_router.rb +80 -0
- data/lib/decidim/attachment_attributes.rb +8 -8
- data/lib/decidim/attribute_object/form.rb +174 -0
- data/lib/decidim/attribute_object/model.rb +148 -0
- data/lib/decidim/attribute_object/nested_validator.rb +22 -0
- data/lib/decidim/attribute_object/type_map.rb +14 -0
- data/lib/decidim/attribute_object/type_resolver.rb +91 -0
- data/lib/decidim/attribute_object.rb +26 -0
- data/lib/decidim/attributes/array.rb +62 -0
- data/lib/decidim/attributes/blob.rb +20 -0
- data/lib/decidim/attributes/clean_string.rb +12 -6
- data/lib/decidim/attributes/hash.rb +36 -0
- data/lib/decidim/attributes/integer.rb +17 -0
- data/lib/decidim/attributes/localized_date.rb +9 -7
- data/lib/decidim/attributes/model.rb +32 -0
- data/lib/decidim/attributes/object.rb +28 -0
- data/lib/decidim/attributes/symbol.rb +23 -0
- data/lib/decidim/attributes/time_with_zone.rb +9 -7
- data/lib/decidim/attributes.rb +29 -0
- data/lib/decidim/authorable.rb +21 -6
- data/lib/decidim/authorization_form_builder.rb +9 -11
- data/lib/decidim/carrier_wave_migrator_service.rb +15 -15
- data/lib/decidim/coauthorable.rb +22 -4
- data/lib/decidim/command.rb +44 -0
- data/lib/decidim/common_passwords.rb +1 -1
- data/lib/decidim/component_manifest.rb +5 -5
- data/lib/decidim/component_validator.rb +2 -2
- data/lib/decidim/content_block_manifest.rb +1 -1
- data/lib/decidim/content_parsers/hashtag_parser.rb +2 -2
- data/lib/decidim/content_parsers/resource_parser.rb +1 -1
- data/lib/decidim/content_parsers/user_group_parser.rb +1 -1
- data/lib/decidim/content_parsers/user_parser.rb +4 -4
- data/lib/decidim/content_renderers/hashtag_renderer.rb +1 -1
- data/lib/decidim/content_renderers/link_renderer.rb +2 -2
- data/lib/decidim/content_renderers/user_group_renderer.rb +1 -1
- data/lib/decidim/content_renderers/user_renderer.rb +1 -1
- data/lib/decidim/controller_helpers.rb +41 -0
- data/lib/decidim/core/engine.rb +30 -19
- data/lib/decidim/core/test/factories.rb +48 -8
- data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +16 -4
- data/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb +15 -2
- data/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +203 -0
- data/lib/decidim/core/test/shared_examples/localised_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/logo_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/map_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +0 -6
- data/lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb +60 -0
- data/lib/decidim/core/test/shared_examples/resource_search_examples.rb +120 -40
- data/lib/decidim/core/test/shared_examples/resourceable.rb +0 -6
- data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb +1 -1
- data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +40 -0
- data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
- data/lib/decidim/core/test.rb +2 -0
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +149 -16
- data/lib/decidim/dependency_resolver.rb +272 -0
- data/lib/decidim/{data_portability.rb → download_your_data.rb} +3 -3
- data/lib/decidim/{data_portability_serializers/data_portability_conversation_serializer.rb → download_your_data_serializers/download_your_data_conversation_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_follow_serializer.rb → download_your_data_serializers/download_your_data_follow_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_identity_serializer.rb → download_your_data_serializers/download_your_data_identity_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_notification_serializer.rb → download_your_data_serializers/download_your_data_notification_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_participatory_space_private_user_serializer.rb → download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_report_serializer.rb → download_your_data_serializers/download_your_data_report_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_user_group_serializer.rb → download_your_data_serializers/download_your_data_user_group_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_user_serializer.rb → download_your_data_serializers/download_your_data_user_serializer.rb} +3 -3
- data/lib/decidim/download_your_data_serializers.rb +23 -0
- data/lib/decidim/engine_router.rb +7 -1
- data/lib/decidim/env.rb +56 -0
- data/lib/decidim/event_recorder.rb +25 -0
- data/lib/decidim/events/base_event.rb +10 -14
- data/lib/decidim/events/simple_event.rb +13 -4
- data/lib/decidim/exporters/export_data.rb +1 -1
- data/lib/decidim/exporters/export_manifest.rb +2 -1
- data/lib/decidim/file_validator_humanizer.rb +24 -1
- data/lib/decidim/filterable_resource.rb +55 -0
- data/lib/decidim/fingerprint_calculator.rb +2 -4
- data/lib/decidim/form_builder.rb +158 -130
- data/lib/decidim/gamification/badge.rb +2 -3
- data/lib/decidim/gamification/badge_scorer.rb +1 -0
- data/lib/decidim/has_area.rb +27 -0
- data/lib/decidim/has_attachments.rb +2 -2
- data/lib/decidim/has_category.rb +36 -0
- data/lib/decidim/has_resource_permission.rb +0 -2
- data/lib/decidim/importers/import_manifest.rb +3 -21
- data/lib/decidim/jsonb_attributes.rb +6 -4
- data/lib/decidim/manifest_messages.rb +23 -0
- data/lib/decidim/map/autocomplete.rb +6 -4
- data/lib/decidim/map/frontend.rb +2 -2
- data/lib/decidim/map/provider/dynamic_map/here.rb +46 -1
- data/lib/decidim/map/provider/geocoding/here.rb +5 -5
- data/lib/decidim/map/provider/here.rb +3 -0
- data/lib/decidim/map/provider/osm.rb +3 -0
- data/lib/decidim/map.rb +4 -4
- data/lib/decidim/menu.rb +1 -1
- data/lib/decidim/metric_manifest.rb +2 -2
- data/lib/decidim/nicknamizable.rb +1 -1
- data/lib/decidim/notification_setting_manifest.rb +19 -0
- data/lib/decidim/organization_settings.rb +8 -7
- data/lib/decidim/participatory_space_context_manifest.rb +2 -2
- data/lib/decidim/participatory_space_manifest.rb +2 -2
- data/lib/decidim/processes_file_locally.rb +31 -0
- data/lib/decidim/query.rb +84 -0
- data/lib/decidim/record_encryptor.rb +29 -8
- data/lib/decidim/reminder_manifest.rb +75 -0
- data/lib/decidim/reminder_registry.rb +67 -0
- data/lib/decidim/resource_manifest.rb +1 -1
- data/lib/decidim/resourceable.rb +11 -0
- data/lib/decidim/scopable.rb +15 -0
- data/lib/decidim/settings_manifest.rb +4 -4
- data/lib/decidim/spring.rb +16 -0
- data/lib/decidim/translatable_attributes.rb +20 -9
- data/lib/decidim/url_option_resolver.rb +50 -0
- data/lib/decidim/view_hooks.rb +1 -1
- data/lib/decidim/view_model.rb +5 -1
- data/lib/decidim/webpacker/thread_safe_compiler.rb +30 -0
- data/lib/decidim/webpacker/webpack/custom.js +15 -3
- data/lib/decidim/webpacker/webpacker.yml +1 -1
- data/lib/decidim/webpacker.rb +2 -0
- data/lib/devise/models/decidim_validatable.rb +1 -1
- data/lib/tasks/decidim_active_storage_migration_tasks.rake +1 -3
- data/lib/tasks/{decidim_data_portability_tasks.rake → decidim_download_your_data_tasks.rake} +9 -9
- data/lib/tasks/decidim_mailers_tasks.rake +23 -0
- data/lib/tasks/decidim_metrics_tasks.rake +1 -1
- data/lib/tasks/decidim_pwa_tasks.rake +18 -0
- data/lib/tasks/decidim_reminders_tasks.rake +17 -0
- data/lib/tasks/decidim_tasks.rake +6 -1
- data/lib/tasks/decidim_webpacker_tasks.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +51 -0
- metadata +190 -85
- data/app/controllers/decidim/cookie_policy_controller.rb +0 -24
- data/app/helpers/decidim/cookies_helper.rb +0 -11
- data/app/packs/src/decidim/vizzs/renders.js +0 -9
- data/app/packs/src/decidim/vizzs.js +0 -1
- data/app/packs/stylesheets/decidim/modules/_cookie-bar.scss +0 -26
- data/app/services/decidim/home_activity_search.rb +0 -80
- data/app/services/decidim/participatory_space_search.rb +0 -54
- data/app/views/decidim/cookie_policy/accept.js.erb +0 -3
- data/app/views/decidim/devise/registrations/edit.html.erb +0 -41
- data/app/views/decidim/export_mailer/data_portability_export.html.erb +0 -7
- data/app/views/layouts/decidim/_cookie_warning.html.erb +0 -8
- data/lib/decidim/data_portability_serializers.rb +0 -23
- data/lib/decidim/middleware/rails_cookies.rb +0 -23
data/config/locales/tr-TR.yml
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
---
|
1
2
|
tr:
|
2
3
|
activemodel:
|
3
4
|
attributes:
|
@@ -62,7 +63,6 @@ tr:
|
|
62
63
|
'true': 'Evet'
|
63
64
|
carrierwave:
|
64
65
|
errors:
|
65
|
-
image_too_big: Görüntü çok büyük
|
66
66
|
not_inside_organization: Dosya herhangi bir kuruluşa eklenmemiş
|
67
67
|
date:
|
68
68
|
formats:
|
@@ -78,9 +78,6 @@ tr:
|
|
78
78
|
skip_button: Ana içeriğe geç
|
79
79
|
account:
|
80
80
|
blocked: Bu hesap, Şartlar ve Koşullar ihlali nedeniyle engellendi
|
81
|
-
data_portability_export:
|
82
|
-
file_no_exists: Dosya bulunmuyor
|
83
|
-
notice: Verilerinizin indirilmesi şu anda devam ediyor. Tamamlandığında bir e-posta alacaksınız.
|
84
81
|
delete:
|
85
82
|
confirm:
|
86
83
|
close: Pencereyi kapat
|
@@ -91,6 +88,9 @@ tr:
|
|
91
88
|
destroy:
|
92
89
|
error: Hesabınız silinirken bir hata oluştu.
|
93
90
|
success: Hesabınız başarıyla silindi.
|
91
|
+
download_your_data_export:
|
92
|
+
file_no_exists: Dosya bulunmuyor
|
93
|
+
notice: Verilerinizin indirilmesi şu anda devam ediyor. Tamamlandığında bir e-posta alacaksınız.
|
94
94
|
show:
|
95
95
|
change_password: Şifre değiştir
|
96
96
|
update_account: Hesabı güncelle
|
@@ -360,8 +360,8 @@ tr:
|
|
360
360
|
amendments_enabled: Değişiklikler etkinleştirildi
|
361
361
|
comments_enabled: Yorumlar etkin
|
362
362
|
comments_max_length: Maksimum yorum uzunluğu
|
363
|
-
|
364
|
-
|
363
|
+
dummy_global_attribute1: Sahet Özellik 1
|
364
|
+
dummy_global_attribute2: Sahte Özellik 2
|
365
365
|
dummy_global_translatable_text: Sahte Çevrilebilir Metin
|
366
366
|
enable_pads_creation: Altlık oluşturmayı etkinleştirin
|
367
367
|
resources_permissions_enabled: Kaynak izinleri etkin
|
@@ -373,8 +373,8 @@ tr:
|
|
373
373
|
amendment_reaction_enabled: Değişiklik tepkisi etkinleştirildi
|
374
374
|
amendments_visibility: Değişiklik görünürlüğü
|
375
375
|
comments_blocked: Yorumlar engellendi
|
376
|
-
|
377
|
-
|
376
|
+
dummy_step_attribute1: Sahte Adım Niteliği 1
|
377
|
+
dummy_step_attribute2: Sahte Adım Niteliği 2
|
378
378
|
dummy_step_translatable_text: Sahte Çevrilebilir Metin
|
379
379
|
contact: İletişim
|
380
380
|
content_blocks:
|
@@ -418,12 +418,6 @@ tr:
|
|
418
418
|
actions:
|
419
419
|
login_before_access: Lütfen, erişmeden önce hesabınızla giriş yapın
|
420
420
|
unauthorized: Bu eylemi gerçekleştirmek için yetkiniz yok
|
421
|
-
data_portability:
|
422
|
-
export:
|
423
|
-
ready: Hazır
|
424
|
-
show:
|
425
|
-
download_data: Verileri indir
|
426
|
-
request_data: Veri talep et
|
427
421
|
datepicker:
|
428
422
|
help_text: 'Beklenen format: %{datepicker_format}'
|
429
423
|
devise:
|
@@ -442,7 +436,6 @@ tr:
|
|
442
436
|
newsletter: Ara sıra ilgili bilgileri içeren bir haber bülteni alın
|
443
437
|
newsletter_title: İletişim izni
|
444
438
|
nickname_help: Takma adınız %{organization}. Yalnızca harf, rakam, "-" ve "_" içerebilir.
|
445
|
-
password_help: "Asgari %{minimun_characters} karakter, çok yaygın olmamalı (örnek: 123456) ve takma adınızdan ve eposta adresinizden farklı olmalıdır."
|
446
439
|
sign_in: Oturum aç
|
447
440
|
sign_up: kaydol
|
448
441
|
sign_up_as:
|
@@ -493,6 +486,12 @@ tr:
|
|
493
486
|
this_application_will_not_be_able_to: 'Bu uygulama mümkün olmayacaktır:'
|
494
487
|
update_profile: profilinizi güncelleyin
|
495
488
|
wants_to_use_your_account_html: "<strong>%{application_name}</strong> hesabınızı kullanmak istiyor"
|
489
|
+
download_your_data:
|
490
|
+
export:
|
491
|
+
ready: Hazır
|
492
|
+
show:
|
493
|
+
download_data: Verileri indir
|
494
|
+
request_data: Veri talep et
|
496
495
|
endorsable:
|
497
496
|
endorsements: Cirolar
|
498
497
|
endorsements_count: Onay sayısı
|
@@ -653,7 +652,7 @@ tr:
|
|
653
652
|
email_subject: "%{nickname} profilini güncelledi"
|
654
653
|
notification_title: <a href="%{resource_path}">profil sayfası</a> arasında %{name} (%{nickname} izlediğiniz), güncellendi.
|
655
654
|
export_mailer:
|
656
|
-
|
655
|
+
download_your_data_export:
|
657
656
|
download: İndir
|
658
657
|
export:
|
659
658
|
ready: Lütfen dışa aktarımınızın sıkıştırılmış bir sürümünü ekte bulun.
|
@@ -690,7 +689,6 @@ tr:
|
|
690
689
|
button: Takibi bırak
|
691
690
|
error: Bu kaynağı takip etmekten bir hata oluştu.
|
692
691
|
forms:
|
693
|
-
current_file: Mevcut dosya
|
694
692
|
current_image: Geçerli resim
|
695
693
|
default_image: Varsayılan görüntü
|
696
694
|
errors:
|
@@ -702,7 +700,6 @@ tr:
|
|
702
700
|
file:
|
703
701
|
explanation: 'Dosya kılavuzu:'
|
704
702
|
message_1: Bir resim veya bir belge olmalı.
|
705
|
-
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
|
706
703
|
image:
|
707
704
|
explanation: 'Dosya kılavuzu:'
|
708
705
|
message_1: Tercihen herhangi bir metin içermeyen yatay bir resim.
|
@@ -710,7 +707,6 @@ tr:
|
|
710
707
|
file_validation:
|
711
708
|
allowed_file_extensions: 'İzin verilen dosya uzantıları: %{extensions}'
|
712
709
|
max_file_size: 'Maksimum dosya boyutu: %{megabytes} MB'
|
713
|
-
remove_this_file: Bu dosyayı kaldır
|
714
710
|
gamification:
|
715
711
|
all_badges_link: Tüm mevcut rozetleri görün.
|
716
712
|
badges:
|
@@ -823,7 +819,6 @@ tr:
|
|
823
819
|
no_user_groups: Henüz herhangi bir gruba ait değil.
|
824
820
|
roles:
|
825
821
|
admin: Yönetici
|
826
|
-
creator: Kurucu
|
827
822
|
member: Üye
|
828
823
|
update:
|
829
824
|
error: Grup güncellemede bir hata oluştu
|
@@ -1016,13 +1011,11 @@ tr:
|
|
1016
1011
|
show:
|
1017
1012
|
allow_public_contact: Takip etmesem bile herkesin bana doğrudan mesaj göndermesine izin ver.
|
1018
1013
|
direct_messages: Herkesten doğrudan mesaj alın
|
1019
|
-
email_on_notification: Her bildirim aldığımda bir e-posta almak istiyorum.
|
1020
1014
|
everything_followed: Takip ettiğim her şey
|
1021
1015
|
newsletter_notifications: Bülten almak istiyorum
|
1022
1016
|
newsletters: Bültenler
|
1023
1017
|
own_activity: Birisinin teklifime yorum yapması veya benden bahsetmesi gibi kendi faaliyetim
|
1024
1018
|
receive_notifications_about: Hakkında bildirim almak istiyorum
|
1025
|
-
send_notifications_by_email: Bildirimleri e-posta ile gönder
|
1026
1019
|
update_notifications_settings: Değişiklikleri Kaydet
|
1027
1020
|
update:
|
1028
1021
|
error: Bildirim ayarlarınız güncellenirken bir hata oluştu.
|
@@ -1080,7 +1073,6 @@ tr:
|
|
1080
1073
|
agreement: Bu koşulları kabul ediyorum
|
1081
1074
|
legend: Kullanım şartlarını ve koşullarını kabul et
|
1082
1075
|
refuse:
|
1083
|
-
modal_body: Eğer kabul ederseniz, platformu kullanmak mümkün olmayacaktır şunları yapabilirsiniz <a href="%{data_portability_path}">verileri indirme</a> ve / veya <a href="%{delete_path}">Hesabınızı silmek</a>.
|
1084
1076
|
modal_btn_continue: Şartları kabul et ve devam et
|
1085
1077
|
modal_btn_exit: Daha sonra inceleyeceğim
|
1086
1078
|
modal_button: Şartları reddet
|
@@ -1365,7 +1357,6 @@ tr:
|
|
1365
1357
|
invitations:
|
1366
1358
|
edit:
|
1367
1359
|
header: Hesabınızı oluşturmayı bitirin
|
1368
|
-
nickname_help: Benzersiz tanımlayıcınız %{organization}.
|
1369
1360
|
submit_button: Kayıt etmek
|
1370
1361
|
subtitle: Davetiyeyi kabul ederseniz, lütfen takma adınızı ve şifrenizi ayarlayın.
|
1371
1362
|
invitation_removed: Davetiniz kaldırıldı.
|
@@ -1432,7 +1423,6 @@ tr:
|
|
1432
1423
|
passwords:
|
1433
1424
|
edit:
|
1434
1425
|
change_my_password: Şifremi Değiştir
|
1435
|
-
change_your_password: Şifreni değiştir
|
1436
1426
|
confirm_new_password: Yeni şifreyi onayla
|
1437
1427
|
new_password: Yeni Şifre
|
1438
1428
|
password_help: "Asgari %{minimun_characters} karakter, çok yaygın olmamalı (örnek: 123456) ve takma adınızdan ve eposta adresinizden farklı olmalıdır."
|
@@ -1446,15 +1436,6 @@ tr:
|
|
1446
1436
|
updated_not_active: Şifreniz başarıyla değiştirildi.
|
1447
1437
|
registrations:
|
1448
1438
|
destroyed: Hoşçakal! Hesabınız başarıyla iptal edildi. Kısa süre sonra tekrar görmeyi umuyoruz.
|
1449
|
-
edit:
|
1450
|
-
are_you_sure: Emin misiniz?
|
1451
|
-
cancel_my_account: Hesabımı iptal et
|
1452
|
-
currently_waiting_confirmation_for_email: 'Şu an için bekleme onayı: %{email}'
|
1453
|
-
leave_blank_if_you_don_t_want_to_change_it: değiştirmek istemiyorsanız boş bırakın
|
1454
|
-
title: '%{resource}düzenle'
|
1455
|
-
unhappy: Mutsuz?
|
1456
|
-
update: Güncelleştirme
|
1457
|
-
we_need_your_current_password_to_confirm_your_changes: değişikliklerinizi onaylamak için mevcut şifrenize ihtiyacımız var
|
1458
1439
|
new:
|
1459
1440
|
sign_up: kaydol
|
1460
1441
|
signed_up: Hoşgeldiniz! Başarıyla kaydoldunuz.
|
@@ -1519,10 +1500,6 @@ tr:
|
|
1519
1500
|
timestamp_error_message: Üzgünüm, bu çok hızlıydı! Lütfen yeniden gönderin.
|
1520
1501
|
layouts:
|
1521
1502
|
decidim:
|
1522
|
-
cookie_warning:
|
1523
|
-
description_html: Bu sitede çerezler kullanılıyor. Siteye göz atmaya devam ederek, çerezleri kullanmamızı kabul edersiniz. Hakkında daha fazla bilgi edinin %{link}.
|
1524
|
-
link_label: İşte
|
1525
|
-
ok: katılıyorum
|
1526
1503
|
edit_link:
|
1527
1504
|
edit: Düzenle
|
1528
1505
|
footer:
|
data/config/locales/uk.yml
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
---
|
1
2
|
uk:
|
2
3
|
activemodel:
|
3
4
|
attributes:
|
@@ -35,18 +36,12 @@ uk:
|
|
35
36
|
booleans:
|
36
37
|
'false': 'Ні'
|
37
38
|
'true': 'Так'
|
38
|
-
carrierwave:
|
39
|
-
errors:
|
40
|
-
image_too_big: Зображення завелике
|
41
39
|
date:
|
42
40
|
formats:
|
43
41
|
decidim_short: "%d.%m.%Y"
|
44
42
|
decidim_with_month_name: "%d %B %Y"
|
45
43
|
decidim:
|
46
44
|
account:
|
47
|
-
data_portability_export:
|
48
|
-
file_no_exists: Файл не існує
|
49
|
-
notice: Зараз відбувається збереження у вигляді файлу. Ви отримаєте електронного листа після його завершення.
|
50
45
|
delete:
|
51
46
|
confirm:
|
52
47
|
close: Закрити вікно
|
@@ -57,6 +52,9 @@ uk:
|
|
57
52
|
destroy:
|
58
53
|
error: При спробі видалити ваш обліковий запис сталася помилка.
|
59
54
|
success: Ваш обліковий запис успішно видалено.
|
55
|
+
download_your_data_export:
|
56
|
+
file_no_exists: Файл не існує
|
57
|
+
notice: Зараз відбувається збереження у вигляді файлу. Ви отримаєте електронного листа після його завершення.
|
60
58
|
show:
|
61
59
|
change_password: Змінити пароль
|
62
60
|
update_account: Оновити обліковий запис
|
@@ -185,13 +183,13 @@ uk:
|
|
185
183
|
settings:
|
186
184
|
global:
|
187
185
|
comments_enabled: Коментарі увімкнено
|
188
|
-
|
189
|
-
|
186
|
+
dummy_global_attribute1: Приклад властивості 1
|
187
|
+
dummy_global_attribute2: Приклад властивості 2
|
190
188
|
resources_permissions_enabled: Дозволи ресурсів увімкнуто
|
191
189
|
step:
|
192
190
|
comments_blocked: Коментарі вимкнено
|
193
|
-
|
194
|
-
|
191
|
+
dummy_step_attribute1: Приклад 1 властивості кроку
|
192
|
+
dummy_step_attribute2: Приклад 2 властивості кроку
|
195
193
|
contact: Зв'язатися
|
196
194
|
content_blocks:
|
197
195
|
footer_sub_hero:
|
@@ -209,12 +207,6 @@ uk:
|
|
209
207
|
core:
|
210
208
|
actions:
|
211
209
|
unauthorized: Ви не маєте прав на виконання цієї дії
|
212
|
-
data_portability:
|
213
|
-
export:
|
214
|
-
ready: Готово
|
215
|
-
show:
|
216
|
-
download_data: Завантажити дані
|
217
|
-
request_data: Подати запит на дані
|
218
210
|
devise:
|
219
211
|
omniauth_registrations:
|
220
212
|
create:
|
@@ -267,6 +259,12 @@ uk:
|
|
267
259
|
this_application_will_not_be_able_to: 'Цей додаток не зможе:'
|
268
260
|
update_profile: Оновлювати ваш профіль
|
269
261
|
wants_to_use_your_account_html: "<strong>%{application_name}</strong> бажає використовувати ваш обліковий запис"
|
262
|
+
download_your_data:
|
263
|
+
export:
|
264
|
+
ready: Готово
|
265
|
+
show:
|
266
|
+
download_data: Завантажити дані
|
267
|
+
request_data: Подати запит на дані
|
270
268
|
endorsable:
|
271
269
|
endorsements: Проявів підтримки
|
272
270
|
errors:
|
@@ -304,7 +302,7 @@ uk:
|
|
304
302
|
email_subject: "%{nickname} оновив свій профіль"
|
305
303
|
notification_title: Сторінка <a href="%{resource_path}">профілю</a> учасника %{name} (%{nickname}), за яким ви стежите, була оновлена.
|
306
304
|
export_mailer:
|
307
|
-
|
305
|
+
download_your_data_export:
|
308
306
|
download: Завантажити
|
309
307
|
export:
|
310
308
|
ready: Нижче додається стиснута в архів версія вашого збереженого файлу.
|
@@ -337,12 +335,10 @@ uk:
|
|
337
335
|
button: Припинити стежити
|
338
336
|
error: При спробі припинити стежити за цим ресурсом сталася помилка.
|
339
337
|
forms:
|
340
|
-
current_file: Поточний файл
|
341
338
|
current_image: Поточне зображення
|
342
339
|
default_image: Зображення за замовчуванням
|
343
340
|
errors:
|
344
341
|
error: У цьому полі є помилка.
|
345
|
-
remove_this_file: Видалити цей файл
|
346
342
|
log:
|
347
343
|
base_presenter:
|
348
344
|
create: "%{user_name} створив %{resource_name}"
|
@@ -419,7 +415,6 @@ uk:
|
|
419
415
|
no_notifications: Ще немає сповіщень.
|
420
416
|
notifications_settings:
|
421
417
|
show:
|
422
|
-
email_on_notification: Я хочу отримувати листа електронною поштою кожного разу, коли отримую сповіщення.
|
423
418
|
newsletter_notifications: Я хочу отримувати розсилання
|
424
419
|
update_notifications_settings: Зберегти зміни
|
425
420
|
update:
|
@@ -459,7 +454,6 @@ uk:
|
|
459
454
|
form:
|
460
455
|
legend: Погодитися з умовами участі
|
461
456
|
refuse:
|
462
|
-
modal_body: Якщо ви відмовитеся, ви не зможете використовувати майданчик, ви можете <a href="%{data_portability_path}">завантажити свої дані</a> і / або <a href="%{delete_path}">видалити свій обліковий запис</a>.
|
463
457
|
modal_btn_continue: Прийняти умови та продовжити
|
464
458
|
modal_btn_exit: Я перегляну це пізніше
|
465
459
|
modal_button: Відмовитися від умов участі
|
@@ -551,7 +545,6 @@ uk:
|
|
551
545
|
invitations:
|
552
546
|
edit:
|
553
547
|
header: Завершіть створення свого облікового запису
|
554
|
-
nickname_help: Ваш унікальний псевдонім в %{organization}.
|
555
548
|
submit_button: Зберегти
|
556
549
|
subtitle: Якщо ви приймаєте запрошення, встановіть, будь ласка, свій псевдонім та пароль.
|
557
550
|
mailer:
|
@@ -598,10 +591,6 @@ uk:
|
|
598
591
|
timestamp_error_message: Вибачте, це було занадто швидко! Будь ласка, подайте повідомлення знову.
|
599
592
|
layouts:
|
600
593
|
decidim:
|
601
|
-
cookie_warning:
|
602
|
-
description_html: На цьому сайті використовуються реп'яшки (куки). Продовжуючи переглядати сайт, ви погоджуєтеся з нашим використанням реп'яшків. Дізнайтеся про це більше %{link}.
|
603
|
-
link_label: тут
|
604
|
-
ok: Я погоджуюся
|
605
594
|
edit_link:
|
606
595
|
edit: Редагувати
|
607
596
|
footer:
|
data/config/locales/zh-CN.yml
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
---
|
1
2
|
zh-CN:
|
2
3
|
activemodel:
|
3
4
|
attributes:
|
@@ -58,7 +59,6 @@ zh-CN:
|
|
58
59
|
'true': '否'
|
59
60
|
carrierwave:
|
60
61
|
errors:
|
61
|
-
image_too_big: 图片过大
|
62
62
|
not_inside_organization: 该文件没有附加到任何组织
|
63
63
|
date:
|
64
64
|
formats:
|
@@ -71,9 +71,6 @@ zh-CN:
|
|
71
71
|
logo: "%{organization}的官方标志"
|
72
72
|
skip_button: 跳转到主要内容
|
73
73
|
account:
|
74
|
-
data_portability_export:
|
75
|
-
file_no_exists: 文件不存在
|
76
|
-
notice: 目前正在下载您的数据。完成后,您将收到一封电子邮件。
|
77
74
|
delete:
|
78
75
|
confirm:
|
79
76
|
close: 关闭窗口
|
@@ -84,6 +81,9 @@ zh-CN:
|
|
84
81
|
destroy:
|
85
82
|
error: 删除您的帐户时出错。
|
86
83
|
success: 您的帐户已成功删除。
|
84
|
+
download_your_data_export:
|
85
|
+
file_no_exists: 文件不存在
|
86
|
+
notice: 目前正在下载您的数据。完成后,您将收到一封电子邮件。
|
87
87
|
show:
|
88
88
|
change_password: 更改密码
|
89
89
|
update_account: 更新帐户
|
@@ -324,8 +324,8 @@ zh-CN:
|
|
324
324
|
amendments_enabled: 修改已启用
|
325
325
|
comments_enabled: 评论已启用
|
326
326
|
comments_max_length: 评论最大长度
|
327
|
-
|
328
|
-
|
327
|
+
dummy_global_attribute1: 虚拟属性 1
|
328
|
+
dummy_global_attribute2: 虚拟属性 2
|
329
329
|
dummy_global_translatable_text: 虚拟可翻译文本
|
330
330
|
enable_pads_creation: 启用页面创建
|
331
331
|
resources_permissions_enabled: 资源权限已启用
|
@@ -337,8 +337,8 @@ zh-CN:
|
|
337
337
|
amendment_reaction_enabled: 修正反应已启用
|
338
338
|
amendments_visibility: 修正可见性
|
339
339
|
comments_blocked: 评论已阻止
|
340
|
-
|
341
|
-
|
340
|
+
dummy_step_attribute1: 虚拟步骤属性 1
|
341
|
+
dummy_step_attribute2: 虚拟步骤属性 2
|
342
342
|
dummy_step_translatable_text: 虚拟步骤可翻译文本
|
343
343
|
contact: 聯繫人
|
344
344
|
content_blocks:
|
@@ -370,12 +370,6 @@ zh-CN:
|
|
370
370
|
actions:
|
371
371
|
login_before_access: 请在访问前使用您的帐户登录
|
372
372
|
unauthorized: 您无权执行此操作
|
373
|
-
data_portability:
|
374
|
-
export:
|
375
|
-
ready: 准备好
|
376
|
-
show:
|
377
|
-
download_data: 下载数据
|
378
|
-
request_data: 请求数据
|
379
373
|
datepicker:
|
380
374
|
help_text: '预期格式: %{datepicker_format}'
|
381
375
|
devise:
|
@@ -392,7 +386,6 @@ zh-CN:
|
|
392
386
|
already_have_an_account?: 已经有一个帐户?
|
393
387
|
newsletter: 接收附带相关信息的时事通讯
|
394
388
|
newsletter_title: 联系人权限
|
395
|
-
password_help: "%{minimun_characters} 个字符,必须不要太常见(例如,123456),并且必须不同于您的昵称和电子邮件。"
|
396
389
|
sign_in: 登录
|
397
390
|
sign_up: 注册
|
398
391
|
sign_up_as:
|
@@ -432,6 +425,12 @@ zh-CN:
|
|
432
425
|
this_application_will_not_be_able_to: '此应用程序将无法:'
|
433
426
|
update_profile: 更新您的个人资料
|
434
427
|
wants_to_use_your_account_html: "<strong>%{application_name}</strong> 想要使用您的帐户"
|
428
|
+
download_your_data:
|
429
|
+
export:
|
430
|
+
ready: 准备好
|
431
|
+
show:
|
432
|
+
download_data: 下载数据
|
433
|
+
request_data: 请求数据
|
435
434
|
endorsable:
|
436
435
|
endorsements: 授权
|
437
436
|
endorsements_count: 批准次数
|
@@ -582,7 +581,7 @@ zh-CN:
|
|
582
581
|
email_subject: "%{nickname} 更新了他们的个人资料"
|
583
582
|
notification_title: 您关注的 %{name} (%{nickname}) 的 <a href="%{resource_path}">个人资料页面</a> 已经更新。
|
584
583
|
export_mailer:
|
585
|
-
|
584
|
+
download_your_data_export:
|
586
585
|
download: 下载
|
587
586
|
export:
|
588
587
|
ready: 请找到您导出的压缩版本。
|
@@ -618,7 +617,6 @@ zh-CN:
|
|
618
617
|
button: 停止关注
|
619
618
|
error: 出现了一个不关注此资源的问题。
|
620
619
|
forms:
|
621
|
-
current_file: 当前文件
|
622
620
|
current_image: 当前图像
|
623
621
|
default_image: 默认图像
|
624
622
|
errors:
|
@@ -637,7 +635,6 @@ zh-CN:
|
|
637
635
|
file_validation:
|
638
636
|
allowed_file_extensions: '允许的文件扩展名: %{extensions}'
|
639
637
|
max_file_size: '最大文件大小: %{megabytes}MB'
|
640
|
-
remove_this_file: 删除此文件
|
641
638
|
gamification:
|
642
639
|
all_badges_link: 查看所有可用的徽章。
|
643
640
|
badges:
|
@@ -750,7 +747,6 @@ zh-CN:
|
|
750
747
|
no_user_groups: 尚不属于任何群组。
|
751
748
|
roles:
|
752
749
|
admin: 管理员
|
753
|
-
creator: 创建者
|
754
750
|
member: 成员
|
755
751
|
update:
|
756
752
|
error: 更新群组时出错
|
@@ -941,13 +937,11 @@ zh-CN:
|
|
941
937
|
show:
|
942
938
|
allow_public_contact: 允许任何人向我发送一条直接消息,即使我没有关注它们。
|
943
939
|
direct_messages: 从任何人接收私信
|
944
|
-
email_on_notification: 每次我收到通知时,我都想收到一封电子邮件。
|
945
940
|
everything_followed: 我关注的所有情况
|
946
941
|
newsletter_notifications: 我想要收到新闻简报
|
947
942
|
newsletters: 新闻通讯
|
948
943
|
own_activity: 我自己的活动,例如当有人在我的建议中评论或提到我时
|
949
944
|
receive_notifications_about: 我想要获取通知关于
|
950
|
-
send_notifications_by_email: 通过电子邮件发送通知
|
951
945
|
update_notifications_settings: 保存更改
|
952
946
|
update:
|
953
947
|
error: 更新您的通知设置时出现问题。
|
@@ -1005,7 +999,6 @@ zh-CN:
|
|
1005
999
|
agreement: 我同意这些条款
|
1006
1000
|
legend: 同意使用条款
|
1007
1001
|
refuse:
|
1008
|
-
modal_body: 如果您拒绝,您将无法使用平台,您可以 <a href="%{data_portability_path}">下载您的数据</a> 和/或 <a href="%{delete_path}">删除您的帐户</a>。
|
1009
1002
|
modal_btn_continue: 接受并继续
|
1010
1003
|
modal_btn_exit: 我稍后再查看
|
1011
1004
|
modal_button: 拒绝条款
|
@@ -1269,7 +1262,6 @@ zh-CN:
|
|
1269
1262
|
invitations:
|
1270
1263
|
edit:
|
1271
1264
|
header: 完成创建您的帐户
|
1272
|
-
nickname_help: 您在 %{organization} 中的昵称。
|
1273
1265
|
submit_button: 保存
|
1274
1266
|
subtitle: 如果您接受邀请,请设置您的昵称和密码。
|
1275
1267
|
invitation_removed: 您的邀请已被删除。
|
@@ -1336,7 +1328,6 @@ zh-CN:
|
|
1336
1328
|
passwords:
|
1337
1329
|
edit:
|
1338
1330
|
change_my_password: 更改我的密码
|
1339
|
-
change_your_password: 更改您的密码
|
1340
1331
|
confirm_new_password: 确认新密码
|
1341
1332
|
new_password: 新密码
|
1342
1333
|
password_help: "%{minimun_characters} 个字符,必须不要太常见(例如,123456),并且必须不同于您的昵称和电子邮件。"
|
@@ -1350,15 +1341,6 @@ zh-CN:
|
|
1350
1341
|
updated_not_active: 您的密码已成功更改。
|
1351
1342
|
registrations:
|
1352
1343
|
destroyed: 您的帐户已成功取消。我们希望很快再见到您。
|
1353
|
-
edit:
|
1354
|
-
are_you_sure: 您确定吗?
|
1355
|
-
cancel_my_account: 取消我的帐户
|
1356
|
-
currently_waiting_confirmation_for_email: '正在等待确认: %{email}'
|
1357
|
-
leave_blank_if_you_don_t_want_to_change_it: 如果您不想更改它,请留空
|
1358
|
-
title: 编辑 %{resource}
|
1359
|
-
unhappy: 不愉快?
|
1360
|
-
update: 更新
|
1361
|
-
we_need_your_current_password_to_confirm_your_changes: 我们需要您当前的密码来确认您的更改
|
1362
1344
|
new:
|
1363
1345
|
sign_up: 注册
|
1364
1346
|
signed_up: 欢迎!您已成功注册。
|
@@ -1421,10 +1403,6 @@ zh-CN:
|
|
1421
1403
|
timestamp_error_message: 对不起,这太快了!请重新提交。
|
1422
1404
|
layouts:
|
1423
1405
|
decidim:
|
1424
|
-
cookie_warning:
|
1425
|
-
description_html: 此网站使用 cookies。通过继续浏览网站,您同意我们使用 cookies。 %{link}。
|
1426
|
-
link_label: 了解更多关于 cookie
|
1427
|
-
ok: 我同意
|
1428
1406
|
edit_link:
|
1429
1407
|
edit: 编辑
|
1430
1408
|
footer:
|
@@ -1472,8 +1450,8 @@ zh-CN:
|
|
1472
1450
|
widget:
|
1473
1451
|
see_more: 查看更多
|
1474
1452
|
locale:
|
1475
|
-
name:
|
1476
|
-
name_with_error:
|
1453
|
+
name: 中文
|
1454
|
+
name_with_error: 中文(错误!)
|
1477
1455
|
password_validator:
|
1478
1456
|
domain_included_in_password: 与这个域名太近了
|
1479
1457
|
email_included_in_password: 与您的电子邮件太相似了
|
data/config/routes.rb
CHANGED
@@ -3,6 +3,8 @@
|
|
3
3
|
Decidim::Core::Engine.routes.draw do
|
4
4
|
mount Decidim::Api::Engine => "/api"
|
5
5
|
|
6
|
+
get "/offline", to: "offline#show"
|
7
|
+
|
6
8
|
devise_for :users,
|
7
9
|
class_name: "Decidim::User",
|
8
10
|
module: :devise,
|
@@ -11,11 +13,29 @@ Decidim::Core::Engine.routes.draw do
|
|
11
13
|
invitations: "decidim/devise/invitations",
|
12
14
|
sessions: "decidim/devise/sessions",
|
13
15
|
confirmations: "decidim/devise/confirmations",
|
14
|
-
registrations: "decidim/devise/registrations",
|
15
16
|
passwords: "decidim/devise/passwords",
|
16
17
|
unlocks: "decidim/devise/unlocks",
|
17
18
|
omniauth_callbacks: "decidim/devise/omniauth_registrations"
|
18
|
-
}
|
19
|
+
},
|
20
|
+
skip: [:registrations]
|
21
|
+
|
22
|
+
# Manually define the registration routes because otherwise the default "edit"
|
23
|
+
# route would be exposed through Devise while we already have the edit and
|
24
|
+
# destroy routes available through the account pages.
|
25
|
+
resource(
|
26
|
+
:registration,
|
27
|
+
only: [:new, :create],
|
28
|
+
as: :user_registration,
|
29
|
+
path: "/users",
|
30
|
+
path_names: { new: "sign_up" },
|
31
|
+
controller: "devise/registrations"
|
32
|
+
) do
|
33
|
+
# The "cancel" route forces the session data which is usually expired after
|
34
|
+
# sign in to be expired now. This is useful if the user wants to cancel
|
35
|
+
# OAuth signing in/up in the middle of the process, removing all OAuth
|
36
|
+
# session data. @see [Devise::RegistrationsController#cancel]
|
37
|
+
get :cancel
|
38
|
+
end
|
19
39
|
|
20
40
|
devise_for :user_groups,
|
21
41
|
class_name: "Decidim::UserGroup",
|
@@ -29,6 +49,8 @@ Decidim::Core::Engine.routes.draw do
|
|
29
49
|
post "omniauth_registrations" => "devise/omniauth_registrations#create"
|
30
50
|
end
|
31
51
|
|
52
|
+
resource :manifest, only: [:show]
|
53
|
+
|
32
54
|
resource :locale, only: [:create]
|
33
55
|
|
34
56
|
Decidim.participatory_space_manifests.each do |manifest|
|
@@ -43,9 +65,16 @@ Decidim::Core::Engine.routes.draw do
|
|
43
65
|
end
|
44
66
|
|
45
67
|
authenticate(:user) do
|
68
|
+
devise_scope :user do
|
69
|
+
get "change_password" => "devise/passwords"
|
70
|
+
put "apply_password" => "devise/passwords"
|
71
|
+
end
|
72
|
+
|
46
73
|
resource :account, only: [:show, :update, :destroy], controller: "account" do
|
47
74
|
member do
|
48
75
|
get :delete
|
76
|
+
post :resend_confirmation_instructions
|
77
|
+
post :cancel_email_change
|
49
78
|
end
|
50
79
|
end
|
51
80
|
resources :conversations, only: [:new, :create, :index, :show, :update], controller: "messaging/conversations"
|
@@ -60,13 +89,14 @@ Decidim::Core::Engine.routes.draw do
|
|
60
89
|
|
61
90
|
get "/newsletters_opt_in/:token", to: "newsletters_opt_in#update", as: :newsletters_opt_in
|
62
91
|
|
63
|
-
resource :
|
92
|
+
resource :download_your_data, only: [:show], controller: "download_your_data" do
|
64
93
|
member do
|
65
94
|
post :export
|
66
95
|
get :download_file
|
67
96
|
end
|
68
97
|
end
|
69
98
|
|
99
|
+
resources :notifications_subscriptions, param: :auth, only: [:create, :destroy]
|
70
100
|
resource :user_interests, only: [:show, :update]
|
71
101
|
|
72
102
|
get "/authorization_modals/:authorization_action/f/:component_id(/:resource_name/:resource_id)", to: "authorization_modals#show", as: :authorization_modal
|
@@ -123,7 +153,6 @@ Decidim::Core::Engine.routes.draw do
|
|
123
153
|
get "/scopes/picker", to: "scopes#picker", as: :scopes_picker
|
124
154
|
|
125
155
|
get "/static_map", to: "static_map#show", as: :static_map
|
126
|
-
get "/cookies/accept", to: "cookie_policy#accept", as: :accept_cookies
|
127
156
|
put "/pages/terms-and-conditions/accept", to: "tos#accept_tos", as: :accept_tos
|
128
157
|
|
129
158
|
match "/404", to: "errors#not_found", via: :all
|
@@ -166,8 +195,12 @@ Decidim::Core::Engine.routes.draw do
|
|
166
195
|
get :unsubscribe, on: :collection
|
167
196
|
end
|
168
197
|
|
198
|
+
resources :upload_validations, only: [:create]
|
199
|
+
|
169
200
|
resources :last_activities, only: [:index]
|
170
201
|
|
202
|
+
resources :short_links, only: [:index, :show], path: "s"
|
203
|
+
|
171
204
|
use_doorkeeper do
|
172
205
|
skip_controllers :applications, :authorized_applications
|
173
206
|
end
|
@@ -5,6 +5,7 @@ class AddAcceptedTosVersionFieldToUsers < ActiveRecord::Migration[5.1]
|
|
5
5
|
self.table_name = :decidim_organizations
|
6
6
|
has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
|
7
7
|
end
|
8
|
+
|
8
9
|
class User < ApplicationRecord
|
9
10
|
self.table_name = :decidim_users
|
10
11
|
belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"
|
@@ -9,10 +9,10 @@ class FixUserNames < ActiveRecord::Migration[5.2]
|
|
9
9
|
|
10
10
|
weird_characters.each do |character|
|
11
11
|
Decidim::UserBaseEntity.where(deleted_at: nil).where("name like '%#{character}%' escape '\' OR nickname like '%#{character}%' escape '\'").find_each do |entity|
|
12
|
-
Rails.logger.debug "detected character: #{character}"
|
13
|
-
Rails.logger.debug "UserBaseEntity ID: #{entity.id}"
|
14
|
-
Rails.logger.debug "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}"
|
15
|
-
Rails.logger.debug "#{entity.nickname} => #{entity.nickname.delete(characters_to_remove).strip}"
|
12
|
+
Rails.logger.debug { "detected character: #{character}" }
|
13
|
+
Rails.logger.debug { "UserBaseEntity ID: #{entity.id}" }
|
14
|
+
Rails.logger.debug { "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}" }
|
15
|
+
Rails.logger.debug { "#{entity.nickname} => #{entity.nickname.delete(characters_to_remove).strip}" }
|
16
16
|
|
17
17
|
entity.name = entity.name.delete(characters_to_remove).strip
|
18
18
|
sanitized_nickname = entity.nickname.delete(characters_to_remove).strip
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# This migration comes from active_storage (originally 20190112182829)
|
4
|
+
class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
|
5
|
+
def up
|
6
|
+
return if column_exists?(:active_storage_blobs, :service_name)
|
7
|
+
|
8
|
+
add_column :active_storage_blobs, :service_name, :string
|
9
|
+
# rubocop:disable Lint/AssignmentInCondition
|
10
|
+
# rubocop:disable Rails/SkipsModelValidations
|
11
|
+
if configured_service = ActiveStorage::Blob.service.name
|
12
|
+
ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
|
13
|
+
end
|
14
|
+
# rubocop:enable Lint/AssignmentInCondition
|
15
|
+
# rubocop:enable Rails/SkipsModelValidations
|
16
|
+
change_column :active_storage_blobs, :service_name, :string, null: false
|
17
|
+
end
|
18
|
+
|
19
|
+
def down
|
20
|
+
remove_column :active_storage_blobs, :service_name
|
21
|
+
end
|
22
|
+
end
|