decidim-core 0.29.3 → 0.29.4

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 (79) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/address/show.erb +3 -3
  3. data/app/cells/decidim/author/show.erb +2 -4
  4. data/app/cells/decidim/content_blocks/participatory_space_extra_data/extra_data.erb +2 -2
  5. data/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb +4 -4
  6. data/app/commands/decidim/create_report.rb +5 -1
  7. data/app/commands/decidim/invite_user.rb +1 -1
  8. data/app/controllers/concerns/decidim/participatory_space_context.rb +4 -1
  9. data/app/controllers/decidim/reports_controller.rb +6 -1
  10. data/app/forms/decidim/omniauth_registration_form.rb +1 -1
  11. data/app/forms/decidim/registration_form.rb +1 -1
  12. data/app/helpers/decidim/menu_helper.rb +2 -2
  13. data/app/helpers/decidim/paginate_helper.rb +1 -1
  14. data/app/helpers/decidim/tooltip_helper.rb +4 -1
  15. data/app/mailers/decidim/notifications_digest_mailer.rb +7 -1
  16. data/app/mailers/decidim/reported_mailer.rb +17 -2
  17. data/app/packs/src/decidim/input_character_counter.js +1 -1
  18. data/app/packs/stylesheets/decidim/_cards.scss +1 -1
  19. data/app/packs/stylesheets/decidim/_header.scss +54 -35
  20. data/app/permissions/decidim/default_permissions.rb +2 -0
  21. data/app/presenters/decidim/notification_to_mailer_presenter.rb +7 -3
  22. data/app/queries/decidim/last_activity.rb +25 -0
  23. data/app/views/decidim/messaging/conversations/_reply_form.html.erb +1 -2
  24. data/app/views/decidim/messaging/conversations/_start.html.erb +1 -1
  25. data/app/views/decidim/reported_mailer/hidden_manually.html.erb +25 -0
  26. data/app/views/decidim/shared/_results_per_page.html.erb +1 -1
  27. data/app/views/kaminari/decidim/_page.html.erb +1 -1
  28. data/app/views/kaminari/decidim/_paginator.html.erb +1 -1
  29. data/app/views/layouts/decidim/_logo.html.erb +2 -2
  30. data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_desktop.html.erb +5 -11
  31. data/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb +5 -5
  32. data/config/locales/ar.yml +0 -6
  33. data/config/locales/bg.yml +0 -6
  34. data/config/locales/ca-IT.yml +12 -1
  35. data/config/locales/ca.yml +12 -1
  36. data/config/locales/cs.yml +18 -4
  37. data/config/locales/de.yml +16 -2
  38. data/config/locales/el.yml +0 -6
  39. data/config/locales/en.yml +12 -1
  40. data/config/locales/es-MX.yml +13 -2
  41. data/config/locales/es-PY.yml +13 -2
  42. data/config/locales/es.yml +12 -1
  43. data/config/locales/eu.yml +17 -5
  44. data/config/locales/fi-plain.yml +0 -6
  45. data/config/locales/fi.yml +0 -6
  46. data/config/locales/fr-CA.yml +14 -4
  47. data/config/locales/fr.yml +14 -4
  48. data/config/locales/gl.yml +0 -5
  49. data/config/locales/hu.yml +0 -6
  50. data/config/locales/id-ID.yml +0 -5
  51. data/config/locales/is-IS.yml +0 -5
  52. data/config/locales/it.yml +0 -5
  53. data/config/locales/ja.yml +16 -6
  54. data/config/locales/lb.yml +0 -5
  55. data/config/locales/lt.yml +0 -6
  56. data/config/locales/lv.yml +0 -5
  57. data/config/locales/nl.yml +0 -5
  58. data/config/locales/no.yml +0 -5
  59. data/config/locales/pl.yml +0 -6
  60. data/config/locales/pt-BR.yml +0 -6
  61. data/config/locales/pt.yml +0 -5
  62. data/config/locales/ro-RO.yml +0 -10
  63. data/config/locales/ru.yml +0 -5
  64. data/config/locales/sk.yml +0 -5
  65. data/config/locales/sv.yml +28 -12
  66. data/config/locales/tr-TR.yml +1 -5
  67. data/config/locales/uk.yml +0 -5
  68. data/config/locales/zh-CN.yml +0 -5
  69. data/config/locales/zh-TW.yml +0 -6
  70. data/db/migrate/20171212103803_create_unique_nicknames.rb +1 -1
  71. data/db/migrate/20180221101934_fix_nickname_index.rb +1 -1
  72. data/db/migrate/20180706104107_add_nickname_to_managed_users.rb +1 -1
  73. data/db/migrate/20181001124950_move_users_groups_to_users_table.rb +1 -1
  74. data/db/migrate/20190412131728_fix_user_names.rb +1 -1
  75. data/lib/decidim/core/version.rb +1 -1
  76. data/lib/decidim/nicknamizable.rb +6 -9
  77. data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +1 -1
  78. metadata +8 -7
  79. /data/app/views/decidim/reported_mailer/{hide.html.erb → hidden_automatically.html.erb} +0 -0
