decidim-core 0.30.0.rc2 → 0.30.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/cells/decidim/amendable/amendments/show.erb +1 -1
- data/app/cells/decidim/participatory_space_dropdown_metadata/show.erb +5 -3
- data/app/cells/decidim/profile_actions/show.erb +1 -1
- data/app/cells/decidim/report_button/already_reported_modal.erb +2 -2
- data/app/cells/decidim/report_button/flag_modal.erb +13 -27
- data/app/cells/decidim/report_button_cell.rb +2 -8
- data/app/cells/decidim/report_user_button/already_reported_modal.erb +11 -0
- data/app/cells/decidim/report_user_button/flag_modal.erb +46 -0
- data/app/cells/decidim/report_user_button/show.erb +2 -0
- data/app/cells/decidim/report_user_button_cell.rb +59 -0
- data/app/cells/decidim/resource_types_filter/show.erb +1 -1
- data/app/cells/decidim/resource_types_filter_cell.rb +6 -6
- data/app/cells/decidim/user_activity/show.erb +1 -1
- data/app/commands/decidim/create_omniauth_registration.rb +14 -8
- data/app/commands/decidim/create_report.rb +1 -6
- data/app/commands/decidim/search.rb +14 -0
- data/app/controllers/decidim/profiles_controller.rb +2 -2
- data/app/controllers/decidim/reports_controller.rb +1 -1
- data/app/controllers/decidim/user_activities_controller.rb +1 -1
- data/app/forms/decidim/account_form.rb +5 -2
- data/app/jobs/decidim/hide_child_resources_job.rb +3 -3
- data/app/jobs/decidim/migrate/paper_trail_job.rb +33 -0
- data/app/mailers/decidim/reported_mailer.rb +1 -0
- data/app/models/decidim/action_log.rb +1 -9
- data/app/models/decidim/user.rb +0 -4
- data/app/models/decidim/user_base_entity.rb +4 -0
- data/app/packs/src/decidim/datepicker/datepicker_functions.js +3 -3
- data/app/packs/src/decidim/index.js +4 -2
- data/app/packs/src/decidim/sticky_footer.js +19 -0
- data/app/packs/stylesheets/decidim/_cards.scss +4 -0
- data/app/packs/stylesheets/decidim/_content_blocks.scss +5 -1
- data/app/packs/stylesheets/decidim/_header.scss +6 -2
- data/app/packs/stylesheets/decidim/_login.scss +4 -0
- data/app/packs/stylesheets/decidim/_modal_authorization.scss +1 -1
- data/app/packs/stylesheets/decidim/_profile.scss +1 -1
- data/app/presenters/decidim/log/user_presenter.rb +1 -0
- data/app/presenters/decidim/user_presenter.rb +1 -1
- data/app/resolvers/decidim/meta_image_url_resolver.rb +1 -0
- data/app/services/decidim/base_diff_renderer.rb +2 -0
- data/app/services/decidim/static_map_generator.rb +1 -1
- data/app/views/decidim/devise/registrations/new.html.erb +1 -1
- data/app/views/decidim/devise/sessions/new.html.erb +1 -1
- data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb +1 -1
- data/app/views/decidim/last_activities/index.html.erb +1 -1
- data/app/views/decidim/open_data/index.html.erb +1 -1
- data/app/views/decidim/reported_mailer/hide.html.erb +17 -1
- data/app/views/decidim/reported_mailer/report.html.erb +1 -1
- data/app/views/decidim/searches/_count.html.erb +1 -1
- data/app/views/decidim/searches/_filters.html.erb +40 -38
- data/app/views/layouts/decidim/footer/_main_legal.html.erb +1 -1
- data/config/locales/ar.yml +15 -28
- data/config/locales/bg.yml +10 -24
- data/config/locales/bs-BA.yml +2 -0
- data/config/locales/ca-IT.yml +2400 -0
- data/config/locales/ca.yml +43 -35
- data/config/locales/cs.yml +25 -32
- data/config/locales/de.yml +19 -25
- data/config/locales/el.yml +10 -15
- data/config/locales/en.yml +24 -16
- data/config/locales/eo.yml +2 -0
- data/config/locales/es-MX.yml +39 -31
- data/config/locales/es-PY.yml +44 -36
- data/config/locales/es.yml +42 -34
- data/config/locales/eu.yml +104 -98
- data/config/locales/fi-plain.yml +14 -28
- data/config/locales/fi.yml +15 -29
- data/config/locales/fr-CA.yml +74 -24
- data/config/locales/fr.yml +73 -23
- data/config/locales/ga-IE.yml +4 -4
- data/config/locales/gl.yml +25 -14
- data/config/locales/hu.yml +9 -23
- data/config/locales/id-ID.yml +24 -15
- data/config/locales/is-IS.yml +10 -0
- data/config/locales/it.yml +34 -26
- data/config/locales/ja.yml +188 -27
- data/config/locales/lb.yml +24 -22
- data/config/locales/lt.yml +5 -17
- data/config/locales/lv.yml +18 -15
- data/config/locales/nl.yml +22 -17
- data/config/locales/no.yml +18 -16
- data/config/locales/pl.yml +6 -20
- data/config/locales/pt-BR.yml +11 -24
- data/config/locales/pt.yml +18 -16
- data/config/locales/ro-RO.yml +187 -20
- data/config/locales/ru.yml +23 -8
- data/config/locales/sk.yml +29 -18
- data/config/locales/sr-CS.yml +2 -0
- data/config/locales/sv.yml +30 -26
- data/config/locales/tr-TR.yml +24 -23
- data/config/locales/uk.yml +12 -1
- data/config/locales/zh-CN.yml +18 -15
- data/config/locales/zh-TW.yml +8 -16
- data/db/migrate/20240722215500_change_object_changes_on_versions.rb +4 -24
- data/lib/decidim/asset_router/storage.rb +7 -2
- data/lib/decidim/attributes/time_with_zone.rb +5 -1
- data/lib/decidim/content_parsers/blob_parser.rb +10 -8
- data/lib/decidim/content_parsers/user_parser.rb +1 -1
- data/lib/decidim/core/test/shared_examples/reports_examples.rb +8 -15
- data/lib/decidim/core/test/shared_examples/uncommentable_component_examples.rb +26 -0
- data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +26 -0
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/map/provider/static_map/here.rb +34 -0
- data/lib/decidim/moderation_tools.rb +14 -8
- data/lib/decidim/nicknamizable.rb +1 -1
- data/lib/decidim/participatory_space_user.rb +1 -3
- data/lib/decidim/reportable.rb +6 -2
- data/lib/decidim/translatable_attributes.rb +5 -1
- data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +23 -20
- metadata +12 -14
- data/app/cells/decidim/author/flag.erb +0 -6
- data/app/cells/decidim/author/flag_user.erb +0 -14
- data/app/cells/decidim/flag_modal/flag_user.erb +0 -34
- data/app/cells/decidim/flag_modal/show.erb +0 -52
- data/app/cells/decidim/flag_modal_cell.rb +0 -56
- data/app/cells/decidim/profile_sidebar/show.erb +0 -167
- data/app/cells/decidim/profile_sidebar_cell.rb +0 -68
- data/lib/tasks/upgrade/clean_hidden_resources.rake +0 -33
data/config/locales/sk.yml
CHANGED
@@ -23,6 +23,8 @@ sk:
|
|
23
23
|
password_confirmation: Potvrdenie hesla
|
24
24
|
personal_url: Osobné adresa URL
|
25
25
|
remove_avatar: Odstrániť avatara
|
26
|
+
user_group:
|
27
|
+
avatar: Avatar
|
26
28
|
models:
|
27
29
|
decidim/attachment_created_event: Príloha
|
28
30
|
decidim/component_published_event: Aktívna súčasť
|
@@ -330,6 +332,8 @@ sk:
|
|
330
332
|
view_all: Zobraziť všetko
|
331
333
|
metrics:
|
332
334
|
name: Štatistika organizácie
|
335
|
+
participatory_space_metrics:
|
336
|
+
name: Metriky
|
333
337
|
stats:
|
334
338
|
name: Štatistiky organizácie
|
335
339
|
sub_hero:
|
@@ -560,7 +564,7 @@ sk:
|
|
560
564
|
current_admins: 'Aktuálni administrátori:'
|
561
565
|
manage_admins: Správa administrátorov
|
562
566
|
group_invites:
|
563
|
-
accept_invitation:
|
567
|
+
accept_invitation: Prijať
|
564
568
|
accept_or_reject_group_invitations: 'Nasledujúce skupiny vás pozvali, aby ste sa k nim pripojili. Prijať alebo odmietnuť ich požiadavky: '
|
565
569
|
index:
|
566
570
|
invite: Pozvať
|
@@ -591,8 +595,8 @@ sk:
|
|
591
595
|
success: Skupina úspěšně opustila.
|
592
596
|
members:
|
593
597
|
accept_or_reject_join_requests: 'Následující uživatelé se připojili k této skupině. Přijmout nebo odmítnout jejich požadavky:'
|
594
|
-
accept_request:
|
595
|
-
reject_request:
|
598
|
+
accept_request: Prijať
|
599
|
+
reject_request: Odmietnuť
|
596
600
|
new:
|
597
601
|
create_user_group: Vytvořit skupinu
|
598
602
|
new_user_group: Nová skupina
|
@@ -635,10 +639,18 @@ sk:
|
|
635
639
|
home: Domov
|
636
640
|
messaging:
|
637
641
|
conversation_mailer:
|
642
|
+
comanagers_new_conversation:
|
643
|
+
greeting: Dobrý deň, %{recipient}!
|
644
|
+
comanagers_new_message:
|
645
|
+
greeting: Dobrý deň, %{recipient}!
|
638
646
|
new_conversation:
|
639
647
|
greeting: Dobrý deň, %{recipient}!
|
640
648
|
intro: "%{sender} zahájil novú diskusiu s vami. Kliknite sem pre zobrazenie:"
|
641
649
|
subject: "%{sender} začal s vami konverzovať"
|
650
|
+
new_group_conversation:
|
651
|
+
greeting: Dobrý deň, %{recipient}!
|
652
|
+
new_group_message:
|
653
|
+
greeting: Dobrý deň, %{recipient}!
|
642
654
|
new_message:
|
643
655
|
greeting: Dobrý deň, %{recipient}!
|
644
656
|
intro: "%{sender} poslala nové správy vo vašej konverzácii. Kliknite sem pre ich zobrazenie:"
|
@@ -666,11 +678,9 @@ sk:
|
|
666
678
|
participants:
|
667
679
|
description: Počet aktívnych účastníkov v organizácii
|
668
680
|
object: účastníci
|
669
|
-
title: Účastníci
|
670
681
|
users:
|
671
682
|
description: Počet účastníkov v organizácii
|
672
683
|
object: účastníci
|
673
|
-
title: Účastníci
|
674
684
|
newsletter_mailer:
|
675
685
|
newsletter:
|
676
686
|
unsubscribe: Chcete-li odhlásit přijímání tento typ e-mailů, <a href="%{link}" target="_blank" class="unsubscribe">Odhlásit</a>.
|
@@ -764,22 +774,21 @@ sk:
|
|
764
774
|
badges: Odznaky
|
765
775
|
followers: Sledujúci
|
766
776
|
following: Nasleduje
|
777
|
+
group_admins: Správa administrátorov
|
778
|
+
group_members: Správa členov
|
767
779
|
groups: Skupiny
|
768
780
|
members: Členovia
|
769
|
-
sidebar:
|
770
|
-
badges:
|
771
|
-
info: Odznaky získate za určité aktivity a účasť na platforme.
|
772
|
-
title: Odznaky
|
773
781
|
user:
|
774
|
-
|
775
|
-
|
776
|
-
|
777
|
-
|
778
|
-
|
779
|
-
|
780
|
-
|
781
|
-
|
782
|
-
|
782
|
+
actions:
|
783
|
+
create_user_group: Vytvořit skupinu
|
784
|
+
edit_profile: Editovať profil
|
785
|
+
edit_user_group: Upraviť profil skupiny
|
786
|
+
invite_user: Pozvať užívateľa
|
787
|
+
join_user_group: Žiadosť o pripojenie k skupine
|
788
|
+
leave_user_group: Opustiť skupinu
|
789
|
+
manage_user_group_admins: Správa administrátorov
|
790
|
+
manage_user_group_users: Správa členov
|
791
|
+
resend_email_confirmation_instructions: Opakujte e-mailové pokyny na potvrdenie
|
783
792
|
reported_mailer:
|
784
793
|
hide:
|
785
794
|
hello: Zdravím %{name},
|
@@ -844,6 +853,8 @@ sk:
|
|
844
853
|
comments_count: Komentáre
|
845
854
|
user_contact_disabled: Tento účastník nepovoľuje posielanie priamych správ.
|
846
855
|
user_conversations:
|
856
|
+
reply:
|
857
|
+
send: Poslat
|
847
858
|
update:
|
848
859
|
error: Zpráva nebyla odeslána. Zkuste to později znovu
|
849
860
|
welcome_notification:
|
data/config/locales/sr-CS.yml
CHANGED
data/config/locales/sv.yml
CHANGED
@@ -4,6 +4,8 @@ sv:
|
|
4
4
|
attributes:
|
5
5
|
account:
|
6
6
|
delete_reason: Skäl att ta bort ditt konto
|
7
|
+
attachment:
|
8
|
+
image: Bild
|
7
9
|
common:
|
8
10
|
created_at: Skapad
|
9
11
|
conversation:
|
@@ -35,6 +37,14 @@ sv:
|
|
35
37
|
personal_url: Personlig URL
|
36
38
|
remove_avatar: Ta bort avatar
|
37
39
|
tos_agreement: Användarvillkor
|
40
|
+
user_group:
|
41
|
+
avatar: Profilbild
|
42
|
+
errors:
|
43
|
+
models:
|
44
|
+
user:
|
45
|
+
attributes:
|
46
|
+
nickname:
|
47
|
+
format: Smeknamnet ska vara små bokstäver utan mellanslag
|
38
48
|
models:
|
39
49
|
decidim/attachment_created_event: Bilaga
|
40
50
|
decidim/component_published_event: Aktiv komponent
|
@@ -594,7 +604,7 @@ sv:
|
|
594
604
|
metrics:
|
595
605
|
name: Organisationsdata
|
596
606
|
participatory_space_metrics:
|
597
|
-
name:
|
607
|
+
name: Deltagande i siffror
|
598
608
|
participatory_space_stats:
|
599
609
|
name: Statistik
|
600
610
|
social_networks_metadata:
|
@@ -917,6 +927,16 @@ sv:
|
|
917
927
|
notification_event:
|
918
928
|
notification_title: Något inträffade i <a href="%{resource_path}">%{resource_title}</a>.
|
919
929
|
reports:
|
930
|
+
parent_hidden:
|
931
|
+
email_intro: |-
|
932
|
+
Din %{resource_type} är inte längre synlig.<br>
|
933
|
+
Detta hände därför att förslaget, mötet, debatten eller kommentaren du svarade på har modererats. Om den blir tillgänglig igen, kommer din kommentar automatiskt att återställas.
|
934
|
+
email_outro: Du har fått det här meddelandet eftersom du är en författare till %{resource_type}.
|
935
|
+
email_subject: Din %{resource_type} är inte längre synlig
|
936
|
+
notification_title: |-
|
937
|
+
Din %{resource_type} är inte längre synlig.<br>
|
938
|
+
Detta hände på grund av att förslaget, mötet, debatten eller kommentaren du svarade på har modererats. Om den blir tillgänglig igen, kommer din kommentar att återställas automatiskt.
|
939
|
+
<i>%{resource_content}</i>
|
920
940
|
resource_hidden:
|
921
941
|
email_intro: En administratör tog bort din %{resource_type} eftersom den har rapporterats som %{report_reasons}.
|
922
942
|
email_outro: Du har fått det här meddelandet eftersom du är en författare till det här innehållet.
|
@@ -1069,7 +1089,7 @@ sv:
|
|
1069
1089
|
accept:
|
1070
1090
|
error: Det gick inte att godkänna den här inbjudan.
|
1071
1091
|
success: Inbjudan har godkänts.
|
1072
|
-
accept_invitation:
|
1092
|
+
accept_invitation: Acceptera
|
1073
1093
|
accept_or_reject_group_invitations: 'Du har blivit inbjuden till följande grupper. Godkänn eller avvisa deras förfrågningar:'
|
1074
1094
|
index:
|
1075
1095
|
invite: Inbjudan
|
@@ -1127,7 +1147,7 @@ sv:
|
|
1127
1147
|
success: Du har lämnat gruppen.
|
1128
1148
|
members:
|
1129
1149
|
accept_or_reject_join_requests: 'Följande användare har ansökt om att få gå med i den här gruppen. Godkänn eller avvisa deras förfrågningar:'
|
1130
|
-
accept_request:
|
1150
|
+
accept_request: Acceptera
|
1131
1151
|
reject_request: Avvisa
|
1132
1152
|
new:
|
1133
1153
|
create_user_group: Skapa grupp
|
@@ -1206,13 +1226,13 @@ sv:
|
|
1206
1226
|
conversation_mailer:
|
1207
1227
|
comanagers_new_conversation:
|
1208
1228
|
admin_in_group: Du får detta eftersom du är administratör i %{group}.
|
1209
|
-
greeting:
|
1229
|
+
greeting: Hej %{recipient}!
|
1210
1230
|
intro: "%{manager} har startat en ny konversation som %{group}. Klicka här för att se den:"
|
1211
1231
|
outro: Ha det så kul!
|
1212
1232
|
subject: "%{manager} har startat en ny konversation som %{group}"
|
1213
1233
|
comanagers_new_message:
|
1214
1234
|
admin_in_group: Du får detta eftersom du är administratör i %{group}.
|
1215
|
-
greeting:
|
1235
|
+
greeting: Hej %{recipient}!
|
1216
1236
|
intro: "%{manager} har postat nya meddelanden i en konversation som %{group}. Klicka här för att se dem:"
|
1217
1237
|
outro: Ha det så kul!
|
1218
1238
|
subject: "%{manager} har skickat nya meddelanden som %{group}"
|
@@ -1223,13 +1243,13 @@ sv:
|
|
1223
1243
|
subject: "%{sender} har startat en konversation med dig"
|
1224
1244
|
new_group_conversation:
|
1225
1245
|
admin_in_group: Du får detta eftersom du är administratör i %{group}.
|
1226
|
-
greeting:
|
1246
|
+
greeting: Hej %{recipient}!
|
1227
1247
|
intro: "%{sender} har startat en ny konversation med gruppen %{group}. Klicka här för att se den:"
|
1228
1248
|
outro: Ha det så kul!
|
1229
1249
|
subject: "%{sender} har startat en konversation med %{group}"
|
1230
1250
|
new_group_message:
|
1231
1251
|
admin_in_group: Du får detta eftersom du är administratör i %{group}.
|
1232
|
-
greeting:
|
1252
|
+
greeting: Hej %{recipient}!
|
1233
1253
|
intro: "%{sender} har postat nya meddelanden i en konversation med gruppen %{group}. Klicka här för att se den:"
|
1234
1254
|
outro: Ha det så kul!
|
1235
1255
|
subject: "%{group} har fått nya meddelanden från %{sender}"
|
@@ -1473,35 +1493,22 @@ sv:
|
|
1473
1493
|
members: Medlemmar
|
1474
1494
|
officialized: Officiell deltagare
|
1475
1495
|
send_private_message: Skicka privat meddelande
|
1476
|
-
sidebar:
|
1477
|
-
badges:
|
1478
|
-
info: Man får märken genom att utföra olika aktiviteter på plattformen.
|
1479
|
-
title: Märken
|
1480
1496
|
user:
|
1481
1497
|
actions:
|
1482
1498
|
create_user_group: Skapa grupp
|
1483
1499
|
disabled_message: Meddelande
|
1484
1500
|
edit_profile: Redigera profil
|
1485
|
-
edit_user_group: Redigera
|
1501
|
+
edit_user_group: Redigera grupprofil
|
1486
1502
|
invite_user: Bjud in deltagare
|
1487
|
-
join_user_group:
|
1503
|
+
join_user_group: Begäran att gå med i grupp
|
1488
1504
|
leave_user_group: Lämna grupp
|
1489
1505
|
manage_user_group: Hantera grupp
|
1490
1506
|
manage_user_group_admins: Hantera administratörer
|
1491
1507
|
manage_user_group_users: Hantera medlemmar
|
1492
1508
|
message: Meddelande
|
1493
|
-
resend_email_confirmation_instructions: Skicka e-
|
1509
|
+
resend_email_confirmation_instructions: Skicka anvisningarna om bekräftelse om e-post igen
|
1494
1510
|
confirmation_instructions_sent: Instruktioner för e-postbekräftelse har skickats.
|
1495
|
-
create_user_group: Skapa grupp
|
1496
|
-
edit_profile: Redigera profil
|
1497
|
-
edit_user_group: Redigera grupprofil
|
1498
1511
|
fill_in_email_to_confirm_it: Fyll i gruppens e-postadress för att bekräfta den.
|
1499
|
-
invite_user: Bjud in deltagare
|
1500
|
-
join_user_group: Begäran att gå med i grupp
|
1501
|
-
leave_user_group: Lämna grupp
|
1502
|
-
manage_user_group_admins: Hantera administratörer
|
1503
|
-
manage_user_group_users: Hantera medlemmar
|
1504
|
-
resend_email_confirmation_instructions: Skicka anvisningarna om bekräftelse om e-post igen
|
1505
1512
|
reported_mailer:
|
1506
1513
|
hide:
|
1507
1514
|
hello: Hej %{name},
|
@@ -1585,14 +1592,11 @@ sv:
|
|
1585
1592
|
flag_user_modal:
|
1586
1593
|
already_reported: Det här innehållet har redan rapporterats och kommer att granskas av en administratör.
|
1587
1594
|
block: Blockera användaren
|
1588
|
-
close: Stäng
|
1589
|
-
description: Vad är olämpligt med användaren?
|
1590
1595
|
does_not_belong: Innehåller olaglig information, hot om självmord, personuppgifter eller något annat som inte hör hemma på %{organization_name}.
|
1591
1596
|
hide: Dölj allt innehåll
|
1592
1597
|
offensive: Innehåller rasism, sexism, personangrepp, mordhot, uppmaning att begå självmord eller hets mot folkgrupp.
|
1593
1598
|
report: Rapportera
|
1594
1599
|
spam: Innehåller clickbait, reklam, bedrägerier eller botar.
|
1595
|
-
title: Rapportera olämplig användare
|
1596
1600
|
floating_help:
|
1597
1601
|
help: Hjälp
|
1598
1602
|
follow_button:
|
data/config/locales/tr-TR.yml
CHANGED
@@ -25,6 +25,8 @@ tr:
|
|
25
25
|
password_confirmation: Şifrenizi Onaylayın
|
26
26
|
personal_url: Kişisel URL
|
27
27
|
remove_avatar: Avatarı kaldır
|
28
|
+
user_group:
|
29
|
+
avatar: Avatar
|
28
30
|
models:
|
29
31
|
decidim/attachment_created_event: Ek dosya
|
30
32
|
decidim/component_published_event: Aktif bileşen
|
@@ -357,6 +359,8 @@ tr:
|
|
357
359
|
view_all: Tümünü görüntüle
|
358
360
|
metrics:
|
359
361
|
name: Organizasyon metrikleri
|
362
|
+
participatory_space_metrics:
|
363
|
+
name: Metrikler
|
360
364
|
static_page:
|
361
365
|
section:
|
362
366
|
name: Bölüm
|
@@ -721,14 +725,15 @@ tr:
|
|
721
725
|
conversation_mailer:
|
722
726
|
comanagers_new_conversation:
|
723
727
|
admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
|
724
|
-
greeting: Merhaba
|
728
|
+
greeting: Merhaba %{recipient}!
|
725
729
|
intro: "%{manager}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
|
726
730
|
outro: Platformun tadını çıkarın!
|
727
731
|
subject: "%{manager}, %{group} olarak yeni bir görüşme başlattı"
|
728
732
|
comanagers_new_message:
|
729
733
|
admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
|
730
|
-
greeting: Merhaba
|
734
|
+
greeting: Merhaba %{recipient}!
|
731
735
|
intro: "%{manager}, %{group} adına bir görüşmede yeni mesajlar yayınladı. Onları görmek için buraya tıklayın:"
|
736
|
+
outro: Platformun tadını çıkarın!
|
732
737
|
subject: "%{manager} %{group} olarak yeni mesajlar gönderdi"
|
733
738
|
new_conversation:
|
734
739
|
greeting: Merhaba %{recipient}!
|
@@ -737,13 +742,13 @@ tr:
|
|
737
742
|
subject: "%{sender} sizinle bir konuşma başlattı"
|
738
743
|
new_group_conversation:
|
739
744
|
admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
|
740
|
-
greeting: Merhaba
|
745
|
+
greeting: Merhaba %{recipient}!
|
741
746
|
intro: "%{sender}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
|
742
747
|
outro: Platformun tadını çıkarın!
|
743
748
|
subject: "%{sender}, %{group} olarak yeni bir görüşme başlattı"
|
744
749
|
new_group_message:
|
745
750
|
admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
|
746
|
-
greeting: Merhaba
|
751
|
+
greeting: Merhaba %{recipient}!
|
747
752
|
intro: "%{sender}, %{group} grubuyla bir görüşmede yeni mesajlar yayınladı. Görmek için buraya tıklayın:"
|
748
753
|
outro: Platformun tadını çıkarın!
|
749
754
|
subject: "%{group}, %{sender} adlı kişiden yeni mesajlar aldı"
|
@@ -767,6 +772,8 @@ tr:
|
|
767
772
|
new_conversation: Yeni görüşme
|
768
773
|
next: Sonraki
|
769
774
|
title: Konuşmalar
|
775
|
+
reply_form:
|
776
|
+
placeholder: Cevabınız...
|
770
777
|
show:
|
771
778
|
back: Tüm görüşmelere dön
|
772
779
|
chat_with: ile görüşme
|
@@ -779,15 +786,13 @@ tr:
|
|
779
786
|
followers:
|
780
787
|
description: Bu katılım alanını takip eden kullanıcı sayısı
|
781
788
|
object: takipçiler
|
782
|
-
title:
|
789
|
+
title: İzleyiciler
|
783
790
|
participants:
|
784
791
|
description: Kuruluştaki aktif kullanıcı sayısı
|
785
792
|
object: katılımcılar
|
786
|
-
title: Katılımcılar
|
787
793
|
users:
|
788
794
|
description: Kuruluştaki katılımcı sayısı
|
789
795
|
object: katılımcılar
|
790
|
-
title: Katılımcılar
|
791
796
|
newsletter_mailer:
|
792
797
|
newsletter:
|
793
798
|
unsubscribe: Bu tür bir e-posta almayı iptal etmek için, <a href="%{link}" target="_blank" class="unsubscribe">Abonelikten Ayrıl</a>.
|
@@ -884,23 +889,22 @@ tr:
|
|
884
889
|
conversations: Konuşmalar
|
885
890
|
followers: Takipçiler
|
886
891
|
following: Takip Et
|
892
|
+
group_admins: Yöneticileri yönet
|
893
|
+
group_members: Üyeleri yönet
|
887
894
|
groups: Gruplar
|
888
895
|
members: Üyeler
|
889
896
|
officialized: Resmi katılımcı
|
890
|
-
sidebar:
|
891
|
-
badges:
|
892
|
-
info: Rozetler, platformda belirli etkinlikler gerçekleştirilerek kazanılır.
|
893
|
-
title: Rozetler
|
894
897
|
user:
|
895
|
-
|
896
|
-
|
897
|
-
|
898
|
-
|
899
|
-
|
900
|
-
|
901
|
-
|
902
|
-
|
903
|
-
|
898
|
+
actions:
|
899
|
+
create_user_group: Grup oluştur
|
900
|
+
edit_profile: Profili Düzenle
|
901
|
+
edit_user_group: Grup profilini düzenle
|
902
|
+
invite_user: Katılımcı davet et
|
903
|
+
join_user_group: Gruba katılma isteği
|
904
|
+
leave_user_group: Gruptan ayrıl
|
905
|
+
manage_user_group_admins: Yöneticileri yönet
|
906
|
+
manage_user_group_users: Üyeleri yönet
|
907
|
+
resend_email_confirmation_instructions: E-posta doğrulama talimatlarını tekrar gönder
|
904
908
|
reported_mailer:
|
905
909
|
hide:
|
906
910
|
hello: Merhaba %{name}
|
@@ -974,12 +978,9 @@ tr:
|
|
974
978
|
title: Sorun bildir
|
975
979
|
flag_user_modal:
|
976
980
|
already_reported: Bu içerik zaten bildirildi ve bir yönetici tarafından incelenecek.
|
977
|
-
close: Kapat
|
978
|
-
description: Kullanıcı hakkında uygunsuz olan nedir?
|
979
981
|
offensive: Irkçılık, cinsiyetçilik, hakaretler, kişisel saldırılar, ölüm tehditleri, intihar talepleri veya her türlü nefret söylemi içerir.
|
980
982
|
report: Bildir
|
981
983
|
spam: Tıklama tuzağı, reklam, dolandırıcılık veya komut dosyası botları içerir.
|
982
|
-
title: Uygunsuz Kullanıcıyı bildirin
|
983
984
|
floating_help:
|
984
985
|
help: yardım et
|
985
986
|
follow_button:
|
data/config/locales/uk.yml
CHANGED
@@ -315,10 +315,18 @@ uk:
|
|
315
315
|
home: Головна
|
316
316
|
messaging:
|
317
317
|
conversation_mailer:
|
318
|
+
comanagers_new_conversation:
|
319
|
+
greeting: Вітаємо, %{recipient}!
|
320
|
+
comanagers_new_message:
|
321
|
+
greeting: Вітаємо, %{recipient}!
|
318
322
|
new_conversation:
|
319
323
|
greeting: Вітаємо, %{recipient}!
|
320
324
|
intro: "%{sender} почав з вами нову бесіду. Клацніть тут, щоб прочитати її:"
|
321
325
|
subject: "%{sender} почав з вами бесіду"
|
326
|
+
new_group_conversation:
|
327
|
+
greeting: Вітаємо, %{recipient}!
|
328
|
+
new_group_message:
|
329
|
+
greeting: Вітаємо, %{recipient}!
|
322
330
|
new_message:
|
323
331
|
greeting: Доброго дня, %{recipient}!
|
324
332
|
intro: "%{sender} написав нові повідомлення у вашій бесіді. Клацніть тут, щоб переглянути їх:"
|
@@ -385,7 +393,8 @@ uk:
|
|
385
393
|
followers: Ті, хто стежить
|
386
394
|
following: 'Стежить за:'
|
387
395
|
user:
|
388
|
-
|
396
|
+
actions:
|
397
|
+
edit_profile: Редагувати профіль
|
389
398
|
reported_mailer:
|
390
399
|
hide:
|
391
400
|
hello: Доброго дня, %{name}%!
|
@@ -430,6 +439,8 @@ uk:
|
|
430
439
|
statistics:
|
431
440
|
comments_count: Коментарів
|
432
441
|
user_conversations:
|
442
|
+
reply:
|
443
|
+
send: Надіслати
|
433
444
|
update:
|
434
445
|
error: Повідомлення не надіслано. Спробуйте ще раз пізніше
|
435
446
|
devise:
|
data/config/locales/zh-CN.yml
CHANGED
@@ -25,6 +25,8 @@ zh-CN:
|
|
25
25
|
password_confirmation: 确认您的密码
|
26
26
|
personal_url: 个人网址
|
27
27
|
remove_avatar: 删除头像
|
28
|
+
user_group:
|
29
|
+
avatar: 头像
|
28
30
|
models:
|
29
31
|
decidim/attachment_created_event: 附文
|
30
32
|
decidim/component_published_event: 活动组件
|
@@ -308,6 +310,8 @@ zh-CN:
|
|
308
310
|
view_all: 查看全部
|
309
311
|
metrics:
|
310
312
|
name: 组织指标
|
313
|
+
participatory_space_metrics:
|
314
|
+
name: 指标
|
311
315
|
stats:
|
312
316
|
name: 组织统计
|
313
317
|
sub_hero:
|
@@ -681,6 +685,8 @@ zh-CN:
|
|
681
685
|
new_conversation: 新建对话
|
682
686
|
next: 下一个
|
683
687
|
title: 对话
|
688
|
+
reply_form:
|
689
|
+
placeholder: 您的回复...
|
684
690
|
show:
|
685
691
|
back: 回到所有对话
|
686
692
|
chat_with: 对话
|
@@ -695,11 +701,9 @@ zh-CN:
|
|
695
701
|
participants:
|
696
702
|
description: 组织中的活跃参与者人数
|
697
703
|
object: 参与者
|
698
|
-
title: 参加者
|
699
704
|
users:
|
700
705
|
description: 参加组织的人数
|
701
706
|
object: 参与者
|
702
|
-
title: 参加者
|
703
707
|
newsletter_mailer:
|
704
708
|
newsletter:
|
705
709
|
unsubscribe: 选择不接收这种类型的电子邮件, <a href="%{link}" target="_blank" class="unsubscribe">取消订阅</a>。
|
@@ -794,23 +798,22 @@ zh-CN:
|
|
794
798
|
conversations: 对话
|
795
799
|
followers: 关注者
|
796
800
|
following: 关注的问题
|
801
|
+
group_admins: 管理管理员
|
802
|
+
group_members: 管理成员
|
797
803
|
groups: 群組
|
798
804
|
members: 成员
|
799
805
|
officialized: 官方参与者
|
800
|
-
sidebar:
|
801
|
-
badges:
|
802
|
-
info: 徽章是通过在平台上执行特定活动赚取的。
|
803
|
-
title: 徽章
|
804
806
|
user:
|
805
|
-
|
806
|
-
|
807
|
-
|
808
|
-
|
809
|
-
|
810
|
-
|
811
|
-
|
812
|
-
|
813
|
-
|
807
|
+
actions:
|
808
|
+
create_user_group: 创建组
|
809
|
+
edit_profile: 编辑配置文件
|
810
|
+
edit_user_group: 编辑群组资料
|
811
|
+
invite_user: Invite participant
|
812
|
+
join_user_group: 加入组的请求
|
813
|
+
leave_user_group: 离开组
|
814
|
+
manage_user_group_admins: 管理管理员
|
815
|
+
manage_user_group_users: 管理成员
|
816
|
+
resend_email_confirmation_instructions: 重新发送电子邮件确认说明
|
814
817
|
reported_mailer:
|
815
818
|
hide:
|
816
819
|
hello: 您好 %{name},
|
data/config/locales/zh-TW.yml
CHANGED
@@ -31,6 +31,8 @@ zh-TW:
|
|
31
31
|
personal_url: 個人 URL
|
32
32
|
remove_avatar: 刪除頭像
|
33
33
|
tos_agreement: 同意服務條款
|
34
|
+
user_group:
|
35
|
+
avatar: 頭像
|
34
36
|
models:
|
35
37
|
decidim/attachment_created_event: 附件
|
36
38
|
decidim/component_published_event: 啟用組件
|
@@ -465,6 +467,8 @@ zh-TW:
|
|
465
467
|
view_all: 檢視全部
|
466
468
|
metrics:
|
467
469
|
name: 組織指標
|
470
|
+
participatory_space_metrics:
|
471
|
+
name: 指標
|
468
472
|
static_page:
|
469
473
|
section:
|
470
474
|
name: 節
|
@@ -1192,14 +1196,12 @@ zh-TW:
|
|
1192
1196
|
conversations: 對話
|
1193
1197
|
followers: 追隨者
|
1194
1198
|
following: 關注
|
1199
|
+
group_admins: 管理管理員
|
1200
|
+
group_members: 管理成員
|
1195
1201
|
groups: 群組
|
1196
1202
|
members: 成員
|
1197
1203
|
officialized: 正式認證參與者
|
1198
1204
|
send_private_message: 發送私人訊息
|
1199
|
-
sidebar:
|
1200
|
-
badges:
|
1201
|
-
info: 徽章是通過在平台上執行特定活動而獲得的。
|
1202
|
-
title: 徽章
|
1203
1205
|
user:
|
1204
1206
|
actions:
|
1205
1207
|
create_user_group: 建立群組
|
@@ -1207,20 +1209,13 @@ zh-TW:
|
|
1207
1209
|
edit_user_group: 編輯群組資料
|
1208
1210
|
invite_user: 邀請參與者
|
1209
1211
|
join_user_group: 申請加入群組
|
1212
|
+
leave_user_group: 退出群組
|
1210
1213
|
manage_user_group_admins: 管理管理員
|
1211
1214
|
manage_user_group_users: 管理成員
|
1212
1215
|
message: 訊息
|
1216
|
+
resend_email_confirmation_instructions: 重新發送電子郵件確認指示
|
1213
1217
|
confirmation_instructions_sent: 電子郵件確認指示已發送.
|
1214
|
-
create_user_group: 建立群組
|
1215
|
-
edit_profile: 編輯個人資料
|
1216
|
-
edit_user_group: 編輯群組資料
|
1217
1218
|
fill_in_email_to_confirm_it: 請填寫您的群組電子郵件以進行確認.
|
1218
|
-
invite_user: 邀請參與者
|
1219
|
-
join_user_group: 申請加入群組
|
1220
|
-
leave_user_group: 退出群組
|
1221
|
-
manage_user_group_admins: 管理管理員
|
1222
|
-
manage_user_group_users: 管理成員
|
1223
|
-
resend_email_confirmation_instructions: 重新發送電子郵件確認指示
|
1224
1219
|
reported_mailer:
|
1225
1220
|
hide:
|
1226
1221
|
hello: 哈囉,%{name},
|
@@ -1297,14 +1292,11 @@ zh-TW:
|
|
1297
1292
|
flag_user_modal:
|
1298
1293
|
already_reported: 此內容已被舉報,將由管理員進行審查。
|
1299
1294
|
block: 封鎖此參與者
|
1300
|
-
close: 關閉
|
1301
|
-
description: 關於該使用者有什麼不適當的行為?
|
1302
1295
|
does_not_belong: 包含非法活動、自殺威脅、個人資訊或其他您認為不適合在%{organization_name} 上的內容。
|
1303
1296
|
hide: 隱藏所有內容
|
1304
1297
|
offensive: 包含種族主義、性別歧視、辱罵、人身攻擊、死亡威脅、自殺要求或任何形式的仇恨言論
|
1305
1298
|
report: 報告
|
1306
1299
|
spam: 包含點閱率誘導、廣告、詐騙或自動腳本。
|
1307
|
-
title: 舉報不適當的使用者
|
1308
1300
|
floating_help:
|
1309
1301
|
help: 幫助
|
1310
1302
|
mentions_modal:
|
@@ -5,32 +5,12 @@ class ChangeObjectChangesOnVersions < ActiveRecord::Migration[6.1]
|
|
5
5
|
rename_column :versions, :object_changes, :old_object_changes
|
6
6
|
add_column :versions, :object_changes, :jsonb # or :json
|
7
7
|
|
8
|
-
PaperTrail::Version.
|
9
|
-
# This is an adaptation of PaperTrail internal load_changeset method,having in mind that we
|
10
|
-
# need to call also the code from PaperTrail::AttributeSerializer::ObjectChangesAttribute
|
11
|
-
object_changes = ActiveSupport::HashWithIndifferentAccess.new(YAML.unsafe_load(version.old_object_changes))
|
12
|
-
unless version.item_type.constantize.unscoped.find_by(id: version.item_id).nil?
|
13
|
-
# This is the deserialization code from `PaperTrail::AttributeSerializer::ObjectChangesAttribute`
|
14
|
-
# where we skip checking the object changeset column type, as we migrate it from YAML to JSON
|
15
|
-
changes_to_serialize = object_changes.clone
|
16
|
-
if changes_to_serialize.present?
|
17
|
-
serializer = PaperTrail::AttributeSerializers::CastAttributeSerializer.new(version.item_type.constantize)
|
18
|
-
changes_to_serialize.each do |key, change|
|
19
|
-
# `change` is an Array with two elements, representing before and after.
|
20
|
-
object_changes[key] = Array(change).map do |value|
|
21
|
-
serializer.send(:deserialize, key, value)
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
8
|
+
PaperTrail::Version.reset_column_information
|
26
9
|
|
27
|
-
|
28
|
-
|
29
|
-
|
10
|
+
PaperTrail::Version.where.not(old_object_changes: nil).find_each do |version|
|
11
|
+
# we set a time interval to ensure that deployment has succeeded
|
12
|
+
Decidim::Migrate::PaperTrailJob.set(wait: 10.minutes).perform_later(version.id)
|
30
13
|
end
|
31
|
-
|
32
|
-
PaperTrail::Version.reset_column_information
|
33
|
-
remove_column :versions, :old_object_changes
|
34
14
|
end
|
35
15
|
|
36
16
|
def down
|
@@ -52,8 +52,13 @@ module Decidim
|
|
52
52
|
when ActiveStorage::Blob
|
53
53
|
blob_url(**)
|
54
54
|
else # ActiveStorage::VariantWithRecord, ActiveStorage::Variant
|
55
|
-
|
56
|
-
|
55
|
+
if blob && blob.attachments.any?
|
56
|
+
ensure_current_host(blob.attachments.first&.record, **)
|
57
|
+
representation_url(**)
|
58
|
+
else
|
59
|
+
ensure_current_host(nil, **)
|
60
|
+
representation_url(**, only_path: true)
|
61
|
+
end
|
57
62
|
end
|
58
63
|
end
|
59
64
|
|
@@ -23,7 +23,11 @@ module Decidim
|
|
23
23
|
def cast_value(value)
|
24
24
|
return value unless value.is_a?(String)
|
25
25
|
|
26
|
-
|
26
|
+
if Date._iso8601(value).present?
|
27
|
+
Time.zone.iso8601(value)
|
28
|
+
else
|
29
|
+
Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
|
30
|
+
end
|
27
31
|
rescue ArgumentError
|
28
32
|
fallback = super
|
29
33
|
return fallback unless fallback.is_a?(Time)
|