decidim-core 0.30.0.rc2 → 0.30.0.rc3

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.
Files changed (87) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/amendable/amendments/show.erb +1 -1
  3. data/app/cells/decidim/profile_actions/show.erb +1 -1
  4. data/app/cells/decidim/report_button/already_reported_modal.erb +2 -2
  5. data/app/cells/decidim/report_button/flag_modal.erb +13 -27
  6. data/app/cells/decidim/report_button_cell.rb +2 -8
  7. data/app/cells/decidim/report_user_button/already_reported_modal.erb +11 -0
  8. data/app/cells/decidim/report_user_button/flag_modal.erb +46 -0
  9. data/app/cells/decidim/report_user_button/show.erb +2 -0
  10. data/app/cells/decidim/report_user_button_cell.rb +59 -0
  11. data/app/cells/decidim/resource_types_filter/show.erb +1 -1
  12. data/app/cells/decidim/resource_types_filter_cell.rb +6 -6
  13. data/app/cells/decidim/user_activity/show.erb +1 -1
  14. data/app/commands/decidim/create_omniauth_registration.rb +14 -8
  15. data/app/controllers/decidim/profiles_controller.rb +2 -2
  16. data/app/controllers/decidim/user_activities_controller.rb +1 -1
  17. data/app/forms/decidim/account_form.rb +2 -2
  18. data/app/jobs/decidim/hide_child_resources_job.rb +3 -3
  19. data/app/jobs/decidim/migrate/paper_trail_job.rb +33 -0
  20. data/app/models/decidim/user.rb +0 -4
  21. data/app/models/decidim/user_base_entity.rb +4 -0
  22. data/app/packs/src/decidim/sticky_footer.js +19 -0
  23. data/app/packs/stylesheets/decidim/_cards.scss +4 -0
  24. data/app/packs/stylesheets/decidim/_content_blocks.scss +1 -1
  25. data/app/packs/stylesheets/decidim/_login.scss +4 -0
  26. data/app/packs/stylesheets/decidim/_modal_authorization.scss +1 -1
  27. data/app/packs/stylesheets/decidim/_profile.scss +1 -1
  28. data/app/resolvers/decidim/meta_image_url_resolver.rb +1 -0
  29. data/app/services/decidim/static_map_generator.rb +1 -1
  30. data/app/views/decidim/devise/registrations/new.html.erb +1 -1
  31. data/app/views/decidim/devise/sessions/new.html.erb +1 -1
  32. data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb +1 -1
  33. data/app/views/decidim/last_activities/index.html.erb +1 -1
  34. data/app/views/decidim/open_data/index.html.erb +1 -1
  35. data/config/locales/ar.yml +12 -25
  36. data/config/locales/bg.yml +8 -22
  37. data/config/locales/ca.yml +19 -33
  38. data/config/locales/cs.yml +16 -31
  39. data/config/locales/de.yml +6 -21
  40. data/config/locales/el.yml +8 -13
  41. data/config/locales/en.yml +2 -16
  42. data/config/locales/eo.yml +2 -0
  43. data/config/locales/es-MX.yml +14 -28
  44. data/config/locales/es-PY.yml +19 -33
  45. data/config/locales/es.yml +19 -33
  46. data/config/locales/eu.yml +52 -67
  47. data/config/locales/fi-plain.yml +11 -26
  48. data/config/locales/fi.yml +12 -27
  49. data/config/locales/fr-CA.yml +58 -20
  50. data/config/locales/fr.yml +58 -20
  51. data/config/locales/ga-IE.yml +2 -4
  52. data/config/locales/gl.yml +22 -13
  53. data/config/locales/hu.yml +7 -21
  54. data/config/locales/id-ID.yml +22 -13
  55. data/config/locales/is-IS.yml +10 -0
  56. data/config/locales/it.yml +22 -20
  57. data/config/locales/ja.yml +120 -21
  58. data/config/locales/lb.yml +19 -19
  59. data/config/locales/lt.yml +5 -17
  60. data/config/locales/lv.yml +16 -13
  61. data/config/locales/nl.yml +20 -17
  62. data/config/locales/no.yml +16 -16
  63. data/config/locales/pl.yml +4 -18
  64. data/config/locales/pt-BR.yml +8 -21
  65. data/config/locales/pt.yml +16 -16
  66. data/config/locales/ro-RO.yml +15 -20
  67. data/config/locales/ru.yml +23 -8
  68. data/config/locales/sk.yml +27 -16
  69. data/config/locales/sv.yml +11 -25
  70. data/config/locales/tr-TR.yml +21 -20
  71. data/config/locales/uk.yml +12 -1
  72. data/config/locales/zh-CN.yml +16 -13
  73. data/config/locales/zh-TW.yml +6 -16
  74. data/db/migrate/20240722215500_change_object_changes_on_versions.rb +4 -24
  75. data/lib/decidim/content_parsers/user_parser.rb +1 -1
  76. data/lib/decidim/core/version.rb +1 -1
  77. data/lib/decidim/map/provider/static_map/here.rb +34 -0
  78. data/lib/decidim/nicknamizable.rb +1 -1
  79. data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +23 -20
  80. metadata +11 -13
  81. data/app/cells/decidim/author/flag.erb +0 -6
  82. data/app/cells/decidim/author/flag_user.erb +0 -14
  83. data/app/cells/decidim/flag_modal/flag_user.erb +0 -34
  84. data/app/cells/decidim/flag_modal/show.erb +0 -52
  85. data/app/cells/decidim/flag_modal_cell.rb +0 -56
  86. data/app/cells/decidim/profile_sidebar/show.erb +0 -167
  87. data/app/cells/decidim/profile_sidebar_cell.rb +0 -68