@@ -667,7 +667,6 @@ ja:
667
667
  drag_and_drop_help: ドラッグ&ドロップまたは貼り付けることで画像を追加できます。
668
668
  endorsement_buttons_cell:
669
669
  already_endorsed: 取り消し
670
- endorse: オススメ
671
670
  endorsements:
672
671
  identities:
673
672
  done: 完了
@@ -1272,8 +1271,8 @@ ja:
1272
1271
  hello: こんにちは %{name} さん、
1273
1272
  intro:
1274
1273
  daily: 'あなたがフォローしているアクティビティに基づいた最終日以降の通知です:'
1275
- real_time: 'これらはあなたが以下のアクティビティについての通知です:'
1276
- weekly: 'これらは、あなたがフォローしているアクティビティに基づいた先週以降の通知です:'
1274
+ real_time: 'あなたがフォローしているアクティビティに基づいた通知です:'
1275
+ weekly: 'あなたがフォローしているアクティビティに基づいた先週以降の通知です:'
1277
1276
  outro: このコンテンツまたは著者をフォローしているため、これらの通知を受け取りました。それぞれのページからフォローを解除できます。
1278
1277
  see_more: 他の通知を見る
1279
1278
  subject: あなたのメールダイジェストです
@@ -1404,15 +1403,24 @@ ja:
1404
1403
  confirmation_instructions_sent: メール確認の手順を送信しました。
1405
1404
  fill_in_email_to_confirm_it: グループのメールアドレスを入力して確認してください。
1406
1405
  reported_mailer:
1407
- hide:
1406
+ hidden_automatically:
1408
1407
  content: 通報されたコンテンツ
1409
1408
  details: 詳細
1410
- hello: こんにちは、 %{name} さん。
1409
+ hello: こんにちは %{name} さん、
1411
1410
  manage_moderations: モデレーションの管理
1412
1411
  participatory_space: 参加型スペース
1413
1412
  reason: 理由
1414
- report_html: <p>次の <a href="%{url}">コンテンツ</a> が自動的に非表示になりました。</p>
1413
+ report_html: <p>以下の<a href="%{url}">コンテンツ</a>は自動的に非表示にされました。</p>
1415
1414
  subject: リソースは自動的に非表示になりました
1415
+ hidden_manually:
1416
+ content: 通報されたコンテンツ
1417
+ details: 詳細
1418
+ hello: こんにちは %{name} さん、
1419
+ manage_moderations: モデレーションの管理
1420
+ participatory_space: 参加型スペース
1421
+ reason: 理由
1422
+ report_html: <p>以下の<a href="%{url}">コンテンツ</a>は %{moderator} によって非表示にされました。</p>
1423
+ subject: リソースは%{moderator}によって非表示にされました
1416
1424
  report:
1417
1425
  authors: 著者
1418
1426
  content: 報告されたコンテンツ
@@ -1430,6 +1438,8 @@ ja:
1430
1438
  create:
1431
1439
  error: レポートの作成中にエラーが発生しました。もう一度やり直してください。
1432
1440
  success: レポートは正常に作成され、管理者によってレビューされます。
1441
+ hide:
1442
+ success: このリソースは非表示になっています。
1433
1443
  parent_hidden:
1434
1444
  report_details: 親リソースは非表示
1435
1445
  resource_endorsements:
@@ -914,11 +914,6 @@ lb:
914
914
  manage_user_group_users: Memberen verwalten
915
915
  resend_email_confirmation_instructions: Den Email mat der Confirmatioun vun den Instruktiounen op en Neits schécken
916
916
  reported_mailer:
917
- hide:
918
- hello: Moien %{name}
919
- manage_moderations: Moderatiounen verwalten
920
- report_html: <p>Den folgenden Inhalt <a href="%{url}">Inhalt</a> gouf automatesch ausgeblent.</p>
921
- subject: Eng Ressource gouf automatesch ausgeblent
922
917
  report:
