decidim-meetings 0.27.4 → 0.28.0.rc5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/cells/decidim/meetings/attending_organizations_list_cell.rb +32 -0
- data/app/cells/decidim/meetings/cancel_registration_meeting_button/cancelation_modal.erb +21 -0
- data/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb +10 -0
- data/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb +36 -0
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb +8 -18
- data/app/cells/decidim/meetings/dates_and_map/show.erb +25 -0
- data/app/cells/decidim/meetings/dates_and_map/static_map.erb +1 -0
- data/app/cells/decidim/meetings/dates_and_map_cell.rb +35 -0
- data/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb +32 -30
- data/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb +76 -16
- data/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb +25 -0
- data/app/cells/decidim/meetings/join_meeting_button/remaining_slots.erb +4 -0
- data/app/cells/decidim/meetings/join_meeting_button/show.erb +7 -19
- data/app/cells/decidim/meetings/join_meeting_button_cell.rb +3 -7
- data/app/cells/decidim/meetings/meeting_activity_cell.rb +1 -12
- data/app/cells/decidim/meetings/meeting_card_metadata_cell.rb +64 -0
- data/app/cells/decidim/meetings/meeting_cell.rb +2 -6
- data/app/cells/decidim/meetings/meeting_l/image.erb +5 -0
- data/app/cells/decidim/meetings/meeting_l_cell.rb +33 -0
- data/app/cells/decidim/meetings/meeting_month/show.erb +33 -0
- data/app/cells/decidim/meetings/meeting_month_cell.rb +72 -0
- data/app/cells/decidim/meetings/meeting_s_cell.rb +5 -37
- data/app/cells/decidim/meetings/meetings_map/show.erb +9 -24
- data/app/cells/decidim/meetings/meetings_map_cell.rb +1 -1
- data/app/cells/decidim/meetings/online_meeting_cell.rb +1 -0
- data/app/cells/decidim/meetings/online_meeting_link/show.erb +18 -41
- data/app/cells/decidim/meetings/public_participants_list/show.erb +4 -15
- data/app/commands/decidim/meetings/admin/copy_meeting.rb +1 -1
- data/app/commands/decidim/meetings/admin/create_meeting.rb +1 -1
- data/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb +5 -5
- data/app/commands/decidim/meetings/admin/publish_meeting.rb +1 -1
- data/app/commands/decidim/meetings/admin/unpublish_meeting.rb +1 -1
- data/app/commands/decidim/meetings/create_meeting.rb +14 -3
- data/app/commands/decidim/meetings/decline_invitation.rb +1 -1
- data/app/commands/decidim/meetings/join_meeting.rb +5 -5
- data/app/commands/decidim/meetings/update_meeting.rb +13 -3
- data/app/controllers/concerns/decidim/meetings/component_filterable.rb +4 -4
- data/app/controllers/decidim/meetings/admin/agenda_controller.rb +6 -6
- data/app/controllers/decidim/meetings/admin/invites_controller.rb +3 -3
- data/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb +2 -4
- data/app/controllers/decidim/meetings/admin/meeting_copies_controller.rb +3 -3
- data/app/controllers/decidim/meetings/admin/meetings_controller.rb +7 -7
- data/app/controllers/decidim/meetings/admin/meetings_poll_controller.rb +4 -4
- data/app/controllers/decidim/meetings/admin/registrations_controller.rb +6 -6
- data/app/controllers/decidim/meetings/application_controller.rb +11 -0
- data/app/controllers/decidim/meetings/calendars_controller.rb +0 -1
- data/app/controllers/decidim/meetings/directory/application_controller.rb +12 -0
- data/app/controllers/decidim/meetings/directory/meetings_controller.rb +5 -30
- data/app/controllers/decidim/meetings/live_events_controller.rb +1 -0
- data/app/controllers/decidim/meetings/meeting_closes_controller.rb +2 -3
- data/app/controllers/decidim/meetings/meetings_controller.rb +75 -7
- data/app/controllers/decidim/meetings/polls/answers_controller.rb +2 -2
- data/app/controllers/decidim/meetings/polls/questions_controller.rb +1 -1
- data/app/controllers/decidim/meetings/registrations_controller.rb +5 -5
- data/app/events/decidim/meetings/close_meeting_event.rb +1 -1
- data/app/events/decidim/meetings/meeting_event.rb +1 -1
- data/app/events/decidim/meetings/meeting_registration_notification_event.rb +3 -3
- data/app/events/decidim/meetings/meeting_registrations_enabled_event.rb +1 -1
- data/app/events/decidim/meetings/meeting_registrations_over_percentage_event.rb +1 -1
- data/app/events/decidim/meetings/registration_code_validated_event.rb +1 -1
- data/app/forms/decidim/meetings/admin/meeting_form.rb +5 -1
- data/app/forms/decidim/meetings/admin/meeting_registrations_form.rb +2 -2
- data/app/forms/decidim/meetings/admin/validate_registration_code_form.rb +1 -1
- data/app/forms/decidim/meetings/base_meeting_form.rb +1 -1
- data/app/forms/decidim/meetings/meeting_form.rb +3 -3
- data/app/helpers/decidim/meetings/admin/application_helper.rb +1 -0
- data/app/helpers/decidim/meetings/application_helper.rb +18 -25
- data/app/helpers/decidim/meetings/directory/application_helper.rb +10 -58
- data/app/helpers/decidim/meetings/map_helper.rb +2 -9
- data/app/helpers/decidim/meetings/meetings_helper.rb +6 -5
- data/app/jobs/decidim/meetings/hide_all_created_by_author_job.rb +13 -0
- data/app/mailers/decidim/meetings/admin/invite_join_meeting_mailer.rb +1 -1
- data/app/mailers/decidim/meetings/registration_mailer.rb +1 -1
- data/app/models/decidim/meetings/meeting.rb +11 -32
- data/app/models/decidim/meetings/question.rb +1 -1
- data/app/packs/entrypoints/decidim_meetings.js +3 -0
- data/app/packs/images/decidim/gamification/badges/decidim_gamification_badges_attended_meetings.svg +42 -1
- data/app/packs/src/decidim/meetings/admin/agendas.js +3 -4
- data/app/packs/src/decidim/meetings/admin/registrations_form.js +12 -4
- data/app/packs/src/decidim/meetings/meetings_form.js +1 -1
- data/app/packs/src/decidim/meetings/poll.component.js +1 -1
- data/app/packs/stylesheets/decidim/meetings/_calendar.scss +47 -0
- data/app/packs/stylesheets/decidim/meetings/_item.scss +177 -0
- data/app/packs/stylesheets/decidim/meetings/_list.scss +58 -0
- data/app/packs/stylesheets/decidim/meetings/_live_event.scss +128 -0
- data/app/packs/stylesheets/decidim/meetings/meetings.scss +4 -0
- data/app/permissions/decidim/meetings/permissions.rb +15 -2
- data/app/presenters/decidim/meetings/admin_log/invite_presenter.rb +2 -2
- data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb +2 -2
- data/app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb +2 -2
- data/app/presenters/decidim/meetings/meeting_presenter.rb +8 -2
- data/app/services/decidim/meetings/calendar/component_calendar.rb +1 -1
- data/app/services/decidim/meetings/calendar/meeting_to_event.rb +6 -1
- data/app/services/decidim/meetings/close_meeting_reminder_generator.rb +2 -2
- data/app/services/decidim/meetings/meeting_iframe_embedder.rb +1 -1
- data/app/views/decidim/meetings/_calendar_modal.html.erb +19 -21
- data/app/views/decidim/meetings/admin/agenda/_agenda_item.html.erb +12 -12
- data/app/views/decidim/meetings/admin/agenda/_agenda_item_child.html.erb +8 -8
- data/app/views/decidim/meetings/admin/agenda/_agenda_item_child_template.html.erb +1 -1
- data/app/views/decidim/meetings/admin/agenda/_agenda_item_fields.html.erb +3 -3
- data/app/views/decidim/meetings/admin/agenda/_form.html.erb +54 -50
- data/app/views/decidim/meetings/admin/agenda/edit.html.erb +18 -6
- data/app/views/decidim/meetings/admin/agenda/new.html.erb +17 -5
- data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb +11 -2
- data/app/views/decidim/meetings/admin/invites/_form.html.erb +38 -28
- data/app/views/decidim/meetings/admin/invites/index.html.erb +77 -81
- data/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb +26 -28
- data/app/views/decidim/meetings/admin/meeting_closes/edit.html.erb +17 -5
- data/app/views/decidim/meetings/admin/meeting_copies/new.html.erb +17 -6
- data/app/views/decidim/meetings/admin/meetings/_form.html.erb +76 -83
- data/app/views/decidim/meetings/admin/meetings/_service.html.erb +14 -10
- data/app/views/decidim/meetings/admin/meetings/_services.html.erb +9 -5
- data/app/views/decidim/meetings/admin/meetings/edit.html.erb +17 -7
- data/app/views/decidim/meetings/admin/meetings/index.html.erb +133 -129
- data/app/views/decidim/meetings/admin/meetings/new.html.erb +16 -6
- data/app/views/decidim/meetings/admin/poll/_answer_option.html.erb +2 -1
- data/app/views/decidim/meetings/admin/poll/_answer_option_template.html.erb +1 -1
- data/app/views/decidim/meetings/admin/poll/_form.html.erb +17 -32
- data/app/views/decidim/meetings/admin/poll/_question.html.erb +81 -75
- data/app/views/decidim/meetings/admin/poll/edit.html.erb +28 -8
- data/app/views/decidim/meetings/admin/registrations/_form.html.erb +32 -55
- data/app/views/decidim/meetings/admin/registrations/edit.html.erb +59 -26
- data/app/views/decidim/meetings/directory/meetings/index.html.erb +15 -20
- data/app/views/decidim/meetings/directory/meetings/index.js.erb +1 -23
- data/app/views/decidim/meetings/layouts/_aside_block.html.erb +8 -0
- data/app/views/decidim/meetings/layouts/live_event.html.erb +20 -19
- data/app/views/decidim/meetings/live_events/show.html.erb +4 -5
- data/app/views/decidim/meetings/meeting_closes/_form.html.erb +3 -10
- data/app/views/decidim/meetings/meeting_closes/edit.html.erb +17 -21
- data/app/views/decidim/meetings/meetings/_actions.html.erb +6 -0
- data/app/views/decidim/meetings/meetings/_add_to_calendar_modal.html.erb +17 -0
- data/app/views/decidim/meetings/meetings/_form.html.erb +26 -34
- data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb +3 -22
- data/app/views/decidim/meetings/meetings/_meeting.html.erb +74 -0
- data/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb +28 -26
- data/app/views/decidim/meetings/meetings/_meeting_aside.html.erb +98 -0
- data/app/views/decidim/meetings/meetings/_meeting_minutes.html.erb +23 -36
- data/app/views/decidim/meetings/meetings/edit.html.erb +17 -21
- data/app/views/decidim/meetings/meetings/index.html.erb +15 -33
- data/app/views/decidim/meetings/meetings/index.js.erb +1 -23
- data/app/views/decidim/meetings/meetings/new.html.erb +17 -21
- data/app/views/decidim/meetings/meetings/show.html.erb +8 -164
- data/app/views/decidim/meetings/polls/answers/_multiple_option.html.erb +2 -2
- data/app/views/decidim/meetings/polls/answers/_single_option.html.erb +6 -6
- data/app/views/decidim/meetings/polls/answers/create.js.erb +1 -1
- data/app/views/decidim/meetings/polls/questions/_index.html.erb +1 -1
- data/app/views/decidim/meetings/polls/questions/_index_admin.html.erb +5 -5
- data/app/views/decidim/meetings/polls/questions/_published_question.html.erb +7 -9
- data/app/views/decidim/meetings/polls/questions/_question.html.erb +3 -3
- data/app/views/decidim/meetings/polls/questions/index_admin.js.erb +1 -1
- data/app/views/decidim/meetings/shared/_filters.html.erb +20 -0
- data/app/views/decidim/meetings/shared/_index.html.erb +24 -0
- data/app/views/decidim/meetings/shared/_index.js.erb +16 -0
- data/app/views/decidim/meetings/shared/_meetings.html.erb +33 -0
- data/app/views/decidim/meetings/shared/_meetings_aside.html.erb +18 -0
- data/app/views/decidim/meetings/versions/show.html.erb +13 -3
- data/app/views/decidim/participatory_spaces/_conference_venues.html.erb +15 -14
- data/config/assets.rb +0 -2
- data/config/environment.rb +3 -0
- data/config/locales/ar.yml +3 -97
- data/config/locales/bg.yml +0 -7
- data/config/locales/ca.yml +49 -70
- data/config/locales/cs.yml +52 -73
- data/config/locales/de.yml +52 -70
- data/config/locales/el.yml +45 -54
- data/config/locales/en.yml +54 -75
- data/config/locales/es-MX.yml +50 -68
- data/config/locales/es-PY.yml +51 -69
- data/config/locales/es.yml +48 -69
- data/config/locales/eu.yml +131 -149
- data/config/locales/fi-plain.yml +49 -67
- data/config/locales/fi.yml +64 -82
- data/config/locales/fr-CA.yml +45 -66
- data/config/locales/fr.yml +49 -70
- data/config/locales/ga-IE.yml +0 -16
- data/config/locales/gl.yml +1 -66
- data/config/locales/hu.yml +3 -89
- data/config/locales/id-ID.yml +1 -63
- data/config/locales/is-IS.yml +1 -21
- data/config/locales/it.yml +1 -85
- data/config/locales/ja.yml +43 -67
- data/config/locales/lb.yml +1 -66
- data/config/locales/lt.yml +59 -66
- data/config/locales/lv.yml +1 -64
- data/config/locales/nl.yml +1 -95
- data/config/locales/no.yml +1 -80
- data/config/locales/pl.yml +10 -83
- data/config/locales/pt-BR.yml +1 -86
- data/config/locales/pt.yml +1 -85
- data/config/locales/ro-RO.yml +8 -82
- data/config/locales/ru.yml +1 -62
- data/config/locales/sk.yml +1 -64
- data/config/locales/sq-AL.yml +1 -0
- data/config/locales/sr-CS.yml +0 -6
- data/config/locales/sv.yml +7 -88
- data/config/locales/th-TH.yml +1 -0
- data/config/locales/tr-TR.yml +2 -74
- data/config/locales/uk.yml +1 -55
- data/config/locales/zh-CN.yml +1 -70
- data/config/locales/zh-TW.yml +21 -54
- data/db/migrate/20201016065302_fix_meetings_registration_terms.rb +1 -1
- data/db/migrate/20230427105701_change_types_and_registration_types_on_meetings.rb +49 -0
- data/lib/decidim/meetings/admin_engine.rb +2 -2
- data/lib/decidim/meetings/component.rb +5 -217
- data/lib/decidim/meetings/content_blocks/registry_manager.rb +17 -0
- data/lib/decidim/meetings/directory_engine.rb +4 -6
- data/lib/decidim/meetings/engine.rb +65 -29
- data/lib/decidim/meetings/meeting_serializer.rb +5 -5
- data/lib/decidim/meetings/seeds.rb +188 -0
- data/lib/decidim/meetings/test/factories.rb +126 -18
- data/lib/decidim/meetings/test/notifications_handling.rb +3 -3
- data/lib/decidim/meetings/test/translated_event.rb +1 -1
- data/lib/decidim/meetings/user_answers_serializer.rb +1 -1
- data/lib/decidim/meetings/version.rb +1 -1
- metadata +60 -55
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/elements.erb +0 -16
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/heading.erb +0 -1
- data/app/cells/decidim/meetings/content_blocks/upcoming_meetings/show.erb +0 -26
- data/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb +0 -55
- data/app/cells/decidim/meetings/join_meeting_button/registration_confirm.erb +0 -31
- data/app/cells/decidim/meetings/meeting_highlighted_list_item/show.erb +0 -21
- data/app/cells/decidim/meetings/meeting_highlighted_list_item_cell.rb +0 -10
- data/app/cells/decidim/meetings/meeting_list_item/show.erb +0 -14
- data/app/cells/decidim/meetings/meeting_list_item_cell.rb +0 -44
- data/app/cells/decidim/meetings/meeting_m/address.erb +0 -5
- data/app/cells/decidim/meetings/meeting_m/data.erb +0 -2
- data/app/cells/decidim/meetings/meeting_m/date.erb +0 -8
- data/app/cells/decidim/meetings/meeting_m/footer.erb +0 -9
- data/app/cells/decidim/meetings/meeting_m/multiple_dates.erb +0 -17
- data/app/cells/decidim/meetings/meeting_m/single_date.erb +0 -9
- data/app/cells/decidim/meetings/meeting_m/tags.erb +0 -1
- data/app/cells/decidim/meetings/meeting_m_cell.rb +0 -121
- data/app/cells/decidim/meetings/meeting_s/show.erb +0 -27
- data/app/controllers/concerns/decidim/meetings/filterable.rb +0 -27
- data/app/controllers/decidim/meetings/widgets_controller.rb +0 -20
- data/app/packs/stylesheets/decidim/meetings/_header.scss +0 -52
- data/app/packs/stylesheets/decidim/meetings/_main.scss +0 -178
- data/app/packs/stylesheets/decidim/meetings/_meetings.scss +0 -2
- data/app/queries/decidim/meetings/admin/invites.rb +0 -60
- data/app/views/decidim/meetings/admin/meeting_closes/proposals_picker.html.erb +0 -1
- data/app/views/decidim/meetings/directory/meetings/_filters.html.erb +0 -34
- data/app/views/decidim/meetings/directory/meetings/_meetings.html.erb +0 -26
- data/app/views/decidim/meetings/meeting_closes/proposals_picker.html.erb +0 -1
- data/app/views/decidim/meetings/meetings/_calendar_modal.html.erb +0 -26
- data/app/views/decidim/meetings/meetings/_filters.html.erb +0 -40
- data/app/views/decidim/meetings/meetings/_filters_small_view.html.erb +0 -18
- data/app/views/decidim/meetings/meetings/_meetings.html.erb +0 -48
- data/app/views/decidim/meetings/versions/index.html.erb +0 -8
- data/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb +0 -4
- data/lib/decidim/meetings/seeds/city.jpeg +0 -0
data/config/locales/zh-CN.yml
CHANGED
@@ -26,17 +26,6 @@ zh-CN:
|
|
26
26
|
registrations_enabled: 注册已启用
|
27
27
|
title: 标题
|
28
28
|
transparent: 透明的
|
29
|
-
errors:
|
30
|
-
models:
|
31
|
-
meeting_agenda:
|
32
|
-
attributes:
|
33
|
-
base:
|
34
|
-
too_many_minutes: 项目持续时间超过 %{count} 分钟
|
35
|
-
too_many_minutes_child: 项目的持续时间超过议程项目 "%{parent_title}" 父时间 %{count} 分钟
|
36
|
-
meeting_registration_invite:
|
37
|
-
attributes:
|
38
|
-
email:
|
39
|
-
already_invited: 此电子邮件帐户已被邀请
|
40
29
|
models:
|
41
30
|
decidim/meetings/close_meeting_event: 会议结束
|
42
31
|
decidim/meetings/create_meeting_event: 会议
|
@@ -60,7 +49,6 @@ zh-CN:
|
|
60
49
|
success: 会议成功重复。
|
61
50
|
new:
|
62
51
|
copy: 复制
|
63
|
-
select: 选择要重复的数据
|
64
52
|
title: 复制会议
|
65
53
|
components:
|
66
54
|
meetings:
|
@@ -138,8 +126,6 @@ zh-CN:
|
|
138
126
|
description_own: 您已经参加了 %{score} 次会议。
|
139
127
|
name: 出席会议
|
140
128
|
next_level_in: 再参加 %{score} 个会议来达到下一级!
|
141
|
-
unearned_another: 此参与者尚未参加任何会议。
|
142
|
-
unearned_own: 你还没有参加任何会议。
|
143
129
|
meetings:
|
144
130
|
actions:
|
145
131
|
agenda: 议程项目
|
@@ -152,7 +138,6 @@ zh-CN:
|
|
152
138
|
invalid_destroy:
|
153
139
|
proposals_count:
|
154
140
|
other: '会议不能被破坏,因为它有 %{count} 个建议与此相关联:'
|
155
|
-
new: 新会议
|
156
141
|
preview: 预览
|
157
142
|
registrations: 注册
|
158
143
|
title: 行动
|
@@ -170,9 +155,6 @@ zh-CN:
|
|
170
155
|
down: 向下
|
171
156
|
remove: 删除
|
172
157
|
up: 上移
|
173
|
-
create:
|
174
|
-
invalid: 创建这个议程时遇到问题
|
175
|
-
success: 日程创建成功
|
176
158
|
edit:
|
177
159
|
title: 编辑议程
|
178
160
|
update: 更新
|
@@ -184,9 +166,6 @@ zh-CN:
|
|
184
166
|
new:
|
185
167
|
create: 创建
|
186
168
|
title: 新议程
|
187
|
-
update:
|
188
|
-
invalid: 更新这个议程时遇到问题
|
189
|
-
success: 日程更新成功
|
190
169
|
exports:
|
191
170
|
meetings: 会议
|
192
171
|
registrations: 注册
|
@@ -212,25 +191,15 @@ zh-CN:
|
|
212
191
|
all: 所有的
|
213
192
|
rejected: 已拒绝
|
214
193
|
sent: 已发送
|
215
|
-
filter_by: 筛选方式
|
216
194
|
invite_attendee: 邀请参与者
|
217
195
|
invites: 邀请
|
218
|
-
registrations_disabled: 您不能邀请参与者,因为注册已被禁用。
|
219
196
|
search: 搜索
|
220
197
|
meeting_closes:
|
221
198
|
edit:
|
222
199
|
close: 关闭
|
223
200
|
title: 关闭会议
|
224
201
|
meetings:
|
225
|
-
close:
|
226
|
-
invalid: 本次会议结束时出现问题
|
227
|
-
success: 会议已成功关闭
|
228
|
-
create:
|
229
|
-
invalid: 创建此会议时出现问题
|
230
202
|
destroy:
|
231
|
-
invalid:
|
232
|
-
proposals_count:
|
233
|
-
other: 会议不能被销毁,因为它有 %{count} 个建议相关联。
|
234
203
|
success: 会议已成功删除
|
235
204
|
edit:
|
236
205
|
update: 更新
|
@@ -252,12 +221,6 @@ zh-CN:
|
|
252
221
|
services:
|
253
222
|
add_service: 添加服务
|
254
223
|
services: 服务
|
255
|
-
update:
|
256
|
-
invalid: 更新本次会议时出错
|
257
|
-
success: 会议已成功更新
|
258
|
-
models:
|
259
|
-
meeting:
|
260
|
-
name: 会议
|
261
224
|
registrations:
|
262
225
|
edit:
|
263
226
|
save: 保存
|
@@ -270,7 +233,6 @@ zh-CN:
|
|
270
233
|
registration_form: 报名表
|
271
234
|
registrations_count:
|
272
235
|
other: 有 %{count} 个注册。
|
273
|
-
reserved_slots_help: 如果您没有预留位置,请将它留给0
|
274
236
|
reserved_slots_less_than: 必须小于或等于 %{count}
|
275
237
|
title: 注册
|
276
238
|
update:
|
@@ -293,25 +255,15 @@ zh-CN:
|
|
293
255
|
value_types:
|
294
256
|
organizer_presenter:
|
295
257
|
not_found: '在数据库中找不到组织者 (ID: %{id})'
|
296
|
-
application_helper:
|
297
|
-
filter_scope_values:
|
298
|
-
all: 所有的
|
299
258
|
calendar_modal:
|
300
259
|
calendar_url: 日历 URL
|
301
|
-
close_window: 关闭窗口
|
302
260
|
export_calendar: 导出日历
|
303
261
|
conference_venues: 会议地点
|
304
|
-
content_blocks:
|
305
|
-
upcoming_meetings:
|
306
|
-
upcoming_meetings: 即将举行的会议
|
307
|
-
view_all_meetings: 查看全部
|
308
262
|
directory:
|
309
263
|
meetings:
|
310
264
|
index:
|
311
265
|
meetings: 会议
|
312
266
|
space_type: 参与空间
|
313
|
-
last_activity:
|
314
|
-
new_meeting_at_html: "<span>在 %{link}的新会议</span>"
|
315
267
|
mailer:
|
316
268
|
invite_join_meeting_mailer:
|
317
269
|
invite:
|
@@ -319,8 +271,6 @@ zh-CN:
|
|
319
271
|
registration_mailer:
|
320
272
|
confirmation:
|
321
273
|
subject: 您的会议注册已确认
|
322
|
-
meeting:
|
323
|
-
not_allowed: 您无权查看此会议
|
324
274
|
meetings:
|
325
275
|
count:
|
326
276
|
meetings_count:
|
@@ -343,13 +293,7 @@ zh-CN:
|
|
343
293
|
origin_values:
|
344
294
|
all: 所有的
|
345
295
|
official: 官方的
|
346
|
-
scope: 范围
|
347
296
|
search: 搜索
|
348
|
-
filters_small_view:
|
349
|
-
close_modal: 关闭模式
|
350
|
-
filter: 筛选器
|
351
|
-
filter_by: 筛选方式
|
352
|
-
unfold: 展开...
|
353
297
|
form:
|
354
298
|
address_help: '地址:由地理编码器用来查找位置'
|
355
299
|
create_as: 创建会议为
|
@@ -357,10 +301,7 @@ zh-CN:
|
|
357
301
|
select_a_category: 请选择一个类别
|
358
302
|
index:
|
359
303
|
new_meeting: 新会议
|
360
|
-
meeting_minutes:
|
361
|
-
related_information: 相关信息
|
362
304
|
meetings:
|
363
|
-
no_meetings_warning: 没有符合您搜索条件的会议,也没有安排任何会议。
|
364
305
|
upcoming_meetings_warning: 目前没有排定的会议,但在这里你可以找到过去所有会议的清单。
|
365
306
|
new:
|
366
307
|
back: 后退
|
@@ -371,10 +312,8 @@ zh-CN:
|
|
371
312
|
confirm: 确认
|
372
313
|
show:
|
373
314
|
attendees: 参与者数量
|
374
|
-
back: 返回列表
|
375
|
-
close_meeting: 关闭会议
|
376
315
|
contributions: 捐款计数
|
377
|
-
|
316
|
+
join: 加入会议
|
378
317
|
meeting_minutes: 会议分钟
|
379
318
|
no_slots_available: 无可用槽位
|
380
319
|
organizations: B. 参加组织
|
@@ -384,12 +323,9 @@ zh-CN:
|
|
384
323
|
validation_pending: VALIDATED
|
385
324
|
remaining_slots:
|
386
325
|
other: "剩余 %{count} 个槽位"
|
387
|
-
view: 查看
|
388
326
|
update:
|
389
327
|
invalid: 更新会议时出现问题。
|
390
328
|
success: 您已成功更新会议。
|
391
|
-
meetings_map:
|
392
|
-
view_meeting: 查看会议
|
393
329
|
models:
|
394
330
|
invite:
|
395
331
|
fields:
|
@@ -418,7 +354,6 @@ zh-CN:
|
|
418
354
|
registrations:
|
419
355
|
create:
|
420
356
|
invalid: 加入本次会议时出现问题。
|
421
|
-
success: 您已成功加入会议。由于您已经注册了这次会议,如果有更新,您将收到通知。
|
422
357
|
decline_invitation:
|
423
358
|
invalid: 有一个问题拒绝邀请。
|
424
359
|
success: 您已成功拒绝邀请。
|
@@ -428,8 +363,6 @@ zh-CN:
|
|
428
363
|
types:
|
429
364
|
private_meeting: 非公开会议
|
430
365
|
transparent: 透明的
|
431
|
-
versions:
|
432
|
-
back_to_resource: 返回会议
|
433
366
|
metrics:
|
434
367
|
meetings:
|
435
368
|
description: 创建的会议数
|
@@ -440,8 +373,6 @@ zh-CN:
|
|
440
373
|
past_meetings: 过去的会议
|
441
374
|
see_all: 查看所有会议 (%{count})
|
442
375
|
upcoming_meetings: 即将举行的会议
|
443
|
-
upcoming_meeting_for_card:
|
444
|
-
upcoming_meeting: 即将举行的会议
|
445
376
|
resource_links:
|
446
377
|
meetings_through_proposals:
|
447
378
|
meeting_result: '相关结果:'
|
data/config/locales/zh-TW.yml
CHANGED
@@ -60,8 +60,8 @@ zh-TW:
|
|
60
60
|
meeting_agenda:
|
61
61
|
attributes:
|
62
62
|
base:
|
63
|
-
too_many_minutes: 這些項目的總時長超過了會議時間 %{count}
|
64
|
-
too_many_minutes_child: 子項目的持續時間超過議程項目「%{parent_title}」的持續時間 %{count}
|
63
|
+
too_many_minutes: 這些項目的總時長超過了會議時間 %{count} 分鐘.
|
64
|
+
too_many_minutes_child: 子項目的持續時間超過議程項目「%{parent_title}」的持續時間 %{count} 分鐘.
|
65
65
|
meeting_registration_invite:
|
66
66
|
attributes:
|
67
67
|
email:
|
@@ -117,7 +117,6 @@ zh-TW:
|
|
117
117
|
success: 成功複製會議。
|
118
118
|
new:
|
119
119
|
copy: 複製
|
120
|
-
select: 請選擇您想要複製的資料
|
121
120
|
title: 複製會議
|
122
121
|
components:
|
123
122
|
meetings:
|
@@ -218,7 +217,6 @@ zh-TW:
|
|
218
217
|
proposals_count:
|
219
218
|
other: '該會議因有 %{count} 個相關提案而無法刪除:'
|
220
219
|
manage_poll: 管理投票
|
221
|
-
new: 新會議
|
222
220
|
preview: 預覽
|
223
221
|
registrations: 註冊
|
224
222
|
title: 操作
|
@@ -237,8 +235,8 @@ zh-TW:
|
|
237
235
|
remove: 移除
|
238
236
|
up: 往上
|
239
237
|
create:
|
240
|
-
invalid:
|
241
|
-
success:
|
238
|
+
invalid: 建立議程時發生問題.
|
239
|
+
success: 議程成功建立.
|
242
240
|
edit:
|
243
241
|
title: 編輯議程
|
244
242
|
update: 更新
|
@@ -251,8 +249,8 @@ zh-TW:
|
|
251
249
|
create: 建立
|
252
250
|
title: 新的議程
|
253
251
|
update:
|
254
|
-
invalid:
|
255
|
-
success:
|
252
|
+
invalid: 更新議程時發生問題.
|
253
|
+
success: 議程已成功更新.
|
256
254
|
exports:
|
257
255
|
answers: 回答
|
258
256
|
meeting_comments: 評論
|
@@ -280,7 +278,6 @@ zh-TW:
|
|
280
278
|
all: 全部
|
281
279
|
rejected: 已拒絕
|
282
280
|
sent: 傳送
|
283
|
-
filter_by: 篩選條件
|
284
281
|
invite_attendee: 邀請的與會者
|
285
282
|
invites: 邀請
|
286
283
|
registrations_disabled: 你無法邀請參加者,因為註冊已被禁用。
|
@@ -291,15 +288,15 @@ zh-TW:
|
|
291
288
|
title: 關閉會議
|
292
289
|
meetings:
|
293
290
|
close:
|
294
|
-
invalid:
|
295
|
-
success:
|
291
|
+
invalid: 關閉此會議時出現問題.
|
292
|
+
success: 會議已成功關閉.
|
296
293
|
create:
|
297
|
-
invalid:
|
294
|
+
invalid: 建立會議時發生問題.
|
298
295
|
success: 會議已成功建立。請注意這仍未發佈,您需要手動發佈。
|
299
296
|
destroy:
|
300
297
|
invalid:
|
301
298
|
proposals_count:
|
302
|
-
other: 該會議因有 %{count}
|
299
|
+
other: 該會議因有 %{count} 個相關提案而無法刪除.
|
303
300
|
success: 會議已成功刪除
|
304
301
|
edit:
|
305
302
|
title: 編輯會議
|
@@ -314,7 +311,6 @@ zh-TW:
|
|
314
311
|
select_a_meeting_type: 請選擇一種會議類型。
|
315
312
|
select_a_registration_type: 請選擇一種註冊類型
|
316
313
|
select_an_iframe_access_level: 請選擇一個 iframe 存取級別
|
317
|
-
show_embedded_iframe_help: '只有以下域名的部分服務允許將會議或直播活動嵌入: %{domains}'
|
318
314
|
index:
|
319
315
|
title: 會議
|
320
316
|
new:
|
@@ -322,7 +318,7 @@ zh-TW:
|
|
322
318
|
title: 建立會議
|
323
319
|
publish:
|
324
320
|
invalid: 發佈此會議時出現問題。
|
325
|
-
success:
|
321
|
+
success: 會議成功發佈.
|
326
322
|
service:
|
327
323
|
description: 說明
|
328
324
|
down: 向下
|
@@ -334,20 +330,17 @@ zh-TW:
|
|
334
330
|
add_service: 新增服務
|
335
331
|
services: 服務
|
336
332
|
unpublish:
|
337
|
-
invalid:
|
333
|
+
invalid: 取消發佈會議時出了問題.
|
338
334
|
success: 會議已成功取消發佈。
|
339
335
|
update:
|
340
|
-
invalid:
|
341
|
-
success:
|
336
|
+
invalid: 更新會議時發生問題.
|
337
|
+
success: 會議成功更新.
|
342
338
|
meetings_poll:
|
343
339
|
form:
|
344
340
|
title: 編輯 %{questionnaire_for} 投票問卷
|
345
341
|
update:
|
346
|
-
invalid:
|
347
|
-
success:
|
348
|
-
models:
|
349
|
-
meeting:
|
350
|
-
name: 會議
|
342
|
+
invalid: 更新會議投票時出現問題.
|
343
|
+
success: 會議投票已成功更新"
|
351
344
|
registrations:
|
352
345
|
edit:
|
353
346
|
save: 儲存
|
@@ -391,11 +384,8 @@ zh-TW:
|
|
391
384
|
all: 全部
|
392
385
|
filter_meeting_space_values:
|
393
386
|
all: 全部
|
394
|
-
filter_scope_values:
|
395
|
-
all: 全部
|
396
387
|
calendar_modal:
|
397
388
|
calendar_url: 行事曆 URL
|
398
|
-
close_window: 關閉視窗
|
399
389
|
copy_calendar_url: 複製
|
400
390
|
copy_calendar_url_clarification: 將日曆 URL 複製到剪貼板
|
401
391
|
copy_calendar_url_copied: 已複製!
|
@@ -413,8 +403,6 @@ zh-TW:
|
|
413
403
|
content_blocks:
|
414
404
|
upcoming_meetings:
|
415
405
|
name: 即將到來的會議
|
416
|
-
upcoming_meetings: 即將到來的會議
|
417
|
-
view_all_meetings: 檢視全部
|
418
406
|
directory:
|
419
407
|
meetings:
|
420
408
|
index:
|
@@ -430,8 +418,8 @@ zh-TW:
|
|
430
418
|
open_in_live_event_page: 在直播活動頁面開啟(附加投票選項)
|
431
419
|
open_in_new_tab: 在新頁籤中開啟 URL
|
432
420
|
last_activity:
|
433
|
-
|
434
|
-
|
421
|
+
meeting_updated: '會議已更新:'
|
422
|
+
new_meeting: '新會議:'
|
435
423
|
layouts:
|
436
424
|
live_event:
|
437
425
|
administrate: 管理員
|
@@ -455,7 +443,6 @@ zh-TW:
|
|
455
443
|
calendar_modal:
|
456
444
|
add_to_calendar: 新增至行事曆
|
457
445
|
apple: 新增至 Apple 日曆
|
458
|
-
close_window: 關閉視窗
|
459
446
|
full_details_html: 詳細內容請前往 %{link}
|
460
447
|
google: 新增至 Google 日曆
|
461
448
|
outlook: 添加到Outlook 行事曆
|
@@ -484,7 +471,6 @@ zh-TW:
|
|
484
471
|
all: 全部
|
485
472
|
official: 官方
|
486
473
|
participants: 參與者
|
487
|
-
scope: 範圍
|
488
474
|
search: 搜尋
|
489
475
|
type: 類別
|
490
476
|
type_values:
|
@@ -492,11 +478,6 @@ zh-TW:
|
|
492
478
|
hybrid: 混合
|
493
479
|
in_person: 親自
|
494
480
|
online: 線上
|
495
|
-
filters_small_view:
|
496
|
-
close_modal: 關閉視窗
|
497
|
-
filter: 篩選
|
498
|
-
filter_by: 篩選條件
|
499
|
-
unfold: 展開
|
500
481
|
form:
|
501
482
|
address_help: '地址:用於地理編碼器找到位置'
|
502
483
|
available_slots_help: 如果您有無限的可用名額,請將其設置為0。
|
@@ -510,15 +491,12 @@ zh-TW:
|
|
510
491
|
select_a_meeting_type: 請選擇一種會議類型。
|
511
492
|
select_a_registration_type: 請選擇一種註冊類型
|
512
493
|
select_an_iframe_access_level: 請選擇一個 iframe 存取級別
|
513
|
-
show_embedded_iframe_help: '只有以下域名的部分服務允許將會議或直播活動嵌入: %{domains}'
|
514
494
|
index:
|
515
495
|
click_here: 查看所有會議
|
516
496
|
new_meeting: 新會議
|
517
497
|
see_all: 查看所有會議
|
518
498
|
see_all_withdrawn: 查看所有撤回的會議
|
519
499
|
text_banner: 您正在查看已被其作者撤回的會議列表。 %{go_back_link}。
|
520
|
-
meeting_minutes:
|
521
|
-
related_information: 相關信息
|
522
500
|
meetings:
|
523
501
|
no_meetings_warning: 沒有符合搜尋條件的會議或者目前沒有任何已排定的會議。
|
524
502
|
upcoming_meetings_warning: 目前沒有安排的會議,但您可以在這裡找到所有過去的會議列表。
|
@@ -531,12 +509,8 @@ zh-TW:
|
|
531
509
|
confirm: 確認
|
532
510
|
show:
|
533
511
|
attendees: 出席人數
|
534
|
-
back: 返回列表
|
535
|
-
close_meeting: 關閉會議
|
536
512
|
contributions: 貢獻次數
|
537
|
-
|
538
|
-
edit_meeting: 編輯會議
|
539
|
-
going: 您已經註冊參加此會議
|
513
|
+
join: 加入會議
|
540
514
|
leave: 取消您的註冊
|
541
515
|
leave_confirmation: 您確定要取消此次會議的註冊嗎?
|
542
516
|
link_available_soon: 連結即將推出
|
@@ -552,7 +526,6 @@ zh-TW:
|
|
552
526
|
validation_pending: 驗證待處理
|
553
527
|
remaining_slots:
|
554
528
|
other: "剩餘 %{count} 個位置"
|
555
|
-
view: 檢視
|
556
529
|
visit_finished: 查看過去的會議
|
557
530
|
withdraw_btn_hint: 您可以撤回您的會議,如果您改變了主意。會議不會被刪除,而是會顯示在已撤回的會議列表中。
|
558
531
|
withdraw_confirmation_html: 您確定要撤回此會議嗎?<br><br><strong>此操作無法取消!</strong>
|
@@ -560,8 +533,6 @@ zh-TW:
|
|
560
533
|
update:
|
561
534
|
invalid: 更新會議時發生問題.
|
562
535
|
success: 您已成功更新會議。
|
563
|
-
meetings_map:
|
564
|
-
view_meeting: 檢視會議
|
565
536
|
models:
|
566
537
|
invite:
|
567
538
|
fields:
|
@@ -634,11 +605,9 @@ zh-TW:
|
|
634
605
|
private_meeting: 私人會議
|
635
606
|
transparent: 透明
|
636
607
|
withdraw: 撤回
|
637
|
-
versions:
|
638
|
-
back_to_resource: 回到會議畫面
|
639
608
|
withdraw:
|
640
|
-
error:
|
641
|
-
success:
|
609
|
+
error: 退出會議時發生錯誤.
|
610
|
+
success: 會議已成功撤回.
|
642
611
|
metrics:
|
643
612
|
meetings:
|
644
613
|
description: 建立的會議次數
|
@@ -649,8 +618,6 @@ zh-TW:
|
|
649
618
|
past_meetings: 過去的會議
|
650
619
|
see_all: 檢視所有會議 (%{count})
|
651
620
|
upcoming_meetings: 即將到來的會議
|
652
|
-
upcoming_meeting_for_card:
|
653
|
-
upcoming_meeting: 即將到來的會議
|
654
621
|
resource_links:
|
655
622
|
meetings_through_proposals:
|
656
623
|
meeting_result: '相關結果:'
|
@@ -11,7 +11,7 @@ class FixMeetingsRegistrationTerms < ActiveRecord::Migration[5.2]
|
|
11
11
|
next if meeting.official?
|
12
12
|
|
13
13
|
# Since user-created meetings have no way to override the `registration_terms` field
|
14
|
-
# and it
|
14
|
+
# and it is supposed to use the component defaults,
|
15
15
|
# we can safely override this.
|
16
16
|
meeting.registration_terms = meeting.component.settings.default_registration_terms
|
17
17
|
meeting.save!
|
@@ -0,0 +1,49 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class ChangeTypesAndRegistrationTypesOnMeetings < ActiveRecord::Migration[6.1]
|
4
|
+
class Meeting < ApplicationRecord
|
5
|
+
self.table_name = :decidim_meetings_meetings
|
6
|
+
|
7
|
+
TYPE_OF_MEETING = { in_person: 0, online: 10, hybrid: 20 }.freeze
|
8
|
+
REGISTRATION_TYPES = { registration_disabled: 0, on_this_platform: 10, on_different_platform: 20 }.freeze
|
9
|
+
end
|
10
|
+
|
11
|
+
def up
|
12
|
+
rename_column :decidim_meetings_meetings, :type_of_meeting, :old_type_of_meeting
|
13
|
+
rename_column :decidim_meetings_meetings, :registration_type, :old_registration_type
|
14
|
+
add_column :decidim_meetings_meetings, :type_of_meeting, :integer, default: 0, null: false
|
15
|
+
add_column :decidim_meetings_meetings, :registration_type, :integer, default: 0, null: false
|
16
|
+
|
17
|
+
Meeting.reset_column_information
|
18
|
+
|
19
|
+
Meeting::TYPE_OF_MEETING.each_pair do |status, index|
|
20
|
+
Meeting.where(old_type_of_meeting: status).update_all(type_of_meeting: index) # rubocop:disable Rails/SkipsModelValidations
|
21
|
+
end
|
22
|
+
Meeting::REGISTRATION_TYPES.each_pair do |status, index|
|
23
|
+
Meeting.where(old_registration_type: status).update_all(registration_type: index) # rubocop:disable Rails/SkipsModelValidations
|
24
|
+
end
|
25
|
+
|
26
|
+
remove_column :decidim_meetings_meetings, :old_type_of_meeting
|
27
|
+
remove_column :decidim_meetings_meetings, :old_registration_type
|
28
|
+
end
|
29
|
+
|
30
|
+
def down
|
31
|
+
rename_column :decidim_meetings_meetings, :type_of_meeting, :old_type_of_meeting
|
32
|
+
rename_column :decidim_meetings_meetings, :registration_type, :old_registration_type
|
33
|
+
|
34
|
+
add_column :decidim_meetings_meetings, :type_of_meeting, :string, default: null
|
35
|
+
add_column :decidim_meetings_meetings, :registration_type, :string, default: null
|
36
|
+
|
37
|
+
Meeting.reset_column_information
|
38
|
+
|
39
|
+
Meeting::TYPE_OF_MEETING.each_pair do |status, index|
|
40
|
+
Meeting.where(old_type_of_meeting: index).update_all(type_of_meeting: status) # rubocop:disable Rails/SkipsModelValidations
|
41
|
+
end
|
42
|
+
Meeting::REGISTRATION_TYPES.each_pair do |status, index|
|
43
|
+
Meeting.where(old_registration_type: index).update_all(registration_type: status) # rubocop:disable Rails/SkipsModelValidations
|
44
|
+
end
|
45
|
+
|
46
|
+
remove_column :decidim_meetings_meetings, :old_type_of_meeting
|
47
|
+
remove_column :decidim_meetings_meetings, :old_registration_type
|
48
|
+
end
|
49
|
+
end
|
@@ -31,8 +31,8 @@ module Decidim
|
|
31
31
|
end
|
32
32
|
end
|
33
33
|
resources :agenda, except: [:index, :destroy]
|
34
|
-
resources :attachment_collections
|
35
|
-
resources :attachments
|
34
|
+
resources :attachment_collections, except: [:show]
|
35
|
+
resources :attachments, except: [:show]
|
36
36
|
resources :copies, controller: "meeting_copies", only: [:new, :create]
|
37
37
|
resource :poll, only: [:edit, :update], controller: "meetings_poll"
|
38
38
|
end
|