@@ -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ť
@@ -560,7 +562,7 @@ sk:
560
562
  current_admins: 'Aktuálni administrátori:'
561
563
  manage_admins: Správa administrátorov
562
564
  group_invites:
563
- accept_invitation: Akceptovať
565
+ accept_invitation: Prijať
564
566
  accept_or_reject_group_invitations: 'Nasledujúce skupiny vás pozvali, aby ste sa k nim pripojili. Prijať alebo odmietnuť ich požiadavky: '
565
567
  index:
566
568
  invite: Pozvať
@@ -591,8 +593,8 @@ sk:
591
593
  success: Skupina úspěšně opustila.
592
594
  members:
593
595
  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: Akceptovat
595
- reject_request: Odmítnout
596
+ accept_request: Prijať
597
+ reject_request: Odmietnuť
596
598
  new:
597
599
  create_user_group: Vytvořit skupinu
598
600
  new_user_group: Nová skupina
@@ -635,10 +637,18 @@ sk:
635
637
  home: Domov
636
638
  messaging:
637
639
  conversation_mailer:
640
+ comanagers_new_conversation:
641
+ greeting: Dobrý deň, %{recipient}!
642
+ comanagers_new_message:
643
+ greeting: Dobrý deň, %{recipient}!
638
644
  new_conversation:
639
645
  greeting: Dobrý deň, %{recipient}!
640
646
  intro: "%{sender} zahájil novú diskusiu s vami. Kliknite sem pre zobrazenie:"
641
647
  subject: "%{sender} začal s vami konverzovať"
648
+ new_group_conversation:
649
+ greeting: Dobrý deň, %{recipient}!
650
+ new_group_message:
651
+ greeting: Dobrý deň, %{recipient}!
642
652
  new_message:
643
653
  greeting: Dobrý deň, %{recipient}!
644
654
  intro: "%{sender} poslala nové správy vo vašej konverzácii. Kliknite sem pre ich zobrazenie:"
@@ -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
- create_user_group: Vytvoriť skupinu
775
- edit_profile: Editovať profil
776
- edit_user_group: Upraviť profil skupiny
777
- invite_user: Pozvať užívateľa
778
- join_user_group: Žiadosť o pripojenie k skupine
779
- leave_user_group: Opustiť skupinu
780
- manage_user_group_admins: Správa administrátorov
781
- manage_user_group_users: Správa členov
782
- resend_email_confirmation_instructions: Opakujte e-mailové pokyny na potvrdenie
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:
@@ -35,6 +35,8 @@ sv:
35
35
  personal_url: Personlig URL
36
36
  remove_avatar: Ta bort avatar
37
37
  tos_agreement: Användarvillkor
38
+ user_group:
39
+ avatar: Profilbild
38
40
  models:
39
41
  decidim/attachment_created_event: Bilaga
40
42
  decidim/component_published_event: Aktiv komponent
@@ -1069,7 +1071,7 @@ sv:
1069
1071
  accept:
1070
1072
  error: Det gick inte att godkänna den här inbjudan.
1071
1073
  success: Inbjudan har godkänts.
1072
- accept_invitation: Godkänn
1074
+ accept_invitation: Acceptera
1073
1075
  accept_or_reject_group_invitations: 'Du har blivit inbjuden till följande grupper. Godkänn eller avvisa deras förfrågningar:'
1074
1076
  index:
1075
1077
  invite: Inbjudan
@@ -1127,7 +1129,7 @@ sv:
1127
1129
  success: Du har lämnat gruppen.
1128
1130
  members:
1129
1131
  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: Godkänn
1132
+ accept_request: Acceptera
1131
1133
  reject_request: Avvisa
1132
1134
  new:
1133
1135
  create_user_group: Skapa grupp
@@ -1206,13 +1208,13 @@ sv:
1206
1208
  conversation_mailer:
1207
1209
  comanagers_new_conversation:
1208
1210
  admin_in_group: Du får detta eftersom du är administratör i %{group}.
1209
- greeting: Hi, %{recipient}!
1211
+ greeting: Hej %{recipient}!
1210
1212
  intro: "%{manager} har startat en ny konversation som %{group}. Klicka här för att se den:"
1211
1213
  outro: Ha det så kul!
1212
1214
  subject: "%{manager} har startat en ny konversation som %{group}"
1213
1215
  comanagers_new_message:
1214
1216
  admin_in_group: Du får detta eftersom du är administratör i %{group}.
1215
- greeting: Hi, %{recipient}!
1217
+ greeting: Hej %{recipient}!
1216
1218
  intro: "%{manager} har postat nya meddelanden i en konversation som %{group}. Klicka här för att se dem:"
1217
1219
  outro: Ha det så kul!
1218
1220
  subject: "%{manager} har skickat nya meddelanden som %{group}"
@@ -1223,13 +1225,13 @@ sv:
1223
1225
  subject: "%{sender} har startat en konversation med dig"
1224
1226
  new_group_conversation:
1225
1227
  admin_in_group: Du får detta eftersom du är administratör i %{group}.
1226
- greeting: Hi, %{recipient}!
1228
+ greeting: Hej %{recipient}!
1227
1229
  intro: "%{sender} har startat en ny konversation med gruppen %{group}. Klicka här för att se den:"
1228
1230
  outro: Ha det så kul!
1229
1231
  subject: "%{sender} har startat en konversation med %{group}"
1230
1232
  new_group_message:
1231
1233
  admin_in_group: Du får detta eftersom du är administratör i %{group}.
1232
- greeting: Hi, %{recipient}!
1234
+ greeting: Hej %{recipient}!
1233
1235
  intro: "%{sender} har postat nya meddelanden i en konversation med gruppen %{group}. Klicka här för att se den:"
1234
1236
  outro: Ha det så kul!
1235
1237
  subject: "%{group} har fått nya meddelanden från %{sender}"
@@ -1473,35 +1475,22 @@ sv:
1473
1475
  members: Medlemmar
1474
1476
  officialized: Officiell deltagare
1475
1477
  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
1478
  user:
1481
1479
  actions:
1482
1480
  create_user_group: Skapa grupp
1483
1481
  disabled_message: Meddelande
1484
1482
  edit_profile: Redigera profil
1485
- edit_user_group: Redigera gruppens profil
1483
+ edit_user_group: Redigera grupprofil
1486
1484
  invite_user: Bjud in deltagare
1487
- join_user_group: Ansök om att gå med i grupp
1485
+ join_user_group: Begäran att gå med i grupp
1488
1486
  leave_user_group: Lämna grupp
1489
1487
  manage_user_group: Hantera grupp
1490
1488
  manage_user_group_admins: Hantera administratörer
1491
1489
  manage_user_group_users: Hantera medlemmar
1492
1490
  message: Meddelande
1493
- resend_email_confirmation_instructions: Skicka e-postmeddelande med bekräftelseinstruktioner igen
1491
+ resend_email_confirmation_instructions: Skicka anvisningarna om bekräftelse om e-post igen
1494
1492
  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
1493
  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
1494
  reported_mailer:
1506
1495
  hide:
1507
1496
  hello: Hej %{name},
@@ -1585,14 +1574,11 @@ sv:
1585
1574
  flag_user_modal:
1586
1575
  already_reported: Det här innehållet har redan rapporterats och kommer att granskas av en administratör.
1587
1576
  block: Blockera användaren
1588
- close: Stäng
1589
- description: Vad är olämpligt med användaren?
1590
1577
  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
1578
  hide: Dölj allt innehåll
1592
1579
  offensive: Innehåller rasism, sexism, personangrepp, mordhot, uppmaning att begå självmord eller hets mot folkgrupp.
1593
1580
  report: Rapportera
1594
1581
  spam: Innehåller clickbait, reklam, bedrägerier eller botar.
1595
- title: Rapportera olämplig användare
1596
1582
  floating_help:
1597
1583
  help: Hjälp
1598
1584
  follow_button:
@@ -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
@@ -721,14 +723,15 @@ tr:
721
723
  conversation_mailer:
722
724
  comanagers_new_conversation:
723
725
  admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
724
- greeting: Merhaba, %{recipient}!
726
+ greeting: Merhaba %{recipient}!
725
727
  intro: "%{manager}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
726
728
  outro: Platformun tadını çıkarın!
727
729
  subject: "%{manager}, %{group} olarak yeni bir görüşme başlattı"
728
730
  comanagers_new_message:
729
731
  admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
730
- greeting: Merhaba, %{recipient}!
732
+ greeting: Merhaba %{recipient}!
731
733
  intro: "%{manager}, %{group} adına bir görüşmede yeni mesajlar yayınladı. Onları görmek için buraya tıklayın:"
734
+ outro: Platformun tadını çıkarın!
732
735
  subject: "%{manager} %{group} olarak yeni mesajlar gönderdi"
733
736
  new_conversation:
734
737
  greeting: Merhaba %{recipient}!
@@ -737,13 +740,13 @@ tr:
737
740
  subject: "%{sender} sizinle bir konuşma başlattı"
738
741
  new_group_conversation:
739
742
  admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
740
- greeting: Merhaba, %{recipient}!
743
+ greeting: Merhaba %{recipient}!
741
744
  intro: "%{sender}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
742
745
  outro: Platformun tadını çıkarın!
743
746
  subject: "%{sender}, %{group} olarak yeni bir görüşme başlattı"
744
747
  new_group_message:
745
748
  admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
746
- greeting: Merhaba, %{recipient}!
749
+ greeting: Merhaba %{recipient}!
747
750
  intro: "%{sender}, %{group} grubuyla bir görüşmede yeni mesajlar yayınladı. Görmek için buraya tıklayın:"
748
751
  outro: Platformun tadını çıkarın!
749
752
  subject: "%{group}, %{sender} adlı kişiden yeni mesajlar aldı"
@@ -767,6 +770,8 @@ tr:
767
770
  new_conversation: Yeni görüşme
768
771
  next: Sonraki
769
772
  title: Konuşmalar
773
+ reply_form:
774
+ placeholder: Cevabınız...
770
775
  show:
771
776
  back: Tüm görüşmelere dön
772
777
  chat_with: ile görüşme
@@ -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
- create_user_group: Grup oluştur
896
- edit_profile: Profili Düzenle
897
- edit_user_group: Grup profilini düzenle
898
- invite_user: Katılımcı davet et
899
- join_user_group: Gruba katılma isteği
900
- leave_user_group: Gruptan ayrıl
901
- manage_user_group_admins: Yöneticileri yönet
902
- manage_user_group_users: Üyeleri yönet
903
- resend_email_confirmation_instructions: E-posta doğrulama talimatlarını tekrar gönder
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:
@@ -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
- edit_profile: Редагувати профіль
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:
@@ -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: 活动组件
@@ -681,6 +683,8 @@ zh-CN:
681
683
  new_conversation: 新建对话
682
684
  next: 下一个
683
685
  title: 对话
686
+ reply_form:
687
+ placeholder: 您的回复...
684
688
  show:
685
689
  back: 回到所有对话
686
690
  chat_with: 对话
@@ -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
- create_user_group: 创建组
806
- edit_profile: 编辑配置文件
807
- edit_user_group: 编辑群组资料
808
- invite_user: Invite participant
809
- join_user_group: 加入组的请求
810
- leave_user_group: 离开组
811
- manage_user_group_admins: 管理管理员
812
- manage_user_group_users: 管理成员
813
- resend_email_confirmation_instructions: 重新发送电子邮件确认说明
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},
@@ -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: 啟用組件
@@ -1192,14 +1194,12 @@ zh-TW:
1192
1194
  conversations: 對話