923
918
  authors: Auteuren
924
919
  content: Inhalt gouf gemellt
@@ -665,7 +665,6 @@ lt:
665
665
  drag_and_drop_help: Pridėkite paveikslėlius juos užvesdami ant lango arba juos įklijuodami.
666
666
  endorsement_buttons_cell:
667
667
  already_endorsed: Nepatinka
668
- endorse: Patinka
669
668
  endorsements:
670
669
  identities:
671
670
  done: Atlikta
@@ -1363,11 +1362,6 @@ lt:
1363
1362
  confirmation_instructions_sent: Patvirtinimo el. laiškas išsiųstas.
1364
1363
  fill_in_email_to_confirm_it: Prašau įveskite grupės el. paštą tam, kad jį patvirtinti.
1365
1364
  reported_mailer:
1366
- hide:
1367
- hello: Sveiki %{name},
1368
- manage_moderations: Tvarkyti vedamas diskusijas
1369
- report_html: <p>Toliau pateikiamas <a href="%{url}">turinys</a> paslėptas automatiškai.</p>
1370
- subject: Išteklius paslėptas automatiškai
1371
1365
  report:
1372
1366
  authors: Autoriai
1373
1367
  content: Turinys, apie kurį pranešta
@@ -811,11 +811,6 @@ lv:
811
811
  manage_user_group_users: Pārvaldīt biedrus
812
812
  resend_email_confirmation_instructions: Atkārtoti e-pastā nosūtīt apstiprināšanas norādījumus
813
813
  reported_mailer:
814
- hide:
815
- hello: Sveiki, %{name}!
816
- manage_moderations: Pārvaldiet moderāciju
817
- report_html: <p> Šis <a href="%{url}"> saturs </a> ir paslēpts automātiski.</p>
818
- subject: Vienums ir automātiski paslēpts
819
814
  report:
820
815
  hello: Sveiki, %{name}!
821
816
  report_html: <p> Par šo <a href="%{url}"> saturu </a> ir ziņots.</p>
@@ -925,11 +925,6 @@ nl:
925
925
  manage_user_group_users: Leden beheren
926
926
  resend_email_confirmation_instructions: Verzend instructies voor e-mailbevestiging opnieuw
927
927
  reported_mailer:
928
- hide:
929
- hello: Hallo %{name},
930
- manage_moderations: Beheer moderaties
931
- report_html: <p>De volgende <a href="%{url}">content</a> is automatisch verborgen.</p>
932
- subject: Een bron is automatisch verborgen
933
928
  report:
934
929
  authors: Auteurs
935
930
  content: Gerapporteerde inhoud
@@ -937,11 +937,6 @@
937
937
  manage_user_group_users: Administrere medlemmer
938
938
  resend_email_confirmation_instructions: Send email bekreftelse instruksjoner på nytt
939
939
  reported_mailer:
940
- hide:
941
- hello: Hei %{name},
942
- manage_moderations: Administrer moderasjoner
943
- report_html: <p>Det følgene <a href="%{url}">innholdet</a> har blitt automatisk skjult.</p>
944
- subject: En ressurs var automatisk skjult
945
940
  report:
946
941
  authors: Forfattere
947
942
  content: Rapportert innhold
@@ -655,7 +655,6 @@ pl:
655
655
  drag_and_drop_help: Dodaj obrazy, przeciągając i upuszczając lub wklejając je.
656
656
  endorsement_buttons_cell:
657
657
  already_endorsed: Nie lubię tego
658
- endorse: Lubię to
659
658
  endorsements:
660
659
  identities:
661
660
  done: Gotowe
@@ -1377,11 +1376,6 @@ pl:
1377
1376
  confirmation_instructions_sent: Wysłano instrukcje dotyczące potwierdzenia adresu e-mail.
1378
1377
  fill_in_email_to_confirm_it: Podaj adres e-mail grupy, aby go potwierdzić.
1379
1378
  reported_mailer:
1380
- hide:
1381
- hello: Witaj %{name},
1382
- manage_moderations: Zarządzaj moderacjami
1383
- report_html: <p>Poniższa<a href="%{url}">zawartość</a> została ukryta automatycznie.</p>
1384
- subject: Zasób został ukryty automatycznie
1385
1379
  report:
1386
1380
  authors: Autorzy
1387
1381
  content: Zgłoszona zawartość
