decidim-meetings 0.29.1 → 0.30.0.rc1
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/cancel_registration_meeting_button/cancelation_modal.erb +1 -1
- data/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb +3 -1
- data/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb +1 -1
- data/app/cells/decidim/meetings/dates_and_map/show.erb +6 -4
- data/app/cells/decidim/meetings/dates_and_map_cell.rb +1 -1
- data/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb +1 -1
- data/app/cells/decidim/meetings/join_meeting_button/show.erb +5 -2
- data/app/cells/decidim/meetings/meeting_card_metadata_cell.rb +3 -3
- data/app/cells/decidim/meetings/meeting_l_cell.rb +17 -0
- data/app/commands/decidim/meetings/admin/copy_meeting.rb +1 -2
- data/app/commands/decidim/meetings/admin/create_meeting.rb +8 -2
- data/app/commands/decidim/meetings/admin/update_meeting.rb +8 -2
- data/app/commands/decidim/meetings/create_meeting.rb +2 -2
- data/app/commands/decidim/meetings/update_meeting.rb +2 -3
- data/app/controllers/concerns/decidim/meetings/admin/filterable.rb +9 -5
- data/app/controllers/concerns/decidim/meetings/component_filterable.rb +1 -2
- data/app/controllers/decidim/meetings/admin/meetings_controller.rb +14 -22
- data/app/controllers/decidim/meetings/admin/registration_form_controller.rb +8 -0
- data/app/controllers/decidim/meetings/directory/meetings_controller.rb +2 -4
- data/app/controllers/decidim/meetings/meetings_controller.rb +40 -6
- data/app/forms/decidim/meetings/admin/close_meeting_form.rb +1 -1
- data/app/forms/decidim/meetings/admin/meeting_agenda_items_form.rb +1 -1
- data/app/forms/decidim/meetings/admin/meeting_form.rb +17 -31
- data/app/forms/decidim/meetings/admin/meeting_registrations_form.rb +2 -2
- data/app/forms/decidim/meetings/base_meeting_form.rb +6 -0
- data/app/forms/decidim/meetings/meeting_form.rb +2 -30
- data/app/helpers/decidim/meetings/admin/application_helper.rb +11 -1
- data/app/helpers/decidim/meetings/application_helper.rb +35 -1
- data/app/helpers/decidim/meetings/directory/application_helper.rb +9 -48
- data/app/helpers/decidim/meetings/meetings_helper.rb +5 -0
- data/app/models/decidim/meetings/invite.rb +10 -0
- data/app/models/decidim/meetings/meeting.rb +23 -1
- data/app/models/decidim/meetings/meeting_link.rb +25 -0
- data/app/packs/entrypoints/decidim_meetings_admin.js +1 -0
- data/app/packs/src/decidim/meetings/admin/meetings_components_form.js +77 -0
- data/app/packs/src/decidim/meetings/admin/meetings_form.js +8 -0
- data/app/packs/stylesheets/decidim/meetings/_item.scss +5 -17
- data/app/permissions/decidim/meetings/admin/permissions.rb +1 -1
- data/app/permissions/decidim/meetings/permissions.rb +20 -11
- data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb +1 -1
- data/app/presenters/decidim/meetings/meeting_presenter.rb +14 -6
- data/app/queries/decidim/meetings/filtered_meetings.rb +2 -2
- data/app/queries/decidim/meetings/metrics/meeting_followers_metric_measure.rb +2 -2
- data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb +6 -6
- data/app/serializers/decidim/meetings/base_download_your_data_serializer.rb +32 -0
- data/app/serializers/decidim/meetings/download_your_data_invite_serializer.rb +6 -26
- data/app/serializers/decidim/meetings/download_your_data_meeting_serializer.rb +15 -0
- data/app/serializers/decidim/meetings/download_your_data_registration_serializer.rb +6 -24
- data/app/views/decidim/meetings/admin/meetings/_component.html.erb +15 -0
- data/app/views/decidim/meetings/admin/meetings/_form.html.erb +7 -9
- data/app/views/decidim/meetings/admin/meetings/_linked_spaces.html.erb +53 -0
- data/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb +42 -0
- data/app/views/decidim/meetings/admin/meetings/_meeting_actions.html.erb +70 -0
- data/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb +26 -0
- data/app/views/decidim/meetings/admin/meetings/index.html.erb +16 -142
- data/app/views/decidim/meetings/admin/meetings/manage_trash.html.erb +23 -0
- data/app/views/decidim/meetings/admin/registration_form/edit_questions.html.erb +44 -0
- data/app/views/decidim/meetings/admin/registrations/edit.html.erb +1 -0
- data/app/views/decidim/meetings/directory/meetings/index.html.erb +1 -2
- data/app/views/decidim/meetings/live_events/show.html.erb +5 -5
- data/app/views/decidim/meetings/meetings/_form.html.erb +4 -8
- data/app/views/decidim/meetings/meetings/_meeting.html.erb +51 -26
- data/app/views/decidim/meetings/meetings/_meeting_actions.html.erb +34 -0
- data/app/views/decidim/meetings/meetings/_meeting_aside.html.erb +20 -59
- data/app/views/decidim/meetings/meetings/_meeting_poll_actions.html.erb +2 -5
- data/app/views/decidim/meetings/meetings/_schema_org_event_meeting.html.erb +3 -0
- data/app/views/decidim/meetings/meetings/index.html.erb +10 -2
- data/app/views/decidim/meetings/meetings/show.html.erb +5 -5
- data/app/views/decidim/meetings/polls/answers/index.html.erb +5 -5
- data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb +1 -1
- data/app/views/decidim/meetings/shared/_filters.html.erb +1 -13
- data/app/views/decidim/meetings/shared/_index.html.erb +1 -1
- data/app/views/decidim/meetings/shared/_index.js.erb +5 -5
- data/app/views/decidim/meetings/shared/_meetings_aside.html.erb +2 -2
- data/app/views/decidim/participatory_spaces/_conference_venues.html.erb +1 -1
- data/config/locales/ar.yml +17 -15
- data/config/locales/bg.yml +5 -26
- data/config/locales/bn-BD.yml +1 -0
- data/config/locales/bs-BA.yml +8 -0
- data/config/locales/ca.yml +137 -25
- data/config/locales/cs.yml +139 -28
- data/config/locales/de.yml +172 -92
- data/config/locales/el.yml +1 -20
- data/config/locales/en.yml +133 -21
- data/config/locales/es-MX.yml +137 -25
- data/config/locales/es-PY.yml +137 -25
- data/config/locales/es.yml +137 -25
- data/config/locales/eu.yml +167 -55
- data/config/locales/fi-plain.yml +138 -26
- data/config/locales/fi.yml +150 -38
- data/config/locales/fr-CA.yml +79 -26
- data/config/locales/fr.yml +79 -26
- data/config/locales/ga-IE.yml +0 -10
- data/config/locales/gl.yml +1 -8
- data/config/locales/hu.yml +1 -17
- data/config/locales/id-ID.yml +1 -5
- data/config/locales/is-IS.yml +0 -4
- data/config/locales/it.yml +1 -12
- data/config/locales/ja.yml +96 -26
- data/config/locales/lb.yml +0 -8
- data/config/locales/lt.yml +1 -24
- data/config/locales/lv.yml +1 -5
- data/config/locales/nl.yml +1 -15
- data/config/locales/no.yml +1 -14
- data/config/locales/pl.yml +5 -22
- data/config/locales/pt-BR.yml +1 -22
- data/config/locales/pt.yml +1 -12
- data/config/locales/ro-RO.yml +32 -16
- data/config/locales/ru.yml +1 -5
- data/config/locales/sk.yml +1 -5
- data/config/locales/sv.yml +74 -26
- data/config/locales/tr-TR.yml +1 -8
- data/config/locales/uk.yml +0 -4
- data/config/locales/zh-CN.yml +1 -8
- data/config/locales/zh-TW.yml +1 -19
- data/db/migrate/20181107175558_add_questionnaire_to_existing_meetings.rb +1 -1
- data/db/migrate/20200827153856_add_commentable_counter_cache_to_meetings.rb +1 -1
- data/db/migrate/20201016065302_fix_meetings_registration_terms.rb +1 -1
- data/db/migrate/20210310120731_add_followable_counter_cache_to_meetings.rb +1 -1
- data/db/migrate/20240712104245_create_decidim_meetings_meeting_link.rb +12 -0
- data/db/migrate/20240828103603_add_deleted_at_to_decidim_meetings_meetings.rb +8 -0
- data/decidim-meetings.gemspec +2 -2
- data/lib/decidim/api/agenda_item_type.rb +6 -7
- data/lib/decidim/api/agenda_type.rb +3 -4
- data/lib/decidim/api/meeting_type.rb +44 -40
- data/lib/decidim/api/meetings_type.rb +5 -8
- data/lib/decidim/api/service_type.rb +1 -1
- data/lib/decidim/meetings/admin_engine.rb +9 -1
- data/lib/decidim/meetings/component.rb +14 -4
- data/lib/decidim/meetings/download_your_data_user_answers_serializer.rb +13 -7
- data/lib/decidim/meetings/engine.rb +2 -0
- data/lib/decidim/meetings/meeting_serializer.rb +86 -38
- data/lib/decidim/meetings/schema_org_event_meeting_serializer.rb +151 -0
- data/lib/decidim/meetings/seeds.rb +2 -4
- data/lib/decidim/meetings/test/factories.rb +14 -0
- data/lib/decidim/meetings/test/translated_event.rb +3 -3
- data/lib/decidim/meetings/version.rb +1 -1
- data/lib/decidim/meetings.rb +1 -0
- metadata +35 -22
- data/app/cells/decidim/meetings/meetings_map/show.erb +0 -16
- data/app/cells/decidim/meetings/meetings_map_cell.rb +0 -32
- data/app/commands/decidim/meetings/admin/destroy_meeting.rb +0 -21
- data/app/helpers/decidim/meetings/map_helper.rb +0 -21
- data/app/views/decidim/meetings/meetings/_actions.html.erb +0 -6
data/config/locales/sv.yml
CHANGED
@@ -2,6 +2,8 @@
|
|
2
2
|
sv:
|
3
3
|
activemodel:
|
4
4
|
attributes:
|
5
|
+
answer:
|
6
|
+
add_documents: Lägg till dokument
|
5
7
|
close_meeting:
|
6
8
|
attendees_count: Antal deltagare
|
7
9
|
attending_organizations: Lista med organisationer som deltog
|
@@ -79,6 +81,10 @@ sv:
|
|
79
81
|
decidim/meetings/update_meeting_event: Möte uppdaterat
|
80
82
|
activerecord:
|
81
83
|
models:
|
84
|
+
decidim:
|
85
|
+
meetings:
|
86
|
+
meeting:
|
87
|
+
text: 'Diskuterades på det här mötet: %{link}'
|
82
88
|
decidim/meetings/meeting:
|
83
89
|
one: Möte
|
84
90
|
other: Möten
|
@@ -90,6 +96,9 @@ sv:
|
|
90
96
|
other: Registreringar
|
91
97
|
decidim:
|
92
98
|
admin:
|
99
|
+
admin_log:
|
100
|
+
changeset:
|
101
|
+
meetings: Möten
|
93
102
|
filters:
|
94
103
|
accepted_at_not_null:
|
95
104
|
label: Tackat ja
|
@@ -97,8 +106,6 @@ sv:
|
|
97
106
|
'false': Inte tackat ja
|
98
107
|
'true': Tackat ja
|
99
108
|
meetings:
|
100
|
-
category_id_eq:
|
101
|
-
label: Kategori
|
102
109
|
closed_at_present:
|
103
110
|
label: Status
|
104
111
|
values:
|
@@ -109,8 +116,8 @@ sv:
|
|
109
116
|
values:
|
110
117
|
'false': Tidigare
|
111
118
|
'true': Kommande
|
112
|
-
|
113
|
-
label:
|
119
|
+
taxonomies_part_of_contains:
|
120
|
+
label: Kategorisering
|
114
121
|
with_any_origin:
|
115
122
|
label: Ursprungligt
|
116
123
|
values:
|
@@ -152,22 +159,35 @@ sv:
|
|
152
159
|
settings:
|
153
160
|
global:
|
154
161
|
announcement: Meddelande
|
162
|
+
clear_all: Återställ
|
155
163
|
comments_enabled: Aktivera kommentarer
|
156
164
|
comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
|
157
165
|
creation_enabled_for_participants: Deltagarna kan skapa möten
|
158
166
|
default_registration_terms: Villkor för standardregistrering
|
167
|
+
define_taxonomy_filters: Vänligen definiera några filter för deltagarutrymmet innan du använder den här inställningen.
|
159
168
|
enable_pads_creation: Aktivera gemensamma anteckningar
|
160
169
|
maps_enabled: Aktivera visning på karta
|
170
|
+
no_taxonomy_filters_found: Inga filter för kategorier hittades.
|
161
171
|
registration_code_enabled: Aktivera registreringskod
|
162
172
|
resources_permissions_enabled: Behörigheter kan ställas in för varje möte
|
163
|
-
|
164
|
-
|
173
|
+
taxonomy_filters: Välj filter för komponenten
|
174
|
+
taxonomy_filters_add: Lägg till filter
|
165
175
|
terms_and_conditions_url_for_meeting_creators: URL till användarvillkor för de som skapar möten
|
166
176
|
step:
|
167
177
|
announcement: Meddelande
|
168
178
|
comments_blocked: Stäng av kommentarer
|
169
179
|
creation_enabled_for_participants: Låt deltagare skapa möten
|
170
180
|
creation_enabled_for_user_groups: Låt användargrupper skapa möten
|
181
|
+
download_your_data:
|
182
|
+
help:
|
183
|
+
registrations:
|
184
|
+
code: Anmälningskod
|
185
|
+
id: Unikt id för anmälan
|
186
|
+
meeting: Mötet som användaren anmälde sig till
|
187
|
+
user: Användaren som anmälde sig
|
188
|
+
show:
|
189
|
+
meeting_comments: Export av möteskommentarer
|
190
|
+
meetings: Exportera möten
|
171
191
|
events:
|
172
192
|
meetings:
|
173
193
|
meeting_closed:
|
@@ -221,7 +241,7 @@ sv:
|
|
221
241
|
badges:
|
222
242
|
attended_meetings:
|
223
243
|
conditions:
|
224
|
-
|
244
|
+
- Anmäl dig till de möten som du vill delta i
|
225
245
|
description: Du får detta märke när du har deltagit i flera fysiska möten.
|
226
246
|
description_another: Deltagaren har deltagit i %{score} möten.
|
227
247
|
description_own: Du har deltagit i %{score} möten.
|
@@ -235,8 +255,8 @@ sv:
|
|
235
255
|
attachment_collections: Mappar
|
236
256
|
attachments: Bifogade filer
|
237
257
|
close: Stäng
|
238
|
-
|
239
|
-
|
258
|
+
confirm_delete_meeting: Är du säker på att du vill radera mötet?
|
259
|
+
deleted_meetings_info: Borttagna möten kan återställas från papperskorgen.
|
240
260
|
edit: Redigera
|
241
261
|
invalid_destroy:
|
242
262
|
proposals_count:
|
@@ -247,6 +267,7 @@ sv:
|
|
247
267
|
preview: Förhandsvisa
|
248
268
|
registrations: Registreringar
|
249
269
|
title: Åtgärder
|
270
|
+
view_deleted_meetings: Visa raderade möten
|
250
271
|
admin:
|
251
272
|
agenda:
|
252
273
|
agenda_item:
|
@@ -311,15 +332,11 @@ sv:
|
|
311
332
|
close:
|
312
333
|
invalid: Det gick inte att avsluta mötet.
|
313
334
|
success: Mötet avslutades.
|
335
|
+
component:
|
336
|
+
unlink: Ta bort länkning
|
314
337
|
create:
|
315
338
|
invalid: Det gick inte att skapa mötet.
|
316
339
|
success: Mötet har skapats men är ännu inte publicerat, du måste publicera det manuellt.
|
317
|
-
destroy:
|
318
|
-
invalid:
|
319
|
-
proposals_count:
|
320
|
-
one: Mötet kan inte raderas eftersom det finns %{count} relaterat förslag.
|
321
|
-
other: Mötet kan inte raderas eftersom det finns %{count} relaterade förslag.
|
322
|
-
success: Mötet har tagits bort
|
323
340
|
edit:
|
324
341
|
title: Redigera möte
|
325
342
|
update: Uppdatera
|
@@ -335,7 +352,20 @@ sv:
|
|
335
352
|
select_a_registration_type: Välj sätt att registrera sig
|
336
353
|
select_an_iframe_access_level: Välj vem får tillgång till iframe
|
337
354
|
index:
|
355
|
+
linked_meeting_warning_html: Mötet måste redigeras från <br><a href="%{href}">%{name}</a>
|
338
356
|
title: Möten
|
357
|
+
linked_spaces:
|
358
|
+
assign: Tilldela
|
359
|
+
link_a_space: Länka en process
|
360
|
+
private_meeting_warning: Processer kan inte länkas om mötet är privat eller inte transparent.
|
361
|
+
private_space_warning: Processer kan inte länkas om mötet är privat eller inte transparent.
|
362
|
+
select: Välj en process
|
363
|
+
table:
|
364
|
+
actions: Åtgärder
|
365
|
+
component: Länkade processer
|
366
|
+
title: Länkade processer
|
367
|
+
manage_trash:
|
368
|
+
title: Borttagna möten
|
339
369
|
new:
|
340
370
|
create: Skapa
|
341
371
|
title: Skapa möte
|
@@ -367,10 +397,10 @@ sv:
|
|
367
397
|
poll:
|
368
398
|
form:
|
369
399
|
announcement_html:
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
|
400
|
+
- Det går inte längre att redigera en fråga som besvarats eller publicerats/stängts.
|
401
|
+
- Du kan lägga till en fråga när som helst.
|
402
|
+
- Enkäten kommer att stängas när resultaten från alla frågor har publicerats.
|
403
|
+
- Besök <a href='%{admin_link}'>administrationssidan för enkäten</a> för att skicka frågor och publicera resultat.
|
374
404
|
registrations:
|
375
405
|
edit:
|
376
406
|
save: Spara
|
@@ -379,6 +409,7 @@ sv:
|
|
379
409
|
form:
|
380
410
|
available_slots_help: Lämna det till 0 om du har obegränsade platser.
|
381
411
|
invites: Inbjudningar
|
412
|
+
manage_questions: Hantera frågor
|
382
413
|
recommendation_message: Av sekretesskäl rekommenderar vi att du tar bort anmälningsformuläret när det inte längre används. Som standard är det 3 månader efter att mötet avslutats.
|
383
414
|
registration_email_help: Texten visas i e-postmeddelandet med registreringsbekräftelsen, efter registreringskoden.
|
384
415
|
registration_form: Anmälningsformulär
|
@@ -404,6 +435,8 @@ sv:
|
|
404
435
|
create: "%{user_name} skapade mötet %{resource_name} för %{space_name}"
|
405
436
|
delete: "%{user_name} raderade mötet %{resource_name} för %{space_name}"
|
406
437
|
export_registrations: "%{user_name} exporterade anmälningarna till mötet %{resource_name} för %{space_name}"
|
438
|
+
restore: "%{user_name} återställde mötet %{resource_name} i %{space_name}"
|
439
|
+
soft_delete: "%{user_name} flyttade mötet %{resource_name} i %{space_name} till papperskorgen"
|
407
440
|
update: "%{user_name} uppdaterade mötet %{resource_name} för %{space_name}"
|
408
441
|
value_types:
|
409
442
|
organizer_presenter:
|
@@ -411,8 +444,6 @@ sv:
|
|
411
444
|
questionnaire:
|
412
445
|
update: "%{user_name} uppdaterade enkäten för mötet %{meeting_name}"
|
413
446
|
application_helper:
|
414
|
-
filter_category_values:
|
415
|
-
all: Alla
|
416
447
|
filter_meeting_space_values:
|
417
448
|
all: Alla
|
418
449
|
calendar:
|
@@ -522,7 +553,6 @@ sv:
|
|
522
553
|
location_hints_help: 'Ytterligare vägbeskrivning. Till exempel till en lokal eller lösenord till ett digitalt möte.'
|
523
554
|
online_meeting_url_help: 'Länk: låt deltagare ansluta sig direkt till mötet'
|
524
555
|
registration_url_help: 'Länk: låt deltagare registrera sig via en extern tjänst'
|
525
|
-
select_a_category: Välj en kategori
|
526
556
|
select_a_meeting_type: Välj typ av möte
|
527
557
|
select_a_registration_type: Välj sätt att registrera sig
|
528
558
|
select_an_iframe_access_level: Välj vem som får tillgång till iframe
|
@@ -533,9 +563,9 @@ sv:
|
|
533
563
|
see_all_withdrawn: Visa alla inställda möten
|
534
564
|
text_banner: Du visar möten som ställts in av sin arrangör. %{go_back_link}.
|
535
565
|
meeting:
|
536
|
-
close_meeting:
|
566
|
+
close_meeting: Stäng
|
537
567
|
edit_close_meeting: Redigera mötesrapport
|
538
|
-
edit_meeting: Redigera
|
568
|
+
edit_meeting: Redigera
|
539
569
|
join_meeting: Gå med i mötet
|
540
570
|
reply_poll: Svarsenkät
|
541
571
|
view_poll: Visa enkät
|
@@ -562,6 +592,7 @@ sv:
|
|
562
592
|
micro_camera_permissions_warning: När du klickar på knappen nedan kommer du att bli ombedd att godkänna att webbplatsen använder din mikrofon och/eller kamera och du kommer att ansluta till videokonferensen
|
563
593
|
no_slots_available: Inga platser kvar
|
564
594
|
organizations: Delta i organisationer
|
595
|
+
redirect_notice: Mötet är en del av ett annat utrymme, så du har flyttats till %{current_space_name}. <br>Om du vill kan du gå tillbaka till <a href="%{previous_space_url}">%{previous_space_name}</a>.
|
565
596
|
registration_code_help_text: Din registreringskod
|
566
597
|
registration_state:
|
567
598
|
validated: VALIDERAD
|
@@ -572,7 +603,7 @@ sv:
|
|
572
603
|
visit_finished: Visa tidigare möten
|
573
604
|
withdraw_btn_hint: Du kan ställa in mötet om du ändrar dig. Mötet raderas inte utan kommer att synas i en lista med inställda möten.
|
574
605
|
withdraw_confirmation_html: Är du säker på att du vill ställa in mötet?<br><br><strong>Den här åtgärden kan inte ångras!</strong>
|
575
|
-
withdraw_meeting:
|
606
|
+
withdraw_meeting: Dra tillbaka
|
576
607
|
update:
|
577
608
|
invalid: Det gick inte att uppdatera mötet.
|
578
609
|
success: Du har uppdaterat mötet.
|
@@ -595,6 +626,7 @@ sv:
|
|
595
626
|
map: Karta
|
596
627
|
official_meeting: Officiellt möte
|
597
628
|
start_time: Startdatum
|
629
|
+
taxonomies: Kategorisering
|
598
630
|
title: Titel
|
599
631
|
polls:
|
600
632
|
answers:
|
@@ -664,13 +696,28 @@ sv:
|
|
664
696
|
transparent: Transparent
|
665
697
|
withdraw: Inställda
|
666
698
|
withdraw:
|
667
|
-
error:
|
699
|
+
error: Det gick inte att ställa in mötet.
|
668
700
|
success: Mötet har ställts in.
|
669
701
|
metrics:
|
670
702
|
meetings:
|
671
703
|
description: Antal skapade möten
|
672
704
|
object: möten
|
673
705
|
title: Möten
|
706
|
+
open_data:
|
707
|
+
help:
|
708
|
+
meeting_comments:
|
709
|
+
alignment: Positiva, negativa eller neutrala kommentarer
|
710
|
+
author: Namn på den som kommenterat
|
711
|
+
body: Kommentaren
|
712
|
+
commentable_id: Kommentarens unika id
|
713
|
+
commentable_type: Vad som kommenterades (resultat, förslag etc)
|
714
|
+
comments: Uppgifter om kommentarer från mötet
|
715
|
+
created_at: Datum för kommentaren
|
716
|
+
depth: Kommentarens plats i en hierarki av kommentarer (om den är ett svar på en annan kommentar)
|
717
|
+
id: Id för kommentaren
|
718
|
+
locale: Kommentarförfattarens språk
|
719
|
+
root_commentable_url: URL till innehållet för kommentaren
|
720
|
+
user_group: Namn på gruppen som kommenterat (om det var en grupp)
|
674
721
|
participatory_spaces:
|
675
722
|
highlighted_meetings:
|
676
723
|
past_meetings: Tidigare möten
|
@@ -684,6 +731,7 @@ sv:
|
|
684
731
|
meeting_proposal: 'Relaterade förslag:'
|
685
732
|
proposal_meeting: 'Relaterade möten:'
|
686
733
|
statistics:
|
734
|
+
attendees_count: Mötesdeltagare
|
687
735
|
meetings_count: Möten
|
688
736
|
devise:
|
689
737
|
mailer:
|
data/config/locales/tr-TR.yml
CHANGED
@@ -73,8 +73,6 @@ tr:
|
|
73
73
|
enable_pads_creation: Altlık oluşturmayı etkinleştirin
|
74
74
|
registration_code_enabled: Kayıt kodu etkinleştirildi
|
75
75
|
resources_permissions_enabled: Her toplantı için işlem izinleri ayarlanabilir
|
76
|
-
scope_id: Kapsam
|
77
|
-
scopes_enabled: Kapsamlar etkinleştirildi
|
78
76
|
terms_and_conditions_url_for_meeting_creators: Toplantı oluşturucuları için şartlar ve koşullar URL'si
|
79
77
|
step:
|
80
78
|
announcement: Duyuru
|
@@ -130,7 +128,7 @@ tr:
|
|
130
128
|
badges:
|
131
129
|
attended_meetings:
|
132
130
|
conditions:
|
133
|
-
|
131
|
+
- Katılmak istediğiniz toplantılara kayıt olun
|
134
132
|
description: Yüz yüze yapılan toplantılara katıldığınızda bu rozet verilir.
|
135
133
|
description_another: Bu katılımcı %{score} toplantıya katılmıştır.
|
136
134
|
description_own: '%{score} toplantıya katıldınız.'
|
@@ -142,8 +140,6 @@ tr:
|
|
142
140
|
attachment_collections: Klasörler
|
143
141
|
attachments: Ekler
|
144
142
|
close: Kapat
|
145
|
-
confirm_destroy: Bu toplantıyı silmek istediğinizden emin misiniz?
|
146
|
-
destroy: Sil
|
147
143
|
edit: Düzenle
|
148
144
|
invalid_destroy:
|
149
145
|
proposals_count:
|
@@ -206,8 +202,6 @@ tr:
|
|
206
202
|
close: Kapat
|
207
203
|
title: Toplantıyı kapat
|
208
204
|
meetings:
|
209
|
-
destroy:
|
210
|
-
success: Toplantı başarıyla silindi
|
211
205
|
edit:
|
212
206
|
title: Toplantıyı Düzenle
|
213
207
|
update: Güncelle
|
@@ -330,7 +324,6 @@ tr:
|
|
330
324
|
location_hints_help: 'Konum ipuçları: ek bilgi. Örnek: Yüz yüze bir toplantıysa binanın katı veya kısıtlı erişime sahip çevrimiçi bir toplantıysa toplantı parolası.'
|
331
325
|
online_meeting_url_help: 'Bağlantı: katılımcıların toplantınıza doğrudan bağlanmasına izin verin'
|
332
326
|
registration_url_help: 'Bağlantı: katılımcıların kayıtlar için kullandığınız harici hizmete girmesine izin verin'
|
333
|
-
select_a_category: Lütfen bir kategori seçin
|
334
327
|
select_a_meeting_type: Lütfen bir toplantı türü seçin
|
335
328
|
select_a_registration_type: Lütfen bir kayıt türü seçin
|
336
329
|
index:
|
data/config/locales/uk.yml
CHANGED
@@ -114,8 +114,6 @@ uk:
|
|
114
114
|
attachment_collections: Теки
|
115
115
|
attachments: Вкладені файли
|
116
116
|
close: Закрити
|
117
|
-
confirm_destroy: Ви впевнені, що хочете видалити цю зустріч?
|
118
|
-
destroy: Видалити
|
119
117
|
edit: Редагувати
|
120
118
|
preview: Попередній перегляд
|
121
119
|
registrations: Реєстрації
|
@@ -171,8 +169,6 @@ uk:
|
|
171
169
|
close: Закрити
|
172
170
|
title: Закрити зустріч
|
173
171
|
meetings:
|
174
|
-
destroy:
|
175
|
-
success: Зустріч успішно видалено
|
176
172
|
edit:
|
177
173
|
update: Оновити
|
178
174
|
index:
|
data/config/locales/zh-CN.yml
CHANGED
@@ -64,8 +64,6 @@ zh-CN:
|
|
64
64
|
default_registration_terms: 默认注册条款
|
65
65
|
enable_pads_creation: 启用页面创建
|
66
66
|
resources_permissions_enabled: 每次会议都可以设置动作权限
|
67
|
-
scope_id: 范围
|
68
|
-
scopes_enabled: 范围已启用
|
69
67
|
step:
|
70
68
|
announcement: 通 知
|
71
69
|
comments_blocked: 评论已阻止
|
@@ -120,7 +118,7 @@ zh-CN:
|
|
120
118
|
badges:
|
121
119
|
attended_meetings:
|
122
120
|
conditions:
|
123
|
-
|
121
|
+
- 注册您想要参加的会议
|
124
122
|
description: 当你参加几次面对面的会议时颁发这个徽章。
|
125
123
|
description_another: 此参与者已经参加了 %{score} 次会议。
|
126
124
|
description_own: 您已经参加了 %{score} 次会议。
|
@@ -132,8 +130,6 @@ zh-CN:
|
|
132
130
|
attachment_collections: 文件夹
|
133
131
|
attachments: 附件
|
134
132
|
close: 关闭
|
135
|
-
confirm_destroy: 您确定要删除这个会议吗?
|
136
|
-
destroy: 删除
|
137
133
|
edit: 编辑
|
138
134
|
invalid_destroy:
|
139
135
|
proposals_count:
|
@@ -193,8 +189,6 @@ zh-CN:
|
|
193
189
|
close: 关闭
|
194
190
|
title: 关闭会议
|
195
191
|
meetings:
|
196
|
-
destroy:
|
197
|
-
success: 会议已成功删除
|
198
192
|
edit:
|
199
193
|
update: 更新
|
200
194
|
form:
|
@@ -292,7 +286,6 @@ zh-CN:
|
|
292
286
|
address_help: '地址:由地理编码器用来查找位置'
|
293
287
|
create_as: 创建会议为
|
294
288
|
location_help: '位置:发送给用户的消息,这些消息暗示要会见的地点'
|
295
|
-
select_a_category: 请选择一个类别
|
296
289
|
index:
|
297
290
|
new_meeting: 新会议
|
298
291
|
meetings:
|
data/config/locales/zh-TW.yml
CHANGED
@@ -85,8 +85,6 @@ zh-TW:
|
|
85
85
|
admin:
|
86
86
|
filters:
|
87
87
|
meetings:
|
88
|
-
category_id_eq:
|
89
|
-
label: 分類
|
90
88
|
closed_at_present:
|
91
89
|
label: 狀態
|
92
90
|
values:
|
@@ -97,8 +95,6 @@ zh-TW:
|
|
97
95
|
values:
|
98
96
|
'false': 過去
|
99
97
|
'true': 即將舉行
|
100
|
-
scope_id_eq:
|
101
|
-
label: 範圍
|
102
98
|
with_any_origin:
|
103
99
|
label: 起源
|
104
100
|
values:
|
@@ -135,8 +131,6 @@ zh-TW:
|
|
135
131
|
maps_enabled: 啟用地圖
|
136
132
|
registration_code_enabled: 啟用註冊碼
|
137
133
|
resources_permissions_enabled: 可以針對每個會議設定操作權限
|
138
|
-
scope_id: 範圍
|
139
|
-
scopes_enabled: 啟用範圍
|
140
134
|
terms_and_conditions_url_for_meeting_creators: 會議創建者的使用條款和條件 URL
|
141
135
|
step:
|
142
136
|
announcement: 公告
|
@@ -196,7 +190,7 @@ zh-TW:
|
|
196
190
|
badges:
|
197
191
|
attended_meetings:
|
198
192
|
conditions:
|
199
|
-
|
193
|
+
- 註冊您想參加的會議
|
200
194
|
description: 這個徽章是當您參加多個面對面會議時獲得的。
|
201
195
|
description_another: 此參與者已經參加了 %{score} 場會議。
|
202
196
|
description_own: 您已經參加了 %{score} 場會議。
|
@@ -210,8 +204,6 @@ zh-TW:
|
|
210
204
|
attachment_collections: 資料夾
|
211
205
|
attachments: 附件
|
212
206
|
close: 關閉
|
213
|
-
confirm_destroy: 你確定要刪除此會議?
|
214
|
-
destroy: 刪除
|
215
207
|
edit: 編輯
|
216
208
|
invalid_destroy:
|
217
209
|
proposals_count:
|
@@ -287,11 +279,6 @@ zh-TW:
|
|
287
279
|
create:
|
288
280
|
invalid: 建立會議時發生問題.
|
289
281
|
success: 會議已成功建立。請注意這仍未發佈,您需要手動發佈。
|
290
|
-
destroy:
|
291
|
-
invalid:
|
292
|
-
proposals_count:
|
293
|
-
other: 該會議因有 %{count} 個相關提案而無法刪除.
|
294
|
-
success: 會議已成功刪除
|
295
282
|
edit:
|
296
283
|
title: 編輯會議
|
297
284
|
update: 更新
|
@@ -374,8 +361,6 @@ zh-TW:
|
|
374
361
|
questionnaire:
|
375
362
|
update: "%{user_name} 更新了 %{meeting_name} 會議的問卷"
|
376
363
|
application_helper:
|
377
|
-
filter_category_values:
|
378
|
-
all: 全部
|
379
364
|
filter_meeting_space_values:
|
380
365
|
all: 全部
|
381
366
|
calendar_modal:
|
@@ -477,7 +462,6 @@ zh-TW:
|
|
477
462
|
location_hints_help: '地點提示:額外的訊息。例如,如果是面對面的會議,可以提供建築物樓層的資訊;如果是限制存取權限的線上會議,可以提供會議密碼的資訊。'
|
478
463
|
online_meeting_url_help: '連結:允許參與者直接連接到您的會議'
|
479
464
|
registration_url_help: '連結:允許參與者進入您用於註冊的外部服務'
|
480
|
-
select_a_category: 請選擇一個類別
|
481
465
|
select_a_meeting_type: 請選擇一種會議類型。
|
482
466
|
select_a_registration_type: 請選擇一種註冊類型
|
483
467
|
select_an_iframe_access_level: 請選擇一個 iframe 存取級別
|
@@ -519,7 +503,6 @@ zh-TW:
|
|
519
503
|
visit_finished: 查看過去的會議
|
520
504
|
withdraw_btn_hint: 您可以撤回您的會議,如果您改變了主意。會議不會被刪除,而是會顯示在已撤回的會議列表中。
|
521
505
|
withdraw_confirmation_html: 您確定要撤回此會議嗎?<br><br><strong>此操作無法取消!</strong>
|
522
|
-
withdraw_meeting: 撤回會議
|
523
506
|
update:
|
524
507
|
invalid: 更新會議時發生問題.
|
525
508
|
success: 您已成功更新會議。
|
@@ -593,7 +576,6 @@ zh-TW:
|
|
593
576
|
transparent: 透明
|
594
577
|
withdraw: 撤回
|
595
578
|
withdraw:
|
596
|
-
error: 退出會議時發生錯誤.
|
597
579
|
success: 會議已成功撤回.
|
598
580
|
metrics:
|
599
581
|
meetings:
|
@@ -3,7 +3,7 @@
|
|
3
3
|
class AddQuestionnaireToExistingMeetings < ActiveRecord::Migration[5.2]
|
4
4
|
def change
|
5
5
|
Decidim::Meetings::Meeting.transaction do
|
6
|
-
Decidim::Meetings::Meeting.find_each do |meeting|
|
6
|
+
Decidim::Meetings::Meeting.unscoped.find_each do |meeting|
|
7
7
|
if meeting.component.present? && meeting.questionnaire.blank?
|
8
8
|
meeting.update!(
|
9
9
|
questionnaire: Decidim::Forms::Questionnaire.new
|
@@ -4,6 +4,6 @@ class AddCommentableCounterCacheToMeetings < ActiveRecord::Migration[5.2]
|
|
4
4
|
def change
|
5
5
|
add_column :decidim_meetings_meetings, :comments_count, :integer, null: false, default: 0
|
6
6
|
Decidim::Meetings::Meeting.reset_column_information
|
7
|
-
Decidim::Meetings::Meeting.find_each(&:update_comments_count)
|
7
|
+
Decidim::Meetings::Meeting.unscoped.find_each(&:update_comments_count)
|
8
8
|
end
|
9
9
|
end
|
@@ -5,7 +5,7 @@ class FixMeetingsRegistrationTerms < ActiveRecord::Migration[5.2]
|
|
5
5
|
reset_column_information
|
6
6
|
|
7
7
|
PaperTrail.request(enabled: false) do
|
8
|
-
Decidim::Meetings::Meeting.find_each do |meeting|
|
8
|
+
Decidim::Meetings::Meeting.unscoped.find_each do |meeting|
|
9
9
|
next if meeting.component.nil?
|
10
10
|
# Only user-created meetings have this problem
|
11
11
|
next if meeting.official?
|
@@ -7,7 +7,7 @@ class AddFollowableCounterCacheToMeetings < ActiveRecord::Migration[5.2]
|
|
7
7
|
reversible do |dir|
|
8
8
|
dir.up do
|
9
9
|
Decidim::Meetings::Meeting.reset_column_information
|
10
|
-
Decidim::Meetings::Meeting.find_each do |record|
|
10
|
+
Decidim::Meetings::Meeting.unscoped.find_each do |record|
|
11
11
|
record.class.reset_counters(record.id, :follows)
|
12
12
|
end
|
13
13
|
end
|
@@ -0,0 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class CreateDecidimMeetingsMeetingLink < ActiveRecord::Migration[7.0]
|
4
|
+
def change
|
5
|
+
create_table :decidim_meetings_meeting_links do |t|
|
6
|
+
t.references :decidim_component, null: false, index: true
|
7
|
+
t.references :decidim_meeting, null: false, index: true
|
8
|
+
|
9
|
+
t.timestamps
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
data/decidim-meetings.gemspec
CHANGED
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
|
|
10
10
|
s.version = Decidim::Meetings.version
|
11
11
|
s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
|
12
12
|
s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
|
13
|
-
s.license = "AGPL-3.0"
|
13
|
+
s.license = "AGPL-3.0-or-later"
|
14
14
|
s.homepage = "https://decidim.org"
|
15
15
|
s.metadata = {
|
16
16
|
"bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
|
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
|
|
19
19
|
"homepage_uri" => "https://decidim.org",
|
20
20
|
"source_code_uri" => "https://github.com/decidim/decidim"
|
21
21
|
}
|
22
|
-
s.required_ruby_version = "~> 3.
|
22
|
+
s.required_ruby_version = "~> 3.3.0"
|
23
23
|
|
24
24
|
s.name = "decidim-meetings"
|
25
25
|
s.summary = "Decidim meetings module"
|
@@ -3,20 +3,19 @@
|
|
3
3
|
module Decidim
|
4
4
|
module Meetings
|
5
5
|
class AgendaItemType < Decidim::Api::Types::BaseObject
|
6
|
+
implements Decidim::Core::TimestampsInterface
|
7
|
+
|
6
8
|
graphql_name "MeetingAgendaItem"
|
7
9
|
description "A meeting agenda item"
|
8
10
|
|
9
|
-
field :
|
10
|
-
field :title, Decidim::Core::TranslatedFieldType, "The title for this agenda item", null: true
|
11
|
+
field :agenda, Decidim::Meetings::AgendaType, "Belonging agenda", null: true
|
11
12
|
field :description, Decidim::Core::TranslatedFieldType, "The description for this agenda item", null: true
|
13
|
+
field :duration, GraphQL::Types::Int, "Duration in number of minutes for this item in this agenda", null: false
|
14
|
+
field :id, GraphQL::Types::ID, "The ID for this agenda item", null: false
|
12
15
|
field :items, [Decidim::Meetings::AgendaItemType, { null: true }], "Sub-items (children) of this agenda item", method: :agenda_item_children, null: false
|
13
16
|
field :parent, Decidim::Meetings::AgendaItemType, "Parent agenda item, if available", null: true
|
14
|
-
field :agenda, Decidim::Meetings::AgendaType, "Belonging agenda", null: true
|
15
|
-
field :duration, GraphQL::Types::Int, "Duration in number of minutes for this item in this agenda", null: false
|
16
17
|
field :position, GraphQL::Types::Int, "Order position for this agenda item", null: false
|
17
|
-
|
18
|
-
field :created_at, Decidim::Core::DateTimeType, description: "The date and time this agenda item was created", null: true
|
19
|
-
field :updated_at, Decidim::Core::DateTimeType, description: "The date and time this agenda item was updated", null: true
|
18
|
+
field :title, Decidim::Core::TranslatedFieldType, "The title for this agenda item", null: true
|
20
19
|
end
|
21
20
|
end
|
22
21
|
end
|
@@ -3,17 +3,16 @@
|
|
3
3
|
module Decidim
|
4
4
|
module Meetings
|
5
5
|
class AgendaType < Decidim::Api::Types::BaseObject
|
6
|
+
implements Decidim::Core::TimestampsInterface
|
7
|
+
|
6
8
|
graphql_name "MeetingAgenda"
|
7
9
|
description "A meeting agenda"
|
8
10
|
|
9
11
|
field :id, GraphQL::Types::ID, "The ID for the agenda", null: false
|
10
|
-
field :title, Decidim::Core::TranslatedFieldType, "The title for the agenda", null: true
|
11
12
|
field :items, [Decidim::Meetings::AgendaItemType, { null: true }], "Items and sub-items of the agenda", method: :agenda_items, null: false
|
13
|
+
field :title, Decidim::Core::TranslatedFieldType, "The title for the agenda", null: true
|
12
14
|
# probably useful in the future, when handling user permissions
|
13
15
|
# field :visible, !types.Boolean, "Whether this minutes is public or not", property: :visible
|
14
|
-
|
15
|
-
field :created_at, Decidim::Core::DateTimeType, description: "The date and time this agenda was created", null: true
|
16
|
-
field :updated_at, Decidim::Core::DateTimeType, description: "The date and time this agenda was updated", null: true
|
17
16
|
end
|
18
17
|
end
|
19
18
|
end
|