1193
1195
  followers: 追隨者
1194
1196
  following: 關注
1197
+ group_admins: 管理管理員
1198
+ group_members: 管理成員
1195
1199
  groups: 群組
1196
1200
  members: 成員
1197
1201
  officialized: 正式認證參與者
1198
1202
  send_private_message: 發送私人訊息
1199
- sidebar:
1200
- badges:
1201
- info: 徽章是通過在平台上執行特定活動而獲得的。
1202
- title: 徽章
1203
1203
  user:
1204
1204
  actions:
1205
1205
  create_user_group: 建立群組
@@ -1207,20 +1207,13 @@ zh-TW:
1207
1207
  edit_user_group: 編輯群組資料
1208
1208
  invite_user: 邀請參與者
1209
1209
  join_user_group: 申請加入群組
1210
+ leave_user_group: 退出群組
1210
1211
  manage_user_group_admins: 管理管理員
1211
1212
  manage_user_group_users: 管理成員
1212
1213
  message: 訊息
1214
+ resend_email_confirmation_instructions: 重新發送電子郵件確認指示
1213
1215
  confirmation_instructions_sent: 電子郵件確認指示已發送.
1214
- create_user_group: 建立群組
1215
- edit_profile: 編輯個人資料
1216
- edit_user_group: 編輯群組資料
1217
1216
  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
1217
  reported_mailer:
1225
1218
  hide:
1226
1219
  hello: 哈囉,%{name},
@@ -1297,14 +1290,11 @@ zh-TW:
1297
1290
  flag_user_modal:
1298
1291
  already_reported: 此內容已被舉報,將由管理員進行審查。
1299
1292
  block: 封鎖此參與者
1300
- close: 關閉
1301
- description: 關於該使用者有什麼不適當的行為?
1302
1293
  does_not_belong: 包含非法活動、自殺威脅、個人資訊或其他您認為不適合在%{organization_name} 上的內容。
1303
1294
  hide: 隱藏所有內容
1304
1295
  offensive: 包含種族主義、性別歧視、辱罵、人身攻擊、死亡威脅、自殺要求或任何形式的仇恨言論
1305
1296
  report: 報告
1306
1297
  spam: 包含點閱率誘導、廣告、詐騙或自動腳本。
1307
- title: 舉報不適當的使用者
1308
1298
  floating_help:
1309
1299
  help: 幫助
1310
1300
  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.where.not(old_object_changes: nil).find_each do |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
- version.update_columns(old_object_changes: nil, object_changes:) # rubocop:disable Rails/SkipsModelValidations
28
- rescue NameError
29
- Rails.logger.info "Skipping History of #{version.item_type} with id #{version.item_id}"
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
@@ -49,7 +49,7 @@ module Decidim
49
49
 
50
50
  def existing_mentionables
51
51
  @existing_mentionables ||= mentionable_class.where(
52
- "decidim_organization_id = ? AND LOWER(nickname) IN (?)",
52
+ "decidim_organization_id = ? AND nickname IN (?)",
53
53
  current_organization.id,
54
54
  content_nicknames
55
55
  )
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds the decidim-core version.
5
5
  module Core
6
6
  def self.version
7
- "0.30.0.rc2"
7
+ "0.30.0.rc3"
8
8
  end
9
9
  end
10
10
  end
@@ -6,8 +6,42 @@ module Decidim
6
6
  module StaticMap
7
7
  # The static map utility class for the HERE maps service
8
8
  class Here < ::Decidim::Map::StaticMap
9
+ def url(latitude:, longitude:, options: {})
10
+ map_url = configuration.fetch(:url, nil)
11
+ return super unless map_url
12
+
13
+ return super unless map_url.include?("mia/v3")
14
+
15
+ w = options[:width] || Decidim::Map::StaticMap::DEFAULT_SIZE
16
+ h = options[:height] || Decidim::Map::StaticMap::DEFAULT_SIZE
17
+
18
+ params = {
19
+ apiKey: configuration[:api_key],
20
+ overlay: "point:#{latitude},#{longitude};icon=cp;size=large|#{latitude},#{longitude};style=circle;width=50m;color=%231B9D2C60"
21
+ }
22
+
23
+ URI.parse("#{map_url}:radius=90/#{w}x#{h}/png8").tap do |uri|
24
+ uri.query = URI.encode_www_form(params)
25
+ end.to_s
26
+ end
27
+
9
28
  # @See Decidim::Map::StaticMap#url_params