@@ -646,7 +646,6 @@ pt-BR:
646
646
  drag_and_drop_help: Adicione imagens arrastando e soltando ou colando-as.
647
647
  endorsement_buttons_cell:
648
648
  already_endorsed: Dislike
649
- endorse: Like
650
649
  endorsements:
651
650
  identities:
652
651
  done: Concluído
@@ -1312,11 +1311,6 @@ pt-BR:
1312
1311
  confirmation_instructions_sent: Reenviar instruções de confirmação.
1313
1312
  fill_in_email_to_confirm_it: Por favor, preencha o e-mail do seu grupo para confirmar.
1314
1313
  reported_mailer:
1315
- hide:
1316
- hello: Olá %{name},
1317
- manage_moderations: Gerenciar moderações
1318
- report_html: <p>O seguinte <a href="%{url}">content</a> foi ocultado automaticamente.</p>
1319
- subject: Um recurso foi escondido automaticamente
1320
1314
  report:
1321
1315
  authors: Autores
1322
1316
  content: Conteúdo denunciado
@@ -917,11 +917,6 @@ pt:
917
917
  manage_user_group_users: Gerir membros
918
918
  resend_email_confirmation_instructions: Reenviar instruções de confirmação de e-mail
919
919
  reported_mailer:
920
- hide:
921
- hello: Olá %{name},
922
- manage_moderations: Gerir moderações
923
- report_html: <p>O seguinte <a href="%{url}">conteúdo</a> foi ocultado automaticamente.</p>
924
- subject: Um recurso foi ocultado automaticamente
925
920
  report:
926
921
  authors: Autores
927
922
  content: Conteúdo reportado
@@ -697,7 +697,6 @@ ro:
697
697
  drag_and_drop_help: Adaugați imagini prin tragere & plasare sau lipirea lor.
698
698
  endorsement_buttons_cell:
699
699
  already_endorsed: Nu-mi place
700
- endorse: Îmi place
701
700
  endorsements:
702
701
  identities:
703
702
  done: Finalizat
@@ -1286,15 +1285,6 @@ ro:
1286
1285
  message: Mesaj
1287
1286
  resend_email_confirmation_instructions: Retrimite e-mail instrucțiuni de confirmare
1288
1287
  reported_mailer:
1289
- hide:
1290
- content: Conținut raportat
1291
- details: Detalii
1292
- hello: Bună ziua %{name},
1293
- manage_moderations: Gestionați moderările
1294
- participatory_space: Spaţiu participativ
1295
- reason: Motiv
1296
- report_html: <p>Următorul <a href="%{url}">conținut</a> a fost ascuns automat.</p>
1297
- subject: O resursă a fost ascunsă automat
1298
1288
  report:
1299
1289
  authors: Autori
1300
1290
  content: Conținut raportat
@@ -523,11 +523,6 @@ ru:
523
523
  manage_user_group_admins: Управление админами
524
524
  manage_user_group_users: Управление участниками
525
525
  reported_mailer:
526
- hide:
527
- hello: Здравствуйте, %{name}!
528
- manage_moderations: Управление действиями по модерации
529
- report_html: <p>Следующее <a href="%{url}">содержимое</a> было автоматически скрыто.</p>
530
- subject: Ресурс был автоматически скрыт
531
526
  report:
532
527
  hello: Здравствуйте, %{name}!
533
528
  report_html: <p>О следующем <a href="%{url}">содержимом</a> была передана жалоба администраторам.</p>
@@ -806,11 +806,6 @@ sk:
806
806
  manage_user_group_users: Správa členov
807
807
  resend_email_confirmation_instructions: Opakujte e-mailové pokyny na potvrdenie
808
808
  reported_mailer:
809
- hide:
810
- hello: Zdravím %{name},
811
- manage_moderations: Správa moderovanie
812
- report_html: <p> Nasledujúce <a href="%{url}"> obsah </a> bol automaticky skrytý. </ p>
813
- subject: Zdroj bol automaticky skrytý
814
809
  report:
815
810
  hello: Zdravím %{name},
816
811
  report_html: <p> Bol nahlásený nasledujúce <a href="%{url}"> obsah </a>. </ p>
@@ -42,7 +42,7 @@ sv:
42
42
  user:
43
43
  attributes:
44
44
  nickname:
45
- format: Smeknamnet ska vara små bokstäver utan mellanslag
45
+ format: Användarnamnet måste ha små bokstäver inga mellanslag
46
46
  models:
