decidim-core 0.30.0 → 0.30.1
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/address/show.erb +3 -3
- data/app/cells/decidim/author/show.erb +1 -1
- data/app/cells/decidim/content_blocks/participatory_space_extra_data/extra_data.erb +2 -2
- data/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb +4 -4
- data/app/commands/decidim/create_report.rb +5 -1
- data/app/commands/decidim/invite_user.rb +1 -1
- data/app/controllers/concerns/decidim/participatory_space_context.rb +4 -1
- data/app/controllers/decidim/reports_controller.rb +6 -1
- data/app/forms/decidim/ephemeral_user_form.rb +1 -1
- data/app/forms/decidim/omniauth_registration_form.rb +1 -1
- data/app/forms/decidim/registration_form.rb +1 -1
- data/app/helpers/decidim/menu_helper.rb +2 -2
- data/app/helpers/decidim/paginate_helper.rb +1 -1
- data/app/helpers/decidim/tooltip_helper.rb +4 -1
- data/app/mailers/decidim/notifications_digest_mailer.rb +7 -1
- data/app/mailers/decidim/reported_mailer.rb +17 -2
- data/app/packs/src/decidim/input_character_counter.js +1 -1
- data/app/packs/stylesheets/decidim/_cards.scss +1 -1
- data/app/packs/stylesheets/decidim/_header.scss +54 -35
- data/app/packs/stylesheets/decidim/resource_history.scss +14 -4
- data/app/permissions/decidim/default_permissions.rb +2 -0
- data/app/presenters/decidim/notification_to_mailer_presenter.rb +7 -3
- data/app/queries/decidim/last_activity.rb +25 -0
- data/app/views/decidim/messaging/conversations/_reply_form.html.erb +1 -2
- data/app/views/decidim/messaging/conversations/_start.html.erb +1 -1
- data/app/views/decidim/reported_mailer/hidden_manually.html.erb +25 -0
- data/app/views/decidim/shared/_results_per_page.html.erb +1 -1
- data/app/views/kaminari/decidim/_page.html.erb +1 -1
- data/app/views/kaminari/decidim/_paginator.html.erb +1 -1
- data/app/views/layouts/decidim/_logo.html.erb +2 -2
- data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_desktop.html.erb +5 -11
- data/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb +5 -5
- data/config/locales/ar.yml +0 -7
- data/config/locales/bg.yml +0 -7
- data/config/locales/ca-IT.yml +12 -1
- data/config/locales/ca.yml +12 -1
- data/config/locales/cs.yml +23 -12
- data/config/locales/de.yml +26 -11
- data/config/locales/el.yml +0 -7
- data/config/locales/en.yml +12 -1
- data/config/locales/es-MX.yml +13 -2
- data/config/locales/es-PY.yml +13 -2
- data/config/locales/es.yml +12 -1
- data/config/locales/eu.yml +17 -5
- data/config/locales/fi-plain.yml +0 -15
- data/config/locales/fi.yml +0 -15
- data/config/locales/fr-CA.yml +14 -8
- data/config/locales/fr.yml +14 -8
- data/config/locales/gl.yml +0 -5
- data/config/locales/hu.yml +0 -7
- data/config/locales/id-ID.yml +0 -5
- data/config/locales/is-IS.yml +0 -5
- data/config/locales/it.yml +0 -5
- data/config/locales/ja.yml +16 -14
- data/config/locales/lb.yml +0 -5
- data/config/locales/lt.yml +0 -7
- data/config/locales/lv.yml +0 -5
- data/config/locales/nl.yml +0 -5
- data/config/locales/no.yml +0 -5
- data/config/locales/pl.yml +0 -7
- data/config/locales/pt-BR.yml +0 -7
- data/config/locales/pt.yml +0 -5
- data/config/locales/ro-RO.yml +0 -14
- data/config/locales/ru.yml +0 -5
- data/config/locales/sk.yml +0 -5
- data/config/locales/sv.yml +36 -12
- data/config/locales/tr-TR.yml +0 -5
- data/config/locales/uk.yml +0 -5
- data/config/locales/zh-CN.yml +0 -5
- data/config/locales/zh-TW.yml +0 -7
- data/db/migrate/20171212103803_create_unique_nicknames.rb +1 -1
- data/db/migrate/20180221101934_fix_nickname_index.rb +1 -1
- data/db/migrate/20180706104107_add_nickname_to_managed_users.rb +1 -1
- data/db/migrate/20181001124950_move_users_groups_to_users_table.rb +1 -1
- data/db/migrate/20190412131728_fix_user_names.rb +1 -1
- data/lib/decidim/core/test/factories.rb +12 -0
- data/lib/decidim/core/test/shared_examples/map_examples.rb +2 -2
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/nicknamizable.rb +6 -9
- data/lib/decidim/private_download_helper.rb +3 -3
- data/lib/tasks/upgrade/clean.rake +9 -1
- data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +1 -1
- data/lib/tasks/upgrade/migrations.rake +2 -0
- metadata +8 -7
- /data/app/views/decidim/reported_mailer/{hide.html.erb → hidden_automatically.html.erb} +0 -0
data/config/locales/fr.yml
CHANGED
@@ -753,15 +753,10 @@ fr:
|
|
753
753
|
error: Une erreur est survenue lors du téléchargement de l'image.
|
754
754
|
success: L'image a été téléchargée avec succès.
|
755
755
|
drag_and_drop_help: Ajoutez des images en les glissant - déposant ou en les collant depuis votre presse-papier.
|
756
|
-
endorsement_buttons_cell:
|
757
|
-
endorse: J’aime
|
758
756
|
endorsements:
|
759
757
|
identities:
|
760
758
|
done: Terminé
|
761
759
|
select_identity: Sélectionner une identité
|
762
|
-
endorsers_list:
|
763
|
-
others: "%{count} de plus"
|
764
|
-
you: vous
|
765
760
|
ephemeral_user: Visiteur
|
766
761
|
errors:
|
767
762
|
files:
|
@@ -1590,15 +1585,24 @@ fr:
|
|
1590
1585
|
confirmation_instructions_sent: Instructions de confirmation d'email envoyées.
|
1591
1586
|
fill_in_email_to_confirm_it: Veuillez compléter le mail de votre groupe pour confirmer celui-ci.
|
1592
1587
|
reported_mailer:
|
1593
|
-
|
1588
|
+
hidden_automatically:
|
1589
|
+
content: Contenu signalé
|
1590
|
+
details: Détails
|
1591
|
+
hello: Bonjour %{name},
|
1592
|
+
manage_moderations: Gérer les modérations
|
1593
|
+
participatory_space: Espace participatif
|
1594
|
+
reason: Motif
|
1595
|
+
report_html: <p>Le <a href="%{url}">contenu</a> suivant a été masqué automatiquement.</p>
|
1596
|
+
subject: Une ressource a été masquée automatiquement
|
1597
|
+
hidden_manually:
|
1594
1598
|
content: Contenu signalé
|
1595
1599
|
details: Détails
|
1596
1600
|
hello: Bonjour %{name},
|
1597
1601
|
manage_moderations: Gérer les modérations
|
1598
1602
|
participatory_space: Espace participatif
|
1599
1603
|
reason: Motif
|
1600
|
-
report_html: <p>Le <a href="%{url}">contenu
|
1601
|
-
subject: Une ressource a été
|
1604
|
+
report_html: <p>Le <a href="%{url}">contenu</a> suivant a été masqué automatiquement.</p>
|
1605
|
+
subject: Une ressource a été masquée par %{moderator}
|
1602
1606
|
report:
|
1603
1607
|
authors: Auteurs
|
1604
1608
|
content: Contenu signalé
|
@@ -1616,6 +1620,8 @@ fr:
|
|
1616
1620
|
create:
|
1617
1621
|
error: Une erreur s'est produite lors de la création du rapport. Veuillez essayer à nouveau.
|
1618
1622
|
success: Le contenu a été signalé, il sera examiné par un administrateur.
|
1623
|
+
hide:
|
1624
|
+
success: Cette ressource a été masquée.
|
1619
1625
|
parent_hidden:
|
1620
1626
|
report_details: La ressource parente a été masquée
|
1621
1627
|
resource_endorsements:
|
data/config/locales/gl.yml
CHANGED
@@ -727,11 +727,6 @@ gl:
|
|
727
727
|
manage_user_group_users: Xestionar membros
|
728
728
|
resend_email_confirmation_instructions: Reenvía as instrucións de confirmación de correo electrónico
|
729
729
|
reported_mailer:
|
730
|
-
hide:
|
731
|
-
hello: Ola %{name},
|
732
|
-
manage_moderations: Xestionar moderacións
|
733
|
-
report_html: <p> O seguinte <a href="%{url}">content</a> ocultouse automaticamente.</p>
|
734
|
-
subject: Ocultouse un recurso automaticamente
|
735
730
|
report:
|
736
731
|
hello: Ola %{name},
|
737
732
|
report_html: <p> Informáronse os seguintes <a href="%{url}">content</a>.</p>
|
data/config/locales/hu.yml
CHANGED
@@ -580,8 +580,6 @@ hu:
|
|
580
580
|
error: Hiba történt a kép feltöltése közben.
|
581
581
|
success: Kép sikeresen feltöltve.
|
582
582
|
drag_and_drop_help: Képek hozzáadása húzással és ejtéssel vagy beillesztéssel.
|
583
|
-
endorsement_buttons_cell:
|
584
|
-
endorse: Tetszik
|
585
583
|
endorsements:
|
586
584
|
identities:
|
587
585
|
done: Kész
|
@@ -1242,11 +1240,6 @@ hu:
|
|
1242
1240
|
confirmation_instructions_sent: A megerősítő email az utasításokkal elküldve.
|
1243
1241
|
fill_in_email_to_confirm_it: Kérjük, töltse ki a csoport e-mailjét a megerősítéshez.
|
1244
1242
|
reported_mailer:
|
1245
|
-
hide:
|
1246
|
-
hello: Helló %{name}!
|
1247
|
-
manage_moderations: Moderálódások kezelése
|
1248
|
-
report_html: <p>A következő <a href="%{url}">tartalom</a>automatikusan el volt rejtve.</p>
|
1249
|
-
subject: Egy erőforrás automatikusan elrejtve
|
1250
1243
|
report:
|
1251
1244
|
authors: Szerzők
|
1252
1245
|
content: Jelentett tartalom
|
data/config/locales/id-ID.yml
CHANGED
@@ -665,11 +665,6 @@ id:
|
|
665
665
|
manage_user_group_users: Kelola anggota
|
666
666
|
resend_email_confirmation_instructions: Kirim ulang instruksi konfirmasi email
|
667
667
|
reported_mailer:
|
668
|
-
hide:
|
669
|
-
hello: Halo %{name},
|
670
|
-
manage_moderations: Kelola moderasi
|
671
|
-
report_html: <p>berikut <a href="%{url}">konten</a> telah disembunyikan secara otomatis.</p>
|
672
|
-
subject: Sumber daya telah disembunyikan secara otomatis
|
673
668
|
report:
|
674
669
|
hello: Halo %{name},
|
675
670
|
report_html: <p> <a href="%{url}">konten</a> berikut telah dilaporkan.</p>
|
data/config/locales/is-IS.yml
CHANGED
@@ -247,11 +247,6 @@ is:
|
|
247
247
|
newsletter_notifications: Ég vil fá fréttabréf
|
248
248
|
update_notifications_settings: Vista breytingar
|
249
249
|
reported_mailer:
|
250
|
-
hide:
|
251
|
-
hello: Halló %{name},
|
252
|
-
manage_moderations: Stjórna meðlimum
|
253
|
-
report_html: <p>Eftirfarandi <a href="%{url}">efni</a> hefur verið falið sjálfkrafa.</p>
|
254
|
-
subject: Úrræði hefur verið falið sjálfkrafa
|
255
250
|
report:
|
256
251
|
hello: Halló %{name},
|
257
252
|
report_html: <p>Eftirfarandi <a href="%{url}">efni</a> hefur verið tilkynnt.</p>
|
data/config/locales/it.yml
CHANGED
@@ -913,11 +913,6 @@ it:
|
|
913
913
|
manage_user_group_users: Gestisci i membri
|
914
914
|
resend_email_confirmation_instructions: Rispedire le istruzioni per la conferma dell'email
|
915
915
|
reported_mailer:
|
916
|
-
hide:
|
917
|
-
hello: Ciao %{name},
|
918
|
-
manage_moderations: Gestire le moderazioni
|
919
|
-
report_html: <p>Il seguente <a href="%{url}">contenuto</a> è stato nascosto automaticamente.</p>
|
920
|
-
subject: Un contenuto è stato cancellato automaticamente
|
921
916
|
report:
|
922
917
|
authors: Autori
|
923
918
|
content: Contenuto segnalato
|
data/config/locales/ja.yml
CHANGED
@@ -825,19 +825,10 @@ ja:
|
|
825
825
|
error: 画像のアップロードに失敗しました。
|
826
826
|
success: 画像が正常にアップロードされました。
|
827
827
|
drag_and_drop_help: ドラッグ&ドロップまたは貼り付けることで画像を追加できます。
|
828
|
-
endorsement_buttons_cell:
|
829
|
-
already_endorsed: オススメの取り消し
|
830
|
-
endorse: オススメ
|
831
828
|
endorsements:
|
832
829
|
identities:
|
833
830
|
done: 完了
|
834
831
|
select_identity: IDを選択
|
835
|
-
endorsers_list:
|
836
|
-
endorsed_by:
|
837
|
-
other: '%{visible} によるオススメ'
|
838
|
-
others: "%{count} 以上"
|
839
|
-
title: オススメ
|
840
|
-
you: あなた
|
841
832
|
ephemeral_user: 訪問者
|
842
833
|
errors:
|
843
834
|
files:
|
@@ -1457,8 +1448,8 @@ ja:
|
|
1457
1448
|
hello: こんにちは %{name} さん、
|
1458
1449
|
intro:
|
1459
1450
|
daily: 'あなたがフォローしているアクティビティに基づいた最終日以降の通知です:'
|
1460
|
-
real_time: '
|
1461
|
-
weekly: '
|
1451
|
+
real_time: 'あなたがフォローしているアクティビティに基づいた通知です:'
|
1452
|
+
weekly: 'あなたがフォローしているアクティビティに基づいた先週以降の通知です:'
|
1462
1453
|
outro: このコンテンツまたは著者をフォローしているため、これらの通知を受け取りました。それぞれのページからフォローを解除できます。
|
1463
1454
|
see_more: 他の通知を見る
|
1464
1455
|
subject: あなたのメールダイジェストです
|
@@ -1711,15 +1702,24 @@ ja:
|
|
1711
1702
|
confirmation_instructions_sent: メール確認の手順を送信しました。
|
1712
1703
|
fill_in_email_to_confirm_it: グループのメールアドレスを入力して確認してください。
|
1713
1704
|
reported_mailer:
|
1714
|
-
|
1705
|
+
hidden_automatically:
|
1715
1706
|
content: 通報されたコンテンツ
|
1716
1707
|
details: 詳細
|
1717
|
-
hello:
|
1708
|
+
hello: こんにちは %{name} さん、
|
1718
1709
|
manage_moderations: モデレーションの管理
|
1719
1710
|
participatory_space: 参加型スペース
|
1720
1711
|
reason: 理由
|
1721
|
-
report_html: <p
|
1712
|
+
report_html: <p>以下の<a href="%{url}">コンテンツ</a>は自動的に非表示にされました。</p>
|
1722
1713
|
subject: リソースは自動的に非表示になりました
|
1714
|
+
hidden_manually:
|
1715
|
+
content: 通報されたコンテンツ
|
1716
|
+
details: 詳細
|
1717
|
+
hello: こんにちは %{name} さん、
|
1718
|
+
manage_moderations: モデレーションの管理
|
1719
|
+
participatory_space: 参加型スペース
|
1720
|
+
reason: 理由
|
1721
|
+
report_html: <p>以下の<a href="%{url}">コンテンツ</a>は %{moderator} によって非表示にされました。</p>
|
1722
|
+
subject: リソースは%{moderator}によって非表示にされました
|
1723
1723
|
report:
|
1724
1724
|
authors: 著者
|
1725
1725
|
content: 報告されたコンテンツ
|
@@ -1737,6 +1737,8 @@ ja:
|
|
1737
1737
|
create:
|
1738
1738
|
error: レポートの作成中に問題が発生しました。もう一度やり直してください。
|
1739
1739
|
success: レポートは正常に作成され、管理者によってレビューされます。
|
1740
|
+
hide:
|
1741
|
+
success: このリソースは非表示になっています。
|
1740
1742
|
parent_hidden:
|
1741
1743
|
report_details: 親リソースは非表示
|
1742
1744
|
resource:
|
data/config/locales/lb.yml
CHANGED
@@ -893,11 +893,6 @@ lb:
|
|
893
893
|
manage_user_group_users: Memberen verwalten
|
894
894
|
resend_email_confirmation_instructions: Den Email mat der Confirmatioun vun den Instruktiounen op en Neits schécken
|
895
895
|
reported_mailer:
|
896
|
-
hide:
|
897
|
-
hello: Moien %{name}
|
898
|
-
manage_moderations: Moderatiounen verwalten
|
899
|
-
report_html: <p>Den folgenden Inhalt <a href="%{url}">Inhalt</a> gouf automatesch ausgeblent.</p>
|
900
|
-
subject: Eng Ressource gouf automatesch ausgeblent
|
901
896
|
report:
|
902
897
|
authors: Auteuren
|
903
898
|
content: Inhalt gouf gemellt
|
data/config/locales/lt.yml
CHANGED
@@ -646,8 +646,6 @@ lt:
|
|
646
646
|
error: Klaida įkeliant paveikslėlį.
|
647
647
|
success: Paveikslėlis įkeltas sėkmingai.
|
648
648
|
drag_and_drop_help: Pridėkite paveikslėlius juos užvesdami ant lango arba juos įklijuodami.
|
649
|
-
endorsement_buttons_cell:
|
650
|
-
endorse: Patinka
|
651
649
|
endorsements:
|
652
650
|
identities:
|
653
651
|
done: Atlikta
|
@@ -1340,11 +1338,6 @@ lt:
|
|
1340
1338
|
confirmation_instructions_sent: Patvirtinimo el. laiškas išsiųstas.
|
1341
1339
|
fill_in_email_to_confirm_it: Prašau įveskite grupės el. paštą tam, kad jį patvirtinti.
|
1342
1340
|
reported_mailer:
|
1343
|
-
hide:
|
1344
|
-
hello: Sveiki %{name},
|
1345
|
-
manage_moderations: Tvarkyti vedamas diskusijas
|
1346
|
-
report_html: <p>Toliau pateikiamas <a href="%{url}">turinys</a> paslėptas automatiškai.</p>
|
1347
|
-
subject: Išteklius paslėptas automatiškai
|
1348
1341
|
report:
|
1349
1342
|
authors: Autoriai
|
1350
1343
|
content: Turinys, apie kurį pranešta
|
data/config/locales/lv.yml
CHANGED
@@ -795,11 +795,6 @@ lv:
|
|
795
795
|
manage_user_group_users: Pārvaldīt biedrus
|
796
796
|
resend_email_confirmation_instructions: Atkārtoti e-pastā nosūtīt apstiprināšanas norādījumus
|
797
797
|
reported_mailer:
|
798
|
-
hide:
|
799
|
-
hello: Sveiki, %{name}!
|
800
|
-
manage_moderations: Pārvaldiet moderāciju
|
801
|
-
report_html: <p> Šis <a href="%{url}"> saturs </a> ir paslēpts automātiski.</p>
|
802
|
-
subject: Vienums ir automātiski paslēpts
|
803
798
|
report:
|
804
799
|
hello: Sveiki, %{name}!
|
805
800
|
report_html: <p> Par šo <a href="%{url}"> saturu </a> ir ziņots.</p>
|
data/config/locales/nl.yml
CHANGED
@@ -903,11 +903,6 @@ nl:
|
|
903
903
|
manage_user_group_users: Leden beheren
|
904
904
|
resend_email_confirmation_instructions: Verzend instructies voor e-mailbevestiging opnieuw
|
905
905
|
reported_mailer:
|
906
|
-
hide:
|
907
|
-
hello: Hallo %{name},
|
908
|
-
manage_moderations: Beheer moderaties
|
909
|
-
report_html: <p>De volgende <a href="%{url}">content</a> is automatisch verborgen.</p>
|
910
|
-
subject: Een bron is automatisch verborgen
|
911
906
|
report:
|
912
907
|
authors: Auteurs
|
913
908
|
content: Gerapporteerde inhoud
|
data/config/locales/no.yml
CHANGED
@@ -917,11 +917,6 @@
|
|
917
917
|
manage_user_group_users: Administrere medlemmer
|
918
918
|
resend_email_confirmation_instructions: Send email bekreftelse instruksjoner på nytt
|
919
919
|
reported_mailer:
|
920
|
-
hide:
|
921
|
-
hello: Hei %{name},
|
922
|
-
manage_moderations: Administrer moderasjoner
|
923
|
-
report_html: <p>Det følgene <a href="%{url}">innholdet</a> har blitt automatisk skjult.</p>
|
924
|
-
subject: En ressurs var automatisk skjult
|
925
920
|
report:
|
926
921
|
authors: Forfattere
|
927
922
|
content: Rapportert innhold
|
data/config/locales/pl.yml
CHANGED
@@ -633,8 +633,6 @@ pl:
|
|
633
633
|
error: Wystąpił błąd podczas przesyłania obrazu.
|
634
634
|
success: Obraz przesłany pomyślnie.
|
635
635
|
drag_and_drop_help: Dodaj obrazy, przeciągając i upuszczając lub wklejając je.
|
636
|
-
endorsement_buttons_cell:
|
637
|
-
endorse: Lubię to
|
638
636
|
endorsements:
|
639
637
|
identities:
|
640
638
|
done: Gotowe
|
@@ -1350,11 +1348,6 @@ pl:
|
|
1350
1348
|
confirmation_instructions_sent: Wysłano instrukcje dotyczące potwierdzenia adresu e-mail.
|
1351
1349
|
fill_in_email_to_confirm_it: Podaj adres e-mail grupy, aby go potwierdzić.
|
1352
1350
|
reported_mailer:
|
1353
|
-
hide:
|
1354
|
-
hello: Witaj %{name},
|
1355
|
-
manage_moderations: Zarządzaj moderacjami
|
1356
|
-
report_html: <p>Poniższa<a href="%{url}">zawartość</a> została ukryta automatycznie.</p>
|
1357
|
-
subject: Zasób został ukryty automatycznie
|
1358
1351
|
report:
|
1359
1352
|
authors: Autorzy
|
1360
1353
|
content: Zgłoszona zawartość
|
data/config/locales/pt-BR.yml
CHANGED
@@ -635,8 +635,6 @@ pt-BR:
|
|
635
635
|
error: Erro ao carregar a imagem.
|
636
636
|
success: Imagem carregada com sucesso.
|
637
637
|
drag_and_drop_help: Adicione imagens arrastando e soltando ou colando-as.
|
638
|
-
endorsement_buttons_cell:
|
639
|
-
endorse: Like
|
640
638
|
endorsements:
|
641
639
|
identities:
|
642
640
|
done: Concluído
|
@@ -1298,11 +1296,6 @@ pt-BR:
|
|
1298
1296
|
confirmation_instructions_sent: Reenviar instruções de confirmação.
|
1299
1297
|
fill_in_email_to_confirm_it: Por favor, preencha o e-mail do seu grupo para confirmar.
|
1300
1298
|
reported_mailer:
|
1301
|
-
hide:
|
1302
|
-
hello: Olá %{name},
|
1303
|
-
manage_moderations: Gerenciar moderações
|
1304
|
-
report_html: <p>O seguinte <a href="%{url}">content</a> foi ocultado automaticamente.</p>
|
1305
|
-
subject: Um recurso foi escondido automaticamente
|
1306
1299
|
report:
|
1307
1300
|
authors: Autores
|
1308
1301
|
content: Conteúdo denunciado
|
data/config/locales/pt.yml
CHANGED
@@ -897,11 +897,6 @@ pt:
|
|
897
897
|
manage_user_group_users: Gerir membros
|
898
898
|
resend_email_confirmation_instructions: Reenviar instruções de confirmação de e-mail
|
899
899
|
reported_mailer:
|
900
|
-
hide:
|
901
|
-
hello: Olá %{name},
|
902
|
-
manage_moderations: Gerir moderações
|
903
|
-
report_html: <p>O seguinte <a href="%{url}">conteúdo</a> foi ocultado automaticamente.</p>
|
904
|
-
subject: Um recurso foi ocultado automaticamente
|
905
900
|
report:
|
906
901
|
authors: Autores
|
907
902
|
content: Conteúdo reportado
|
data/config/locales/ro-RO.yml
CHANGED
@@ -805,15 +805,10 @@ ro:
|
|
805
805
|
error: Eroare la încărcarea imaginii.
|
806
806
|
success: Imaginea a fost încărcată cu succes.
|
807
807
|
drag_and_drop_help: Adaugați imagini prin tragere & plasare sau lipirea lor.
|
808
|
-
endorsement_buttons_cell:
|
809
|
-
endorse: Îmi place
|
810
808
|
endorsements:
|
811
809
|
identities:
|
812
810
|
done: Finalizat
|
813
811
|
select_identity: Selectare identitate
|
814
|
-
endorsers_list:
|
815
|
-
title: Apreciat de
|
816
|
-
you: tu
|
817
812
|
ephemeral_user: Vizitator
|
818
813
|
errors:
|
819
814
|
files:
|
@@ -1427,15 +1422,6 @@ ro:
|
|
1427
1422
|
message: Mesaj
|
1428
1423
|
resend_email_confirmation_instructions: Retrimite e-mail instrucțiuni de confirmare
|
1429
1424
|
reported_mailer:
|
1430
|
-
hide:
|
1431
|
-
content: Conținut raportat
|
1432
|
-
details: Detalii
|
1433
|
-
hello: Bună ziua %{name},
|
1434
|
-
manage_moderations: Gestionați moderările
|
1435
|
-
participatory_space: Spaţiu participativ
|
1436
|
-
reason: Motiv
|
1437
|
-
report_html: <p>Următorul <a href="%{url}">conținut</a> a fost ascuns automat.</p>
|
1438
|
-
subject: O resursă a fost ascunsă automat
|
1439
1425
|
report:
|
1440
1426
|
authors: Autori
|
1441
1427
|
content: Conținut raportat
|
data/config/locales/ru.yml
CHANGED
@@ -509,11 +509,6 @@ ru:
|
|
509
509
|
manage_user_group_admins: Управление админами
|
510
510
|
manage_user_group_users: Управление участниками
|
511
511
|
reported_mailer:
|
512
|
-
hide:
|
513
|
-
hello: Здравствуйте, %{name}!
|
514
|
-
manage_moderations: Управление действиями по модерации
|
515
|
-
report_html: <p>Следующее <a href="%{url}">содержимое</a> было автоматически скрыто.</p>
|
516
|
-
subject: Ресурс был автоматически скрыт
|
517
512
|
report:
|
518
513
|
hello: Здравствуйте, %{name}!
|
519
514
|
report_html: <p>О следующем <a href="%{url}">содержимом</a> была передана жалоба администраторам.</p>
|
data/config/locales/sk.yml
CHANGED
@@ -790,11 +790,6 @@ sk:
|
|
790
790
|
manage_user_group_users: Správa členov
|
791
791
|
resend_email_confirmation_instructions: Opakujte e-mailové pokyny na potvrdenie
|
792
792
|
reported_mailer:
|
793
|
-
hide:
|
794
|
-
hello: Zdravím %{name},
|
795
|
-
manage_moderations: Správa moderovanie
|
796
|
-
report_html: <p> Nasledujúce <a href="%{url}"> obsah </a> bol automaticky skrytý. </ p>
|
797
|
-
subject: Zdroj bol automaticky skrytý
|
798
793
|
report:
|
799
794
|
hello: Zdravím %{name},
|
800
795
|
report_html: <p> Bol nahlásený nasledujúce <a href="%{url}"> obsah </a>. </ p>
|
data/config/locales/sv.yml
CHANGED
@@ -44,7 +44,7 @@ sv:
|
|
44
44
|
user:
|
45
45
|
attributes:
|
46
46
|
nickname:
|
47
|
-
format:
|
47
|
+
format: Användarnamnet måste ha små bokstäver inga mellanslag
|
48
48
|
models:
|
49
49
|
decidim/attachment_created_event: Bilaga
|
50
50
|
decidim/component_published_event: Aktiv komponent
|
@@ -162,6 +162,7 @@ sv:
|
|
162
162
|
front_page_link: Gå till startsidan
|
163
163
|
logo: "%{organization}s logotyp"
|
164
164
|
opens_in_new_tab: Öppnas i en ny flik
|
165
|
+
secondary_menu: Sekundär meny
|
165
166
|
skip_button: Gå till innehåll
|
166
167
|
account:
|
167
168
|
blocked: Detta konto har blockerats på grund av brott mot användarvillkoren
|
@@ -661,7 +662,7 @@ sv:
|
|
661
662
|
terms: användarvillkoren
|
662
663
|
tos_agreement: Genom att registrera dig godkänner du %{link}.
|
663
664
|
tos_title: Användarvillkor
|
664
|
-
username_help: Offentligt namn som visas
|
665
|
+
username_help: Offentligt namn som visas vid dina inlägg. Använd ett påhittat namn om du vill vara anonym.
|
665
666
|
sessions:
|
666
667
|
new:
|
667
668
|
are_you_new?: Inte registrerad än?
|
@@ -776,11 +777,19 @@ sv:
|
|
776
777
|
success: Bilden har laddats upp.
|
777
778
|
drag_and_drop_help: Lägg till bilder genom att dra och släppa eller klistra in dem.
|
778
779
|
endorsement_buttons_cell:
|
780
|
+
already_endorsed: Ångra gilla
|
779
781
|
endorse: Gilla
|
780
782
|
endorsements:
|
781
783
|
identities:
|
782
784
|
done: Klar
|
783
785
|
select_identity: Välj identitet
|
786
|
+
endorsers_list:
|
787
|
+
endorsed_by:
|
788
|
+
one: Gillad av %{visible}
|
789
|
+
other: Gillad av %{visible} och %{others}
|
790
|
+
others: "%{count} mer"
|
791
|
+
title: Gillad av
|
792
|
+
you: du
|
784
793
|
errors:
|
785
794
|
files:
|
786
795
|
file_cannot_be_processed: Filen kan inte bearbetas
|
@@ -1262,7 +1271,7 @@ sv:
|
|
1262
1271
|
add_conversation_users:
|
1263
1272
|
add_max_users: 'Lägg till användare i samtalet: högst 9'
|
1264
1273
|
add_users_placeholder: Sök...
|
1265
|
-
modal_title:
|
1274
|
+
modal_title: Ny konversation
|
1266
1275
|
no_results: Inga resultat
|
1267
1276
|
participant_with_disabled_message_reception: Den här deltagaren vill inte ta emot privata meddelanden.
|
1268
1277
|
create:
|
@@ -1273,10 +1282,10 @@ sv:
|
|
1273
1282
|
intro: 'Det fanns följande fel med ditt meddelande:'
|
1274
1283
|
ok: Ok
|
1275
1284
|
index:
|
1276
|
-
new_conversation:
|
1285
|
+
new_conversation: Ny konversation
|
1277
1286
|
next: Nästa
|
1278
1287
|
no_conversations: Du har inga konversationer än.
|
1279
|
-
title:
|
1288
|
+
title: Konversationer
|
1280
1289
|
reply_form:
|
1281
1290
|
placeholder: Ditt svar...
|
1282
1291
|
send: Skicka
|
@@ -1285,7 +1294,7 @@ sv:
|
|
1285
1294
|
chat_with: Konversation med
|
1286
1295
|
deleted_accounts: Du kan inte ha en konversation med raderade konton.
|
1287
1296
|
not_allowed: Deltagaren tar inte emot direktmeddelanden.
|
1288
|
-
title:
|
1297
|
+
title: Konversation med %{usernames}
|
1289
1298
|
start:
|
1290
1299
|
placeholder: Ditt meddelande...
|
1291
1300
|
send: Skicka
|
@@ -1327,7 +1336,7 @@ sv:
|
|
1327
1336
|
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.'
|
1328
1337
|
image_text_cta:
|
1329
1338
|
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.'
|
1330
|
-
cta_text_preview:
|
1339
|
+
cta_text_preview: Text på knapp
|
1331
1340
|
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.'
|
1332
1341
|
name: Bild, text och knapp
|
1333
1342
|
image_text_cta_settings_form:
|
@@ -1418,7 +1427,7 @@ sv:
|
|
1418
1427
|
open_data:
|
1419
1428
|
not_available_yet: De öppna datafilerna är ännu inte tillgängliga, var vänlig försök igen om några minuter.
|
1420
1429
|
pad_iframe:
|
1421
|
-
disclaimer: Innehållet i
|
1430
|
+
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.
|
1422
1431
|
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.
|
1423
1432
|
pad: Memo
|
1424
1433
|
pages:
|
@@ -1510,11 +1519,24 @@ sv:
|
|
1510
1519
|
confirmation_instructions_sent: Instruktioner för e-postbekräftelse har skickats.
|
1511
1520
|
fill_in_email_to_confirm_it: Fyll i gruppens e-postadress för att bekräfta den.
|
1512
1521
|
reported_mailer:
|
1513
|
-
|
1522
|
+
hidden_automatically:
|
1523
|
+
content: Rapporterat innehåll
|
1524
|
+
details: Detaljer
|
1514
1525
|
hello: Hej %{name},
|
1515
|
-
manage_moderations: Hantera
|
1516
|
-
|
1517
|
-
|
1526
|
+
manage_moderations: Hantera modereringar
|
1527
|
+
participatory_space: Deltagarutrymme
|
1528
|
+
reason: Anledning
|
1529
|
+
report_html: <p>Följande <a href="%{url}">innehåll</a> har dolts automatiskt.</p>
|
1530
|
+
subject: En resurs har dolts automatiskt
|
1531
|
+
hidden_manually:
|
1532
|
+
content: Rapporterat innehåll
|
1533
|
+
details: Detaljer
|
1534
|
+
hello: Hej %{name},
|
1535
|
+
manage_moderations: Hantera modereringar
|
1536
|
+
participatory_space: Deltagarutrymme
|
1537
|
+
reason: Anledning
|
1538
|
+
report_html: <p>Följande <a href="%{url}">-innehåll</a> har dolts av %{moderator}.</p>
|
1539
|
+
subject: En resurs har dolts av %{moderator}
|
1518
1540
|
report:
|
1519
1541
|
authors: Författare
|
1520
1542
|
content: Rapporterat innehåll
|
@@ -1532,6 +1554,8 @@ sv:
|
|
1532
1554
|
create:
|
1533
1555
|
error: Det gick inte att skapa rapporten. Försök igen.
|
1534
1556
|
success: Rapporten har skapats och kommer att granskas av en administratör.
|
1557
|
+
hide:
|
1558
|
+
success: Denna resurs har gömts.
|
1535
1559
|
resource_endorsements:
|
1536
1560
|
create:
|
1537
1561
|
error: Det gick inte att gilla.
|
data/config/locales/tr-TR.yml
CHANGED
@@ -906,11 +906,6 @@ tr:
|
|
906
906
|
manage_user_group_users: Üyeleri yönet
|
907
907
|
resend_email_confirmation_instructions: E-posta doğrulama talimatlarını tekrar gönder
|
908
908
|
reported_mailer:
|
909
|
-
hide:
|
910
|
-
hello: Merhaba %{name}
|
911
|
-
manage_moderations: Denetimleri yönet
|
912
|
-
report_html: <p>Aşağıdaki <a href="%{url}">içerik</a> otomatik olarak gizlendi.</p>
|
913
|
-
subject: Bir kaynak otomatik olarak gizlendi
|
914
909
|
report:
|
915
910
|
authors: Yazarlar
|
916
911
|
content: İçeriği bildir
|
data/config/locales/uk.yml
CHANGED
@@ -396,11 +396,6 @@ uk:
|
|
396
396
|
actions:
|
397
397
|
edit_profile: Редагувати профіль
|
398
398
|
reported_mailer:
|
399
|
-
hide:
|
400
|
-
hello: Доброго дня, %{name}%!
|
401
|
-
manage_moderations: Керувати діями з модерації
|
402
|
-
report_html: <p>Наступний <a href="%{url}">вміст</a> було автоматично приховано.</p>
|
403
|
-
subject: Ресурс було автоматично приховано
|
404
399
|
report:
|
405
400
|
hello: Доброго дня, %{name}%!
|
406
401
|
report_html: <p>Про наступний <a href="%{url}">вміст</a> було передано скаргу адміністраторам.</p>
|
data/config/locales/zh-CN.yml
CHANGED
@@ -815,11 +815,6 @@ zh-CN:
|
|
815
815
|
manage_user_group_users: 管理成员
|
816
816
|
resend_email_confirmation_instructions: 重新发送电子邮件确认说明
|
817
817
|
reported_mailer:
|
818
|
-
hide:
|
819
|
-
hello: 您好 %{name},
|
820
|
-
manage_moderations: 管理版面
|
821
|
-
report_html: <p>以下 <a href="%{url}">内容</a> 已被自动隐藏。</p>
|
822
|
-
subject: 资源已自动隐藏
|
823
818
|
report:
|
824
819
|
authors: 作者
|
825
820
|
content: 报告的内容
|
data/config/locales/zh-TW.yml
CHANGED
@@ -546,8 +546,6 @@ zh-TW:
|
|
546
546
|
error: 上傳圖片時發生錯誤.
|
547
547
|
success: 圖片上傳成功.
|
548
548
|
drag_and_drop_help: 通過拖放或粘貼方式添加圖片。
|
549
|
-
endorsement_buttons_cell:
|
550
|
-
endorse: 喜歡!
|
551
549
|
endorsements:
|
552
550
|
identities:
|
553
551
|
done: 已完成
|
@@ -1217,11 +1215,6 @@ zh-TW:
|
|
1217
1215
|
confirmation_instructions_sent: 電子郵件確認指示已發送.
|
1218
1216
|
fill_in_email_to_confirm_it: 請填寫您的群組電子郵件以進行確認.
|
1219
1217
|
reported_mailer:
|
1220
|
-
hide:
|
1221
|
-
hello: 哈囉,%{name},
|
1222
|
-
manage_moderations: 管理版主
|
1223
|
-
report_html: <p>以下<a href="%{url}">內容</a>已自動隱藏。</p>
|
1224
|
-
subject: 一個資源已被自動隱藏。
|
1225
1218
|
report:
|
1226
1219
|
authors: 作者
|
1227
1220
|
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,
|
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,
|
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,
|
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,
|
26
|
+
entity.nickname = UserBaseEntity.nicknamize(sanitized_nickname, entity.decidim_organization_id)
|
27
27
|
entity.save(validate: false)
|
28
28
|
end
|
29
29
|
end
|
@@ -932,6 +932,18 @@ FactoryBot.define do
|
|
932
932
|
scopes { "public" }
|
933
933
|
end
|
934
934
|
|
935
|
+
factory :private_export, class: "Decidim::PrivateExport" do
|
936
|
+
transient do
|
937
|
+
skip_injection { false }
|
938
|
+
organization { create(:organization) }
|
939
|
+
end
|
940
|
+
expires_at { 1.week.from_now }
|
941
|
+
attached_to { create(:user, organization:, skip_injection:) }
|
942
|
+
export_type { "dummy" }
|
943
|
+
content_type { "application/zip" }
|
944
|
+
file_size { 10.kilobytes }
|
945
|
+
end
|
946
|
+
|
935
947
|
factory :searchable_resource, class: "Decidim::SearchableResource" do
|
936
948
|
transient do
|
937
949
|
skip_injection { false }
|