10
29
  def url_params(latitude:, longitude:, options: {})
30
+ ActiveSupport::Deprecation.warn(
31
+ <<~DEPRECATION.strip
32
+ Please use a V3 version HERE maps.
33
+ For further information, see:
34
+ https://www.here.com/docs/bundle/map-image-migration-guide-v3/page/README.html
35
+ Also make sure your Decidim.maps configurations are using the
36
+ up to date format.
37
+ You need to change:
38
+ static_url = "https://image.maps.ls.hereapi.com/mia/1.6/mapview" if static_provider == "here" && static_url.blank?
39
+ to:
40
+ static_url = "https://image.maps.hereapi.com/mia/v3/base/mc/overlay" if static_provider == "here"
41
+ in your config/initializers/decidim.rb file.
42
+ DEPRECATION
43
+ )
44
+
11
45
  params = {
12
46
  c: "#{latitude}, #{longitude}",
13
47
  z: options[:zoom] || Decidim::Map::StaticMap::DEFAULT_ZOOM,
@@ -52,7 +52,7 @@ module Decidim
52
52
  candidate = name
53
53
 
54
54
  2.step do |n|
55
- return candidate if Decidim::UserBaseEntity.where("nickname ILIKE ?", candidate.downcase).where(scope).empty?
55
+ return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(scope).empty?
56
56
 
57
57
  candidate = numbered_variation_of(name, n)
58
58
  end
@@ -2,37 +2,40 @@
2
2
 
3
3
  namespace :decidim do
4
4
  namespace :upgrade do
5
- desc "Modifies nicknames with random numbers when exists similar ones case-insensitively"
6
- task fix_nickname_uniqueness: :environment do
7
- logger = Logger.new($stdout)
8
- logger.info("Updating conflicting user nicknames...")
5
+ desc "Modifies nickname of the user to lower case"
6
+ task :fix_nickname_casing => :environment do
7
+ logger.info("Fixing user nicknames case...")
9
8
 
10
- # list of users already changed in the process
11
9
  has_changed = []
12
-
13
10
  Decidim::User.not_deleted.find_each do |user|
14
- next if has_changed.include? user.id
15
-
16
- Decidim::User.where(organization: user.organization)
17
- .where("nickname ILIKE ?", user.nickname.downcase)
18
- .where.not(id: has_changed + [user.id])
19
- .not_deleted
20
- .order(:created_at)
21
- .each do |similar_user|
22
- # change her nickname to the lowercased one with numbers if needed
23
- begin
24
- update_user_nickname(similar_user, Decidim::UserBaseEntity.nicknamize(similar_user.nickname, organization: similar_user.organization))
25
- rescue ActiveRecord::RecordInvalid => e
26
- logger.warn("User ID (#{similar_user.id}) : #{e}")
11
+ user.nickname.downcase!
12
+
13
+ begin
14
+ if user.nickname_changed?
15
+ user.save!
16
+ has_changed << user.id
27
17
  end
28
- has_changed.append(similar_user.id)
18
+ rescue ActiveRecord::RecordInvalid
19
+ update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, organization: user.organization))
20
+ has_changed << user.id
21
+ rescue ActiveRecord::RecordInvalid # rubocop:disable Lint/DuplicateRescueException
22
+ logger.warn("User ID (#{similar_user.id}) : #{e}")
29
23
  end
30
24
  end
31
25
  logger.info("Process terminated, #{has_changed.count} users nickname have been updated.")
32
26
  end
33
27
 
28
+ desc "Modifies nicknames with random numbers when exists similar ones case-insensitively"
29
+ task :fix_nickname_uniqueness => :environment do
30
+ Rake::Task["decidim:upgrade:fix_nickname_casing"].execute
31
+ end
32
+
34
33
  private
35
34
 
35
+ def logger
36
+ @logger ||= Logger.new($stdout)
37
+ end
38
+
36
39
  def send_notification_to(user)
37
40
  Decidim::EventsManager.publish(
38
41
  event: "decidim.events.nickname_event",