47
47
  decidim/attachment_created_event: Bilaga
48
48
  decidim/component_published_event: Aktiv komponent
@@ -156,6 +156,7 @@ sv:
156
156
  front_page_link: Gå till startsidan
157
157
  logo: "%{organization}s logotyp"
158
158
  opens_in_new_tab: Öppnas i en ny flik
159
+ secondary_menu: Sekundär meny
159
160
  skip_button: Gå till innehåll
160
161
  account:
161
162
  blocked: Detta konto har blockerats på grund av brott mot användarvillkoren
@@ -612,7 +613,7 @@ sv:
612
613
  terms: användarvillkoren
613
614
  tos_agreement: Genom att registrera dig godkänner du %{link}.
614
615
  tos_title: Användarvillkor
615
- username_help: Offentligt namn som visas dina inlägg. I syfte att garantera anonymiteten kan det vara vilket namn som helst.
616
+ username_help: Offentligt namn som visas vid dina inlägg. Använd ett påhittat namn om du vill vara anonym.
616
617
  sessions:
617
618
  new:
618
619
  are_you_new?: Ny här?
@@ -1150,7 +1151,7 @@ sv:
1150
1151
  add_conversation_users:
1151
1152
  add_max_users: 'Lägg till användare i samtalet: högst 9'
1152
1153
  add_users_placeholder: Sök...
1153
- modal_title: Nytt samtal
1154
+ modal_title: Ny konversation
1154
1155
  no_results: Inga resultat
1155
1156
  participant_with_disabled_message_reception: Den här deltagaren vill inte ta emot privata meddelanden.
1156
1157
  create:
@@ -1161,10 +1162,10 @@ sv:
1161
1162
  intro: 'Det fanns följande fel med ditt meddelande:'
1162
1163
  ok: Ok
1163
1164
  index:
1164
- new_conversation: Nytt samtal
1165
+ new_conversation: Ny konversation
1165
1166
  next: Nästa
1166
1167
  no_conversations: Du har inga konversationer än.
1167
- title: Samtal
1168
+ title: Konversationer
1168
1169
  reply_form:
1169
1170
  placeholder: Ditt svar...
1170
1171
  send: Skicka
@@ -1173,7 +1174,7 @@ sv:
1173
1174
  chat_with: Konversation med
1174
1175
  deleted_accounts: Du kan inte ha en konversation med raderade konton.
1175
1176
  not_allowed: Deltagaren tar inte emot direktmeddelanden.
1176
- title: Samtal med %{usernames}
1177
+ title: Konversation med %{usernames}
1177
1178
  start:
1178
1179
  placeholder: Ditt meddelande...
1179
1180
  send: Skicka
@@ -1215,7 +1216,7 @@ sv:
1215
1216
  interpolations_hint: 'Tips: Du kan använda "%{name}" var som helst i innehållet eller ämnet och det kommer att ersättas av mottagarens namn.'
1216
1217
  image_text_cta:
1217
1218
  body_preview: 'Dummy text för innehåll: Maecenas ac nisl vitae lectus pretium facilisis. Etiam facilisis sem nibh, sit amet rutrum mi aliquam nec. Sed id urna at nisl pretium mollis eu vel velit. Proin vitae suscipit urna, sed faucibus urna. Pellentesque id libero vulputate ipsum scelerisque suscipit. Nam aliquam sodales mi sit amet cursus. Donec mattis faucibus purus. Aenean tincidunt porta lorem ac commodo. Vestibulum in mollis mi. Morbi eros erat, cursus ut tortor sit amet, imperdiet dapibus arcu. Suspendisse id egestas enim. In eget magna sed enim efficitur elementum sit amet aliquam quam. Donec fermentum metus eget urna luctus pulvinar.'
1218
- cta_text_preview: Uppmaningens text
1219
+ cta_text_preview: Text på knapp
1219
1220
  introduction_preview: 'Dummy text för introduktion: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque fringilla nisl tellus. Donec sed mi dui. Sed efficitur libero a felis tempor sollicitudin. Nullam vestibulum fringilla felis, id efficitur lorem sagittis et. Vivamus aliquam maximus velit vel dapibus. Mauris pellentesque, enim eu varius lacinia, risus ante rutrum ipsum, non lobortis augue lorem quis urna. Aenean et malesuada arcu.'
1220
1221
  name: Bild, text och knapp
1221
1222
  image_text_cta_settings_form:
@@ -1304,7 +1305,7 @@ sv:
1304
1305
  open_data:
1305
1306
  not_available_yet: De öppna datafilerna är ännu inte tillgängliga, var vänlig försök igen om några minuter.
1306
1307
  pad_iframe:
1307
- disclaimer: Innehållet i detta memo är skrivet av registrerade användare och uttrycker deras åsikter. %{organization} kan inte hållas ansvarig för innehållet.
1308
+ disclaimer: Innehållet i anteckningarna är skrivet av registrerade användare och uttrycker deras åsikter. %{organization} kan inte hållas ansvarig för innehållet.
1308
1309
  explanation: Använd den här anteckningsytan för att gemensamt ta anteckningar under mötet så att det går lättare att skriva protokollet efteråt.
1309
1310
  pad: Memo
1310
1311
  pages:
@@ -1396,11 +1397,24 @@ sv:
1396
1397
  confirmation_instructions_sent: Instruktioner för e-postbekräftelse har skickats.
1397
1398
  fill_in_email_to_confirm_it: Fyll i gruppens e-postadress för att bekräfta den.
1398
1399
  reported_mailer:
1399
- hide:
1400
+ hidden_automatically:
1401
+ content: Rapporterat innehåll
1402
+ details: Detaljer
1400
1403
  hello: Hej %{name},
1401
- manage_moderations: Hantera moderering
1402
- report_html: <p>Följande <a href="%{url}">innehåll</a> har döljts automatiskt.</p>
1403
- subject: En resurs har döljts automatiskt
1404
+ manage_moderations: Hantera modereringar
1405
+ participatory_space: Deltagarutrymme
1406
+ reason: Anledning
1407
+ report_html: <p>Följande <a href="%{url}">innehåll</a> har dolts automatiskt.</p>
1408
+ subject: En resurs har dolts automatiskt
1409
+ hidden_manually:
1410
+ content: Rapporterat innehåll
1411
+ details: Detaljer
1412
+ hello: Hej %{name},
1413
+ manage_moderations: Hantera modereringar
1414
+ participatory_space: Deltagarutrymme
1415
+ reason: Anledning
1416
+ report_html: <p>Följande <a href="%{url}">-innehåll</a> har dolts av %{moderator}.</p>
1417
+ subject: En resurs har dolts av %{moderator}
1404
1418
  report:
1405
1419
  authors: Författare
1406
1420
  content: Rapporterat innehåll
@@ -1418,6 +1432,8 @@ sv:
1418
1432
  create:
1419
1433
  error: Det uppstod ett fel när rapporten skulle skapas. Försök igen.
1420
1434
  success: Rapporten har skapats och kommer att granskas av en administratör.
1435
+ hide:
1436
+ success: Denna resurs har gömts.
1421
1437
  resource_endorsements:
1422
1438
  create:
1423
1439
  error: Det gick inte att gilla.
@@ -627,6 +627,7 @@ tr:
627
627
  file:
628
628
  explanation: 'Dosya kılavuzu:'
629
629
  message_1: Bir resim veya bir belge olmalı.
630
+ message_2: Resimler için tercihen yatay resimleri kullanın, bu servis resmi kırpar.
630
631
  image:
631
632
  explanation: 'Dosya kılavuzu:'
632
633
  message_2: Bu servis görüntüyü kırpar.
@@ -925,11 +926,6 @@ tr:
925
926
  manage_user_group_users: Üyeleri yönet
926
927
  resend_email_confirmation_instructions: E-posta doğrulama talimatlarını tekrar gönder
927
928
  reported_mailer:
928
- hide:
929
- hello: Merhaba %{name}
930
- manage_moderations: Denetimleri yönet
931
- report_html: <p>Aşağıdaki <a href="%{url}">içerik</a> otomatik olarak gizlendi.</p>
932
- subject: Bir kaynak otomatik olarak gizlendi
933
929
  report:
934
930
  authors: Yazarlar
935
931
  content: İçeriği bildir
@@ -408,11 +408,6 @@ uk:
408
408
  actions:
409
409
  edit_profile: Редагувати профіль
410
410
  reported_mailer:
411
- hide:
412
- hello: Доброго дня, %{name}%!
413
- manage_moderations: Керувати діями з модерації
414
- report_html: <p>Наступний <a href="%{url}">вміст</a> було автоматично приховано.</p>
415
- subject: Ресурс було автоматично приховано
416
411
  report:
417
412
  hello: Доброго дня, %{name}%!
418
413
  report_html: <p>Про наступний <a href="%{url}">вміст</a> було передано скаргу адміністраторам.</p>
@@ -835,11 +835,6 @@ zh-CN:
835
835
  manage_user_group_users: 管理成员
836
836
  resend_email_confirmation_instructions: 重新发送电子邮件确认说明
837
837
  reported_mailer:
838
- hide:
839
- hello: 您好 %{name},
840
- manage_moderations: 管理版面
841
- report_html: <p>以下 <a href="%{url}">内容</a> 已被自动隐藏。</p>
842
- subject: 资源已自动隐藏
843
838
  report:
844
839
  authors: 作者
845
840
  content: 报告的内容
@@ -566,7 +566,6 @@ zh-TW:
566
566
  drag_and_drop_help: 通過拖放或粘貼方式添加圖片。
567
567
  endorsement_buttons_cell:
568
568
  already_endorsed: 不喜歡
569
- endorse: 喜歡!
570
569
  endorsements:
571
570
  identities:
572
571
  done: 已完成
@@ -1241,11 +1240,6 @@ zh-TW:
1241
1240
  confirmation_instructions_sent: 電子郵件確認指示已發送.
1242
1241
  fill_in_email_to_confirm_it: 請填寫您的群組電子郵件以進行確認.
1243
1242
  reported_mailer:
1244
- hide:
1245
- hello: 哈囉,%{name},
1246
- manage_moderations: 管理版主
1247
- report_html: <p>以下<a href="%{url}">內容</a>已自動隱藏。</p>
1248
- subject: 一個資源已被自動隱藏。
1249
1243
  report:
1250
1244
  authors: 作者
1251
1245
  content: 已檢舉內容
@@ -11,7 +11,7 @@ class CreateUniqueNicknames < ActiveRecord::Migration[5.1]
11
11
  add_column :decidim_users, :nickname, :string, limit: 20
12
12
 
13
13
  User.where.not(name: nil).find_each do |user|
14
- user.update!(nickname: UserBaseEntity.nicknamize(user.name, decidim_organization_id: user.decidim_organization_id))
14
+ user.update!(nickname: UserBaseEntity.nicknamize(user.name, user.decidim_organization_id))
15
15
  end
16
16
 
17
17
  add_index :decidim_users,
@@ -11,7 +11,7 @@ class FixNicknameIndex < ActiveRecord::Migration[5.1]
11
11
  User.where(nickname: nil)
12
12
  .where(deleted_at: nil)
13
13
  .where(managed: false)
14
- .find_each { |u| u.update(nickname: UserBaseEntity.nicknamize(u.name, decidim_organization_id: u.decidim_organization_id)) }
14
+ .find_each { |u| u.update(nickname: UserBaseEntity.nicknamize(u.name, u.decidim_organization_id)) }
15
15
 
16
16
  # rubocop:disable Rails/SkipsModelValidations
17
17
  User.where(nickname: nil).update_all("nickname = ''")
@@ -7,7 +7,7 @@ class AddNicknameToManagedUsers < ActiveRecord::Migration[5.2]
7
7
 
8
8
  def up
9
9
  User.where(managed: true, nickname: nil).includes(:organization).find_each do |user|
10
- user.nickname = UserBaseEntity.nicknamize(user.name, organization: user.organization)
10
+ user.nickname = UserBaseEntity.nicknamize(user.name, user.decidim_organization_id)
11
11
  user.save
12
12
  end
13
13
  end
@@ -64,7 +64,7 @@ class MoveUsersGroupsToUsersTable < ActiveRecord::Migration[5.2]
64
64
  verified_at: old_user_group.verified_at
65
65
  }
66
66
  new_attributes = clean_attributes.merge(
67
- nickname: UserBaseEntity.nicknamize(clean_attributes["name"]),
67
+ nickname: UserBaseEntity.nicknamize(clean_attributes["name"], old_user_group.decidim_organization_id),
68
68
  extended_data:
69
69
  )
70
70
  new_user_group = NewUserGroup.create!(new_attributes)
@@ -23,7 +23,7 @@ class FixUserNames < ActiveRecord::Migration[5.2]
23
23
 
24
24
  entity.name = entity.name.delete(characters_to_remove).strip
25
25
  sanitized_nickname = entity.nickname.delete(characters_to_remove).strip
26
- entity.nickname = UserBaseEntity.nicknamize(sanitized_nickname, organization: entity.organization)
26
+ entity.nickname = UserBaseEntity.nicknamize(sanitized_nickname, entity.decidim_organization_id)
27
27
  entity.save(validate: false)
28
28
  end
29
29
  end
@@ -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.29.3"
7
+ "0.29.4"
8
8
  end
9
9
  end
10
10
  end
@@ -27,19 +27,16 @@ module Decidim
27
27
  # * Disambiguates it so it is unique.
28
28
  #
29
29
  # name - the String to nicknamize
30
- # scope - a Hash with extra values to scope the nickname to
30
+ # organization_id - the organization id we are using as scope for the uniqueness
31
31
  #
32
32
  # Example to nicknamize a user name, scoped to the organization:
33
33
  #
34
- # nicknamize(user_name, organization: current_organization)
34
+ # nicknamize(user_name, organization_id)
35
35
  #
36
- def nicknamize(name, scope = {})
36
+ def nicknamize(name, organization_id)
37
37
  return unless name
38
38
 
39
- disambiguate(
40
- name.parameterize(separator: "_")[nickname_length_range],
41
- scope
42
- )
39
+ disambiguate(name.parameterize(separator: "_")[nickname_length_range], organization_id)
43
40
  end
44
41
 
45
42
  private
@@ -48,11 +45,11 @@ module Decidim
48
45
  (0...nickname_max_length)
49
46
  end
50
47
 
51
- def disambiguate(name, scope)
48
+ def disambiguate(name, organization_id)
52
49
  candidate = name
53
50
 
54
51
  2.step do |n|
55
- return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(scope).empty?
52
+ return candidate if Decidim::UserBaseEntity.where(nickname: candidate.downcase).where(decidim_organization_id: organization_id).empty?
56
53
 
57
54
  candidate = numbered_variation_of(name, n)
58
55
  end
@@ -16,7 +16,7 @@ namespace :decidim do
16
16
  has_changed << user.id
17
17
  end
18
18
  rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
19
- update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, organization: user.organization))
19
+ update_user_nickname(user, Decidim::UserBaseEntity.nicknamize(user.nickname, user.decidim_organization_id))
20
20
  has_changed << user.id
21
21
  rescue ActiveRecord::RecordInvalid # rubocop:disable Lint/DuplicateRescueException
22
22
  logger.warn("User ID (#{user.id}) : #{e}")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.29.3
4
+ version: 0.29.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2025-04-29 00:00:00.000000000 Z
13
+ date: 2025-06-04 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: concurrent-ruby
@@ -772,28 +772,28 @@ dependencies:
772
772
  requirements:
773
773
  - - '='
774
774
  - !ruby/object:Gem::Version
775
- version: 0.29.3
775
+ version: 0.29.4
776
776
  type: :development
777
777
  prerelease: false
778
778
  version_requirements: !ruby/object:Gem::Requirement
779
779
  requirements:
780
780
  - - '='
781
781
  - !ruby/object:Gem::Version
782
- version: 0.29.3
782
+ version: 0.29.4
783
783
  - !ruby/object:Gem::Dependency
784
784
  name: decidim-dev
785
785
  requirement: !ruby/object:Gem::Requirement
786
786
  requirements:
787
787
  - - '='
788
788
  - !ruby/object:Gem::Version
789
- version: 0.29.3
789
+ version: 0.29.4
790
790
  type: :development
791
791
  prerelease: false
792
792
  version_requirements: !ruby/object:Gem::Requirement
793
793
  requirements:
794
794
  - - '='
795
795
  - !ruby/object:Gem::Version
796
- version: 0.29.3
796
+ version: 0.29.4
797
797
  description: Adds core features so other engines can hook into the framework.
798
798
  email:
799
799
  - josepjaume@gmail.com
@@ -2029,7 +2029,8 @@ files:
2029
2029
  - app/views/decidim/pages/index.html.erb
2030
2030
  - app/views/decidim/pages/show.html.erb
2031
2031
  - app/views/decidim/profiles/show.html.erb
2032
- - app/views/decidim/reported_mailer/hide.html.erb
2032
+ - app/views/decidim/reported_mailer/hidden_automatically.html.erb
2033
+ - app/views/decidim/reported_mailer/hidden_manually.html.erb
2033
2034
  - app/views/decidim/reported_mailer/report.html.erb
2034
2035
  - app/views/decidim/scopes/_scopes_picker_input.html.erb
2035
2036
  - app/views/decidim/scopes/picker.html.erb