decidim-core 0.31.6 → 0.31.7
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/card_metadata_cell.rb +1 -1
- data/app/cells/decidim/comments_button_cell.rb +9 -1
- data/app/cells/decidim/data_consent/category.erb +20 -33
- data/app/cells/decidim/footer_topics/show.erb +5 -8
- data/app/cells/decidim/participatory_space_dropdown_metadata/links.erb +1 -1
- data/app/cells/decidim/share_widget/qr_code_modal.erb +1 -1
- data/app/events/decidim/amendable/amendment_base_event.rb +7 -1
- data/app/helpers/decidim/menu_helper.rb +0 -2
- data/app/models/decidim/user.rb +2 -2
- data/app/packs/src/decidim/controllers/accordion/accordion.test.js +196 -42
- data/app/packs/src/decidim/controllers/accordion/controller.js +93 -17
- data/app/packs/src/decidim/controllers/dropdown/controller.js +6 -0
- data/app/packs/src/decidim/controllers/dropdown/dropdown.test.js +28 -0
- data/app/packs/src/decidim/controllers/password_toggler/controller.js +22 -1
- data/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js +11 -20
- data/app/packs/src/decidim/direct_uploads/upload_modal.js +2 -1
- data/app/packs/src/decidim/map/controller.js +10 -1
- data/app/packs/src/decidim/refactor/moved/focus_guard.js +12 -12
- data/app/packs/src/decidim/refactor/moved/focus_guard.test.js +136 -0
- data/app/packs/stylesheets/decidim/_cards.scss +1 -1
- data/app/packs/stylesheets/decidim/_cookies.scss +13 -5
- data/app/packs/stylesheets/decidim/_documents.scss +1 -1
- data/app/packs/stylesheets/decidim/_footer.scss +33 -1
- data/app/packs/stylesheets/decidim/_participatory_spaces.scss +1 -1
- data/app/presenters/decidim/footer_menu_presenter.rb +2 -4
- data/app/resolvers/decidim/meta_image_url_resolver.rb +7 -0
- data/app/views/decidim/searches/_filters.html.erb +1 -1
- data/app/views/layouts/decidim/footer/_main.html.erb +1 -1
- data/app/views/layouts/decidim/footer/_main_links.html.erb +56 -28
- data/config/locales/ar.yml +0 -20
- data/config/locales/bg.yml +0 -19
- data/config/locales/ca-IT.yml +28 -23
- data/config/locales/ca.yml +28 -23
- data/config/locales/cs.yml +13 -21
- data/config/locales/de.yml +0 -25
- data/config/locales/el.yml +0 -18
- data/config/locales/en.yml +28 -23
- data/config/locales/es-MX.yml +28 -23
- data/config/locales/es-PY.yml +28 -23
- data/config/locales/es.yml +28 -23
- data/config/locales/eu.yml +27 -24
- data/config/locales/fi-plain.yml +28 -23
- data/config/locales/fi.yml +28 -23
- data/config/locales/fr-CA.yml +7 -19
- data/config/locales/fr.yml +7 -19
- data/config/locales/gl.yml +0 -19
- data/config/locales/hu.yml +0 -17
- data/config/locales/id-ID.yml +0 -18
- data/config/locales/is-IS.yml +0 -6
- data/config/locales/it.yml +0 -17
- data/config/locales/ja.yml +28 -23
- data/config/locales/lb.yml +0 -18
- data/config/locales/lt.yml +0 -19
- data/config/locales/lv.yml +0 -18
- data/config/locales/nl.yml +0 -18
- data/config/locales/no.yml +0 -18
- data/config/locales/pl.yml +2 -19
- data/config/locales/pt-BR.yml +0 -25
- data/config/locales/pt.yml +0 -18
- data/config/locales/ro-RO.yml +0 -18
- data/config/locales/ru.yml +0 -8
- data/config/locales/sk.yml +0 -25
- data/config/locales/sv.yml +4 -25
- data/config/locales/tr-TR.yml +0 -18
- data/config/locales/uk.yml +0 -6
- data/config/locales/zh-CN.yml +0 -16
- data/config/locales/zh-TW.yml +0 -19
- data/db/migrate/20250217192438_convert_user_groups_into_users.rb +3 -2
- data/decidim-core.gemspec +3 -0
- data/lib/decidim/core/test/shared_examples/amendable/amendment_event_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +26 -0
- data/lib/decidim/core/test/shared_examples/has_space_in_mcell_examples.rb +2 -1
- data/lib/decidim/core/test/shared_examples/resource_liked_event_examples.rb +3 -3
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +1 -1
- data/lib/decidim/map/dynamic_map.rb +3 -1
- metadata +27 -6
data/config/locales/pt.yml
CHANGED
|
@@ -403,13 +403,9 @@ pt:
|
|
|
403
403
|
affected_user:
|
|
404
404
|
email_intro: 'Uma modificação foi aceite para %{amendable_title}. Pode vê-la a partir desta página:'
|
|
405
405
|
email_outro: Recebeu esta notificação por ser um autor de %{amendable_title}.
|
|
406
|
-
email_subject: Modificação aceite para %{amendable_title} de %{emendation_author_nickname}
|
|
407
|
-
notification_title: A <a href="%{emendation_path}">emenda</a> criada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi aceite para <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
408
406
|
follower:
|
|
409
407
|
email_intro: 'Uma modificação foi aceite para %{amendable_title}. Pode vê-la a partir desta página:'
|
|
410
408
|
email_outro: Recebeu esta notificação porque segue %{amendable_title}. Pode parar de receber notificações a partir da hiperligação anterior.
|
|
411
|
-
email_subject: Modificação aceite para %{amendable_title} por %{emendation_author_nickname}
|
|
412
|
-
notification_title: A <a href="%{emendation_path}">modificação</a> criada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi aceite para <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
413
409
|
amendment_created:
|
|
414
410
|
affected_user:
|
|
415
411
|
email_intro: 'Uma nova modificação foi criada para %{amendable_title}. Pode vê-la a partir desta página:'
|
|
@@ -425,24 +421,16 @@ pt:
|
|
|
425
421
|
affected_user:
|
|
426
422
|
email_intro: 'Uma modificação rejeitada por %{amendable_title} foi publicada como um novo %{amendable_type}. Pode vê-la a partir desta página:'
|
|
427
423
|
email_outro: Recebeu esta notificação por ser um autor de %{amendable_title}.
|
|
428
|
-
email_subject: Uma modificação de %{emendation_author_nickname} foi publicada como um novo %{amendable_type}
|
|
429
|
-
notification_title: Uma <a href="%{emendation_path}">modificação rejeitada</a> para <a href="%{amendable_path}">%{amendable_title}</a> foi publicada como um novo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
|
|
430
424
|
follower:
|
|
431
425
|
email_intro: 'Uma modificação rejeitada de %{amendable_title} foi publicada como um novo %{amendable_type}. Pode vê-la a partir desta página:'
|
|
432
426
|
email_outro: Recebeu esta notificação porque segue %{amendable_title}. Pode parar de receber notificações seguindo a hiperligação anterior.
|
|
433
|
-
email_subject: Uma modificação de %{emendation_author_nickname} foi publicada como um novo %{amendable_type}
|
|
434
|
-
notification_title: Uma <a href="%{emendation_path}">modificação rejeitada</a> de <a href="%{amendable_path}">%{amendable_title}</a> foi publicada como um novo %{amendable_type} por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
|
|
435
427
|
amendment_rejected:
|
|
436
428
|
affected_user:
|
|
437
429
|
email_intro: 'Uma modificação foi rejeitada por %{amendable_title}. Pode vê-la a partir desta página:'
|
|
438
430
|
email_outro: Recebeu esta notificação por ser um autor de %{amendable_title}.
|
|
439
|
-
email_subject: Modificação de %{amendable_title} rejeitada por %{emendation_author_nickname}
|
|
440
|
-
notification_title: A <a href="%{emendation_path}">modificação</a> criada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi rejeitada por <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
441
431
|
follower:
|
|
442
432
|
email_intro: 'Uma modificação foi rejeitada por %{amendable_title}. Pode vê-la a partir desta página:'
|
|
443
433
|
email_outro: Recebeu esta notificação porque segue %{amendable_title}. Pode parar de receber notificações seguindo a hiperligação anterior.
|
|
444
|
-
email_subject: Modificação de %{amendable_title} rejeitada por %{emendation_author_nickname}
|
|
445
|
-
notification_title: A <a href="%{emendation_path}">modificação</a> criada por <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> foi rejeitada por <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
446
434
|
attachments:
|
|
447
435
|
attachment_created:
|
|
448
436
|
email_intro: 'Um novo documento foi adicionado a %{resource_title}. Pode vê-lo a partir desta página:'
|
|
@@ -473,12 +461,6 @@ pt:
|
|
|
473
461
|
notification_title: |-
|
|
474
462
|
Um administrador removeu o seu %{resource_type} porque foi denunciado como %{report_reasons}.</br>
|
|
475
463
|
<i>%{resource_content}</i>
|
|
476
|
-
users:
|
|
477
|
-
profile_updated:
|
|
478
|
-
email_intro: A <a href="%{resource_url}">página de perfil</a> de %{name} (%{nickname}), que você segue, foi atualizada.
|
|
479
|
-
email_outro: Recebeu esta notificação porque segue %{nickname}. Pode parar de receber notificações seguindo a hiperligação anterior.
|
|
480
|
-
email_subject: "%{nickname} atualizaram seu perfil"
|
|
481
|
-
notification_title: A <a href="%{resource_path}">página de perfil</a> de %{name} (%{nickname}), que você segue, foi atualizada.
|
|
482
464
|
export_mailer:
|
|
483
465
|
download_your_data_export:
|
|
484
466
|
download: Transferir
|
data/config/locales/ro-RO.yml
CHANGED
|
@@ -877,13 +877,9 @@ ro:
|
|
|
877
877
|
affected_user:
|
|
878
878
|
email_intro: 'A fost acceptat un amendament pentru %{amendable_title}. Îl puteți vedea de pe această pagină:'
|
|
879
879
|
email_outro: Ați primit această notificare deoarece sunteți un autor al %{amendable_title}.
|
|
880
|
-
email_subject: Amendamentul acceptat pentru %{amendable_title} de la %{emendation_author_nickname}
|
|
881
|
-
notification_title: <a href="%{emendation_path}">Amendamentul</a> creat de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a fost acceptat pentru <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
882
880
|
follower:
|
|
883
881
|
email_intro: 'Un amendament a fost acceptat pentru %{amendable_title}. Îl poți vedea de pe această pagină:'
|
|
884
882
|
email_outro: Ați primit această notificare deoarece urmăriți %{amendable_title}. Puteți înceta să primiți notificări urmând linkul anterior.
|
|
885
|
-
email_subject: Amendament acceptat pentru %{amendable_title} de la %{emendation_author_nickname}
|
|
886
|
-
notification_title: Amendamentul <a href="%{emendation_path}"></a> creat de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a fost acceptat pentru <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
887
883
|
amendment_created:
|
|
888
884
|
affected_user:
|
|
889
885
|
email_intro: 'A fost creat un nou amendament pentru %{amendable_title}. Îl poți vedea de pe această pagină:'
|
|
@@ -899,24 +895,16 @@ ro:
|
|
|
899
895
|
affected_user:
|
|
900
896
|
email_intro: 'Un amendament respins pentru %{amendable_title} a fost publicat ca un nou %{amendable_type}. Îl poți vedea de pe această pagină:'
|
|
901
897
|
email_outro: Ați primit această notificare deoarece sunteți autorul amendamentului %{amendable_title}.
|
|
902
|
-
email_subject: Un amendament primit de la %{emendation_author_nickname} a fost publicat ca un nou %{amendable_type}
|
|
903
|
-
notification_title: Un <a href="%{emendation_path}">amendament respins</a> pentru <a href="%{amendable_path}">%{amendable_title}</a> a fost publicat ca un nou %{amendable_type} de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
|
|
904
898
|
follower:
|
|
905
899
|
email_intro: 'Un amendament respins pentru %{amendable_title} a fost publicat ca un nou %{amendable_type}. Îl poți vedea de pe această pagină:'
|
|
906
900
|
email_outro: Ai primit această notificare deoarece urmărești %{amendable_title}. Poți înceta să primești notificări urmând linkul anterior.
|
|
907
|
-
email_subject: Un amendament primit de la %{emendation_author_nickname} a fost publicat ca un nou %{amendable_type}
|
|
908
|
-
notification_title: Un <a href="%{emendation_path}">amendament respins</a> pentru <a href="%{amendable_path}">%{amendable_title}</a> a fost publicat ca un nou %{amendable_type} de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
|
|
909
901
|
amendment_rejected:
|
|
910
902
|
affected_user:
|
|
911
903
|
email_intro: 'Un amendament al %{amendable_title} a fost respins. Îl puteți vedea de pe această pagină:'
|
|
912
904
|
email_outro: Ați primit această notificare deoarece sunteți un autor al %{amendable_title}.
|
|
913
|
-
email_subject: Amendament respins pentru %{amendable_title} de la %{emendation_author_nickname}
|
|
914
|
-
notification_title: <a href="%{emendation_path}">Amendamentul</a> creat de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a fost respins pentru <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
915
905
|
follower:
|
|
916
906
|
email_intro: 'Un amendament a fost respins pentru %{amendable_title}. Îl poți vedea de pe această pagină:'
|
|
917
907
|
email_outro: Ai primit această notificare deoarece urmărești %{amendable_title}. Poți înceta să primești notificări urmând linkul anterior.
|
|
918
|
-
email_subject: Amendament respins pentru %{amendable_title} de la %{emendation_author_nickname}
|
|
919
|
-
notification_title: <a href="%{emendation_path}">Amendamentul</a> creat de <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> a fost respins pentru <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
920
908
|
emendation_promoted:
|
|
921
909
|
follower:
|
|
922
910
|
email_outro: Ai primit această notificare deoarece ești autor al propunerii "%{amendable_title}.
|
|
@@ -969,13 +957,7 @@ ro:
|
|
|
969
957
|
soft_deleted:
|
|
970
958
|
notification_title: Un administrator a șters "%{resource_type}" "%{resource_title}".
|
|
971
959
|
users:
|
|
972
|
-
profile_updated:
|
|
973
|
-
email_intro: <a href="%{resource_url}">Pagina de profil</a> din %{name} (%{nickname}), pe care o urmăriți, a fost actualizată.
|
|
974
|
-
email_outro: Ați primit această notificare deoarece urmăriți activitatea lui %{endorser_nickname}. Puteți înceta să primiți notificări urmând linkul anterior.
|
|
975
|
-
email_subject: "%{nickname} și-a actualizat profilul"
|
|
976
|
-
notification_title: Pagina de profil <a href="%{resource_path}"></a> din %{name} (%{nickname}), pe care o urmărești, a fost actualizată.
|
|
977
960
|
user_officialized:
|
|
978
|
-
email_intro: Participantul %{name} (%{nickname}) a fost oficializat.
|
|
979
961
|
email_outro: Ați primit această notificare deoarece sunteți un administrator al organizației.
|
|
980
962
|
email_subject: "%{name} a fost oficializat"
|
|
981
963
|
export_mailer:
|
data/config/locales/ru.yml
CHANGED
|
@@ -290,8 +290,6 @@ ru:
|
|
|
290
290
|
affected_user:
|
|
291
291
|
email_intro: 'Для %{amendable_title} была принята поправка. Вы можете увидеть ее на этой странице:'
|
|
292
292
|
email_outro: Вы получили это уведомление, потому что вы автор %{amendable_title}.
|
|
293
|
-
email_subject: Принята поправка для %{amendable_title} от %{emendation_author_nickname}
|
|
294
|
-
notification_title: <a href="%{emendation_path}">Эта поправка</a> создана <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> была принята для <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
295
293
|
follower:
|
|
296
294
|
email_intro: 'Для %{amendable_title} была принята поправка. Вы можете увидеть ее на этой странице:'
|
|
297
295
|
email_outro: Вы получили это уведомление, потому что вы следите за «%{amendable_title}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
|
|
@@ -312,12 +310,6 @@ ru:
|
|
|
312
310
|
email_intro: '«%{resource_title}» обновили. Вы можете посмотреть его на странице:'
|
|
313
311
|
email_outro: Вы получили это уведомление, потому что вы следите за «%{resource_title}». Вы можете перестать за ним следить, перейдя по приведенной выше ссылке.
|
|
314
312
|
email_subject: Обновление %{resource_title}
|
|
315
|
-
users:
|
|
316
|
-
profile_updated:
|
|
317
|
-
email_intro: Страница <a href="%{resource_url}">профиля</a> участника %{name} (%{nickname}), за которым вы следите, была обновлена.
|
|
318
|
-
email_outro: Вы получили это уведомление, потому что вы следите за «%{nickname}». Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
|
|
319
|
-
email_subject: "%{nickname} обновил свой профиль"
|
|
320
|
-
notification_title: Страница <a href="%{resource_path}">профиля</a> участника %{name} (%{nickname}), за которым вы следите, была обновлена.
|
|
321
313
|
export_mailer:
|
|
322
314
|
download_your_data_export:
|
|
323
315
|
download: Скачать
|
data/config/locales/sk.yml
CHANGED
|
@@ -909,13 +909,9 @@ sk:
|
|
|
909
909
|
affected_user:
|
|
910
910
|
email_intro: 'Zmena bola prijatá pre %{amendable_title}. Môžete ju vidieť z tejto stránky: '
|
|
911
911
|
email_outro: Toto oznámenie ste dostali, pretože ste autorom %{amendable_title}.
|
|
912
|
-
email_subject: doplňujúci návrh prijatý pre %{amendable_title} od%{emendation_author_nickname}
|
|
913
|
-
notification_title: <a href="%{emendation_path}"> zmena </a> vytvorené <a href="%{emendation_author_path}">%{emendation_author_nickname} </a> bol prijatý <a href = "%{amendable_path}" >%{amendable_title} </a>.
|
|
914
912
|
follower:
|
|
915
913
|
email_intro: 'Zmena bola prijatá pre %{amendable_title}. Môžete ju vidieť z tejto stránky: '
|
|
916
914
|
email_outro: Toto oznámenie ste dostali, pretože sledujete %{amendable_title}. Po kliknutí na predchádzajúcu odkaz môžete prestať prijímať oznámenia.
|
|
917
|
-
email_subject: doplňujúci návrh prijatý pre %{amendable_title} od%{emendation_author_nickname}
|
|
918
|
-
notification_title: <a href="%{emendation_path}"> zmena </a> vytvorené <a href="%{emendation_author_path}">%{emendation_author_nickname} </a> bol prijatý <a href = "%{amendable_path}" >%{amendable_title} </a>.
|
|
919
915
|
amendment_created:
|
|
920
916
|
affected_user:
|
|
921
917
|
email_intro: 'Nová zmena bola vytvorená pre hodnotu%{amendable_title}. Môžete ju vidieť z tejto stránky: '
|
|
@@ -931,29 +927,20 @@ sk:
|
|
|
931
927
|
affected_user:
|
|
932
928
|
email_intro: 'Zamietnutý pozmeňovací návrh pre %{amendable_title} bol publikovaný ako nový %{amendable_type}. Môžete ho vidieť z tejto stránky: '
|
|
933
929
|
email_outro: Toto oznámenie ste dostali, pretože ste autorom %{amendable_title}.
|
|
934
|
-
email_subject: doplňujúci návrh z%{emendation_author_nickname} bol zverejnený ako nový%{amendable_type}
|
|
935
|
-
notification_title: <a href="%{emendation_path}"> zamietnuť zmenu </a> pre <a href="%{amendable_path}">%{amendable_title} </a> bola publikovaná ako nový%{amendable_type} od <a href = "%{emendation_author_path}">%{emendation_author_nickname} </a>.
|
|
936
930
|
follower:
|
|
937
931
|
email_intro: 'Označenie odmietnutej pre číslo %{amendable_title} bolo povýšené na nezávislý%{amendable_type}. Môžete ju vidieť z tejto stránky: '
|
|
938
932
|
email_outro: Toto oznámenie ste dostali, pretože sledujete %{amendable_title}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
|
|
939
|
-
email_subject: Zmena z%{emendation_author_nickname} bola uverejnená ako nová%{amendable_type}
|
|
940
|
-
notification_title: <a href="%{emendation_path}"> zamietnuť zmenu </a> pre <a href="%{amendable_path}">%{amendable_title} </a> bola publikovaná ako nový%{amendable_type} od <a href = "%{emendation_author_path}">%{emendation_author_nickname} </a>.
|
|
941
933
|
amendment_rejected:
|
|
942
934
|
affected_user:
|
|
943
935
|
email_intro: 'Oznámenie bolo zamietnuté za %{amendable_title}. Môžete ju vidieť z tejto stránky: '
|
|
944
936
|
email_outro: Toto oznámenie ste dostali, pretože ste autorom %{amendable_title}.
|
|
945
|
-
email_subject: Zmena bola zamietnutá pre %{amendable_title} od%{emendation_author_nickname}
|
|
946
|
-
notification_title: <a href="%{emendation_path}"> zmena </a> vytvorené <a href="%{emendation_author_path}">%{emendation_author_nickname} </a> bola odmietnutá <a href = "%{amendable_path}" >%{amendable_title} </a>.
|
|
947
937
|
follower:
|
|
948
938
|
email_intro: 'Oznámenie bolo zamietnuté za %{amendable_title}. Môžete ju vidieť z tejto stránky: '
|
|
949
939
|
email_outro: Toto oznámenie ste dostali, pretože sledujete %{amendable_title}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
|
|
950
|
-
email_subject: Zmena bola zamietnutá pre %{amendable_title} od%{emendation_author_nickname}
|
|
951
|
-
notification_title: <a href="%{emendation_path}"> zmena </a> vytvorené <a href="%{emendation_author_path}">%{emendation_author_nickname} </a> bola odmietnutá <a href = "%{amendable_path}" >%{amendable_title} </a>.
|
|
952
940
|
emendation_promoted:
|
|
953
941
|
follower:
|
|
954
942
|
email_intro: 'Pre %{amendable_title} bola zverejnená úprava. Môžete si ju pozrieť na tejto stránke:'
|
|
955
943
|
email_outro: Toto upozornenie ste dostali, pretože ste autorom %{amendable_title}.
|
|
956
|
-
email_subject: Úprava od %{emendation_author_nickname} bola zverejnená ako nový %{amendable_type}
|
|
957
944
|
attachments:
|
|
958
945
|
attachment_created:
|
|
959
946
|
email_intro: 'Do dokumentu%{resource_title} bol pridaný nový dokument. Môžete ho vidieť z tejto stránky: '
|
|
@@ -1004,25 +991,13 @@ sk:
|
|
|
1004
991
|
notification_title: |-
|
|
1005
992
|
Administrátor odstránil váš %{resource_type}, pretože bol nahlásený ako %{report_reasons}.</br>
|
|
1006
993
|
<i>%{resource_content}</i>
|
|
1007
|
-
resource_liked:
|
|
1008
|
-
email_intro: '%{liker_name} %{liker_nickname}, ktorého sledujete, práve označil/a, že sa mu/jej páči „%{resource_title}“, a myslíme si, že by to mohlo zaujímať aj vás. Pozrite si to a prispejte:'
|
|
1009
|
-
email_outro: Toto upozornenie ste dostali, pretože sledujete %{liker_nickname}. Prijímanie upozornení môžete zrušiť pomocou predchádzajúceho odkazu.
|
|
1010
|
-
email_subject: "%{liker_nickname} pridal/a nové označenie páči sa mi to"
|
|
1011
|
-
notification_title: <a href="%{resource_path}">%{resource_title}</a> (%{resource_type}) sa páči používateľovi <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a>.
|
|
1012
994
|
resources:
|
|
1013
995
|
soft_deleted:
|
|
1014
996
|
notification_title: Administrátor odstránil váš „%{resource_type}“ „%{resource_title}“.
|
|
1015
997
|
users:
|
|
1016
|
-
profile_updated:
|
|
1017
|
-
email_intro: <a href="%{resource_url}"> profilová stránka </a> zo %{name} (%{nickname}), ktorú sledujete, bola aktualizovaná.
|
|
1018
|
-
email_outro: Toto oznámenie ste dostali, pretože sledujete %{nickname}. Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
|
|
1019
|
-
email_subject: "%{nickname} aktualizoval svoj profil"
|
|
1020
|
-
notification_title: <a href="%{resource_path}"> profilová stránka </a> od%{name} (%{nickname}), ktorú sledujete, bola aktualizovaná.
|
|
1021
998
|
user_officialized:
|
|
1022
|
-
email_intro: Účastník %{name} (%{nickname}) bol oficializovaný.
|
|
1023
999
|
email_outro: Toto upozornenie ste dostali, pretože ste administrátorom organizácie.
|
|
1024
1000
|
email_subject: "%{name} bol/a oficializovaný/á"
|
|
1025
|
-
notification_title: Účastník %{name} (%{nickname}) bol oficializovaný.
|
|
1026
1001
|
export_mailer:
|
|
1027
1002
|
download_your_data_export:
|
|
1028
1003
|
click_button_html: Kliknutím na nasledujúci odkaz si stiahnete svoje údaje.<br/>Súbor bude k dispozícii na stiahnutie do %{date}.
|
data/config/locales/sv.yml
CHANGED
|
@@ -875,13 +875,13 @@ sv:
|
|
|
875
875
|
affected_user:
|
|
876
876
|
email_intro: 'Ett ändringsförslag har godkänts för %{amendable_title}. Visa det från den här sidan:'
|
|
877
877
|
email_outro: Du har fått det här meddelandet eftersom du är en författare av %{amendable_title}.
|
|
878
|
-
email_subject:
|
|
879
|
-
notification_title: <a href="%{emendation_path}"
|
|
878
|
+
email_subject: Accepterad förbättring av %{amendable_title} från %{emendation_author_name}
|
|
879
|
+
notification_title: <a href="%{emendation_path}">Förbättringen</a> gjord av <a href="%{emendation_author_path}">%{emendation_author_name}</a> accepterades för <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
880
880
|
follower:
|
|
881
881
|
email_intro: 'Ett ändringsförslag har bifallits för %{amendable_title}. Läs det på den här sidan:'
|
|
882
882
|
email_outro: Du har fått det här meddelandet eftersom du följer %{amendable_title}. Du kan sluta att ta emot meddelanden genom att följa föregående länk.
|
|
883
|
-
email_subject:
|
|
884
|
-
notification_title: <a href="%{emendation_path}"
|
|
883
|
+
email_subject: Accepterad förbättring av %{amendable_title} från %{emendation_author_name}
|
|
884
|
+
notification_title: <a href="%{emendation_path}">Förbättringen</a> gjord av <a href="%{emendation_author_path}">%{emendation_author_name}</a> accepterades för <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
885
885
|
amendment_created:
|
|
886
886
|
affected_user:
|
|
887
887
|
email_intro: 'Ett nytt ändringsförslag har skapats för %{amendable_title}. Du kan se det från den här sidan:'
|
|
@@ -897,29 +897,20 @@ sv:
|
|
|
897
897
|
affected_user:
|
|
898
898
|
email_intro: 'Ett avslaget ändringsförslag till %{amendable_title} har publicerats som en ny %{amendable_type}. Du kan se det på den här sidan:'
|
|
899
899
|
email_outro: Du har fått det här meddelandet eftersom du är en författare av %{amendable_title}.
|
|
900
|
-
email_subject: Ett ändringsförslag från %{emendation_author_nickname} har publicerats som ett nytt %{amendable_type}
|
|
901
|
-
notification_title: Ett <a href="%{emendation_path}">avslaget ändringsförslag</a> till <a href="%{amendable_path}">%{amendable_title}</a> har publicerats som ett nytt %{amendable_type} av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
|
|
902
900
|
follower:
|
|
903
901
|
email_intro: 'En avslaget ändringsförslag till %{amendable_title} har lagts fram som ett nytt %{amendable_type}. Du kan se det på den här sidan:'
|
|
904
902
|
email_outro: Du har fått det här meddelandet eftersom du följer %{amendable_title}. Du kan sluta att ta emot meddelanden via föregående länk.
|
|
905
|
-
email_subject: Ett ändringsförslag från %{emendation_author_nickname} har lagts fram som ett nytt %{amendable_type}
|
|
906
|
-
notification_title: Ett <a href="%{emendation_path}">avslaget ändringsförslag</a> till <a href="%{amendable_path}">%{amendable_title}</a> har lagts fram som ett nytt %{amendable_type} av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
|
|
907
903
|
amendment_rejected:
|
|
908
904
|
affected_user:
|
|
909
905
|
email_intro: 'En ändringsförslag till %{amendable_title} har avslagits. Du kan se det från den här sidan:'
|
|
910
906
|
email_outro: Du har fått det här meddelandet eftersom du är en författare till %{amendable_title}.
|
|
911
|
-
email_subject: Avslaget ändringsförslag till %{amendable_title} från %{emendation_author_nickname}
|
|
912
|
-
notification_title: <a href="%{emendation_path}">Ändringsförslaget</a> för <a href="%{amendable_path}">%{amendable_title}</a> skapat av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> har avslagits.
|
|
913
907
|
follower:
|
|
914
908
|
email_intro: 'Ett ändringsförslag till %{amendable_title} har avslagits. Du kan se det från den här sidan:'
|
|
915
909
|
email_outro: Du har fått det här meddelandet eftersom du följer %{amendable_title}. Du kan sluta ta emot meddelanden via föregående länk.
|
|
916
|
-
email_subject: Ändringsförslaget till %{amendable_title} från %{emendation_author_nickname} avslogs
|
|
917
|
-
notification_title: <a href="%{emendation_path}">Ändringsförslaget</a> till <a href="%{amendable_path}">%{amendable_title}</a> skapat av <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> har avslagits.
|
|
918
910
|
emendation_promoted:
|
|
919
911
|
follower:
|
|
920
912
|
email_intro: 'Ett ändringsförslag till %{amendable_title} har avslagits. Du kan se det från den här sidan:'
|
|
921
913
|
email_outro: Du har fått det här meddelandet eftersom du är en författare till %{amendable_title}.
|
|
922
|
-
email_subject: Ett ändringsförslag från %{emendation_author_nickname} har publicerats som ett nytt %{amendable_type}
|
|
923
914
|
attachments:
|
|
924
915
|
attachment_created:
|
|
925
916
|
email_intro: 'Ett nytt dokument har lagts till i %{resource_title}. Du kan se det från den här sidan:'
|
|
@@ -971,25 +962,13 @@ sv:
|
|
|
971
962
|
En administratör tog bort din %{resource_type} eftersom den har rapporterats som %{report_reasons}.
|
|
972
963
|
</br>
|
|
973
964
|
<i>%{resource_content}</i>
|
|
974
|
-
resource_liked:
|
|
975
|
-
email_intro: '%{liker_name} %{liker_nickname}, som du följer, gillar "%{resource_title}" och vi tror att du kan vara intresserad. Ta en titt och bidra:'
|
|
976
|
-
email_outro: Du har fått det här meddelandet eftersom du följer %{liker_nickname}. Du kan sluta att ta emot meddelanden via föregående länk.
|
|
977
|
-
email_subject: "%{liker_nickname} har gillat något"
|
|
978
|
-
notification_title: <a href="%{liker_path}">%{liker_name} %{liker_nickname}</a> gillar %{resource_type} <a href="%{resource_path}">%{resource_title}</a>.
|
|
979
965
|
resources:
|
|
980
966
|
soft_deleted:
|
|
981
967
|
notification_title: En administratör har tagit bort ditt "%{resource_type}" "%{resource_title}".
|
|
982
968
|
users:
|
|
983
|
-
profile_updated:
|
|
984
|
-
email_intro: <a href="%{resource_url}">Profilsidan</a> för %{name} (%{nickname}), som du följer, har uppdaterats.
|
|
985
|
-
email_outro: Du har fått det här meddelandet eftersom du följer %{nickname}. Du kan sluta att ta emot meddelanden genom att följa föregående länk.
|
|
986
|
-
email_subject: "%{nickname} uppdaterade sin profil"
|
|
987
|
-
notification_title: <a href="%{resource_path}">Profilsidan</a> för %{name} (%{nickname}), som du följer, har uppdaterats.
|
|
988
969
|
user_officialized:
|
|
989
|
-
email_intro: Deltagaren %{name} (%{nickname}) har fått officiell status.
|
|
990
970
|
email_outro: Du har fått detta meddelande eftersom du är administratör i organisationen.
|
|
991
971
|
email_subject: "%{name} har fått officiell status"
|
|
992
|
-
notification_title: Deltagaren %{name} (%{nickname}) har fått officiell status.
|
|
993
972
|
export_mailer:
|
|
994
973
|
download_your_data_export:
|
|
995
974
|
click_button_html: Klicka på nästa länk för att ladda ner dina data.<br/>Filen kommer att finnas tillgänglig för nedladdning fram till %{date}.
|
data/config/locales/tr-TR.yml
CHANGED
|
@@ -419,13 +419,9 @@ tr:
|
|
|
419
419
|
affected_user:
|
|
420
420
|
email_intro: '%{amendable_title}için bir ödeme kabul edildi. Bu sayfadan görebilirsiniz:'
|
|
421
421
|
email_outro: Bu bildirimi aldınız, çünkü %{amendable_title}yazarı sizsiniz.
|
|
422
|
-
email_subject: '%{emendation_author_nickname}%{amendable_title} bir değişiklik kabul edildi'
|
|
423
|
-
notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> tarafından yaratılan <a href="%{emendation_path}">değişiklik</a> <a href="%{amendable_path}">%{amendable_title}</a>için kabul edilmiştir.
|
|
424
422
|
follower:
|
|
425
423
|
email_intro: '%{amendable_title}için bir ödeme kabul edildi. Bu sayfadan görebilirsiniz:'
|
|
426
424
|
email_outro: Bu bildirimi, %{amendable_title}izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
|
|
427
|
-
email_subject: '%{emendation_author_nickname}%{amendable_title} bir değişiklik kabul edildi'
|
|
428
|
-
notification_title: <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> tarafından yaratılan <a href="%{emendation_path}">değişiklik</a> <a href="%{amendable_path}">%{amendable_title}</a>için kabul edilmiştir.
|
|
429
425
|
amendment_created:
|
|
430
426
|
affected_user:
|
|
431
427
|
email_intro: '%{amendable_title}için yeni bir emendation oluşturuldu. Bu sayfadan görebilirsiniz:'
|
|
@@ -441,24 +437,16 @@ tr:
|
|
|
441
437
|
affected_user:
|
|
442
438
|
email_intro: '%{amendable_title} için reddedilen bir tahliye, bağımsız %{amendable_type} yükseltilmiştir. Bu sayfadan görebilirsiniz:'
|
|
443
439
|
email_outro: Bu bildirimi aldınız, çünkü %{amendable_title} yazarı sizsiniz.
|
|
444
|
-
email_subject: '%{emendation_author_nickname} bir değişiklik yeni olarak yayınlandı %{amendable_type}'
|
|
445
|
-
notification_title: Bir <a href="%{emendation_path}">değişikliğini reddetmiştir</a> için <a href="%{amendable_path}">%{amendable_title}</a>, yeni olarak yayınlanmış %{amendable_type} ile <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
|
|
446
440
|
follower:
|
|
447
441
|
email_intro: '%{amendable_title} için reddedilen bir tahliye, bağımsız %{amendable_type} yükseltilmiştir. Bu sayfadan görebilirsiniz:'
|
|
448
442
|
email_outro: Bu bildirimi, %{amendable_title} izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
|
|
449
|
-
email_subject: '%{emendation_author_nickname} bir değişiklik yeni olarak yayınlandı %{amendable_type}'
|
|
450
|
-
notification_title: Bir <a href="%{emendation_path}">değişikliğini reddetmiştir</a> için <a href="%{amendable_path}">%{amendable_title}</a>, yeni olarak yayınlanmış %{amendable_type} ile <a href="%{emendation_author_path}">%{emendation_author_nickname}</a>.
|
|
451
443
|
amendment_rejected:
|
|
452
444
|
affected_user:
|
|
453
445
|
email_intro: 'Bir emendation %{amendable_title} için reddedildi. Bu sayfadan görebilirsiniz:'
|
|
454
446
|
email_outro: Bu bildirimi aldınız, çünkü %{amendable_title} yazarı sizsiniz.
|
|
455
|
-
email_subject: Bir değişiklik %{emendation_author_nickname}%{amendable_title} için reddedildi
|
|
456
|
-
notification_title: <a href="%{emendation_path}">değişiklik</a> tarafından oluşturulan <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> reddedildi <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
457
447
|
follower:
|
|
458
448
|
email_intro: 'Bir emendation %{amendable_title} için reddedildi. Bu sayfadan görebilirsiniz:'
|
|
459
449
|
email_outro: Bu bildirimi, %{amendable_title} izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
|
|
460
|
-
email_subject: Bir değişiklik %{emendation_author_nickname}%{amendable_title} için reddedildi
|
|
461
|
-
notification_title: <a href="%{emendation_path}">değişiklik</a> tarafından oluşturulan <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> reddedildi <a href="%{amendable_path}">%{amendable_title}</a>.
|
|
462
450
|
attachments:
|
|
463
451
|
attachment_created:
|
|
464
452
|
email_intro: '%{resource_title} yeni bir belge eklendi. Bu sayfadan görebilirsiniz:'
|
|
@@ -489,12 +477,6 @@ tr:
|
|
|
489
477
|
notification_title: |-
|
|
490
478
|
Bir yönetici, %{resource_type}'nizi %{report_reasons} olarak bildirildiği için kaldırdı. </br>
|
|
491
479
|
<i>%{resource_content} </i>
|
|
492
|
-
users:
|
|
493
|
-
profile_updated:
|
|
494
|
-
email_intro: <a href="%{resource_url}">profil sayfası</a> arasında %{name} (%{nickname} izlediğiniz), güncellendi.
|
|
495
|
-
email_outro: Bu bildirimi, %{nickname} izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
|
|
496
|
-
email_subject: "%{nickname} profilini güncelledi"
|
|
497
|
-
notification_title: <a href="%{resource_path}">profil sayfası</a> arasında %{name} (%{nickname} izlediğiniz), güncellendi.
|
|
498
480
|
export_mailer:
|
|
499
481
|
download_your_data_export:
|
|
500
482
|
download: İndir
|
data/config/locales/uk.yml
CHANGED
|
@@ -250,12 +250,6 @@ uk:
|
|
|
250
250
|
email_intro: '"%{resource_title}" було оновлено. Ви можете переглянути його на сторінці:'
|
|
251
251
|
email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
|
|
252
252
|
email_subject: Оновлення до %{resource_title}
|
|
253
|
-
users:
|
|
254
|
-
profile_updated:
|
|
255
|
-
email_intro: Сторінка <a href="%{resource_url}">профілю</a> учасника %{name} (%{nickname}), за яким ви стежите, була оновлена.
|
|
256
|
-
email_outro: Ви отримали це сповіщення, тому що ви стежите за %{nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
|
|
257
|
-
email_subject: "%{nickname} оновив свій профіль"
|
|
258
|
-
notification_title: Сторінка <a href="%{resource_path}">профілю</a> учасника %{name} (%{nickname}), за яким ви стежите, була оновлена.
|
|
259
253
|
export_mailer:
|
|
260
254
|
download_your_data_export:
|
|
261
255
|
download: Завантажити
|
data/config/locales/zh-CN.yml
CHANGED
|
@@ -351,13 +351,9 @@ zh-CN:
|
|
|
351
351
|
affected_user:
|
|
352
352
|
email_intro: '%{amendable_title}的修改已被接受。您可以从这个页面查看:'
|
|
353
353
|
email_outro: 您收到此通知是因为您是 %{amendable_title} 的作者。
|
|
354
|
-
email_subject: 接受来自 %{amendable_title} 的 %{emendation_author_nickname} 修正案
|
|
355
|
-
notification_title: 由 <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> 创建的 <a href="%{emendation_path}">修正</a> 已被接受 <a href="%{amendable_path}">%{amendable_title}</a>。
|
|
356
354
|
follower:
|
|
357
355
|
email_intro: '%{amendable_title}的修改已被接受。您可以从这个页面查看:'
|
|
358
356
|
email_outro: 您收到此通知是因为您正在关注 %{amendable_title}。您可以停止收到跟随上一个链接的通知。
|
|
359
|
-
email_subject: 接受来自 %{amendable_title} 的 %{emendation_author_nickname} 修正案
|
|
360
|
-
notification_title: 由 <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> 创建的 <a href="%{emendation_path}">修正</a> 已被接受 <a href="%{amendable_path}">%{amendable_title}</a>。
|
|
361
357
|
amendment_created:
|
|
362
358
|
affected_user:
|
|
363
359
|
email_intro: '已经为 %{amendable_title}创建了一个新的版本。您可以从这个页面查看它:'
|
|
@@ -373,22 +369,16 @@ zh-CN:
|
|
|
373
369
|
affected_user:
|
|
374
370
|
email_intro: '%{amendable_title} 的被拒绝的修订已经发布为新的 %{amendable_type}。您可以从这个页面查看:'
|
|
375
371
|
email_outro: 您收到此通知是因为您是 %{amendable_title} 的作者。
|
|
376
|
-
email_subject: 来自 %{emendation_author_nickname} 的修订已经发布为新的 %{amendable_type}
|
|
377
372
|
follower:
|
|
378
373
|
email_intro: '%{amendable_title} 的被拒绝的修订已经发布为新的 %{amendable_type}。您可以从这个页面查看:'
|
|
379
374
|
email_outro: 您收到此通知是因为您正在关注 %{amendable_title}。您可以停止收到跟随上一个链接的通知。
|
|
380
|
-
email_subject: 来自 %{emendation_author_nickname} 的修订已经发布为新的 %{amendable_type}
|
|
381
375
|
amendment_rejected:
|
|
382
376
|
affected_user:
|
|
383
377
|
email_intro: '%{amendable_title}的修订已被拒绝。您可以从这个页面查看:'
|
|
384
378
|
email_outro: 您收到此通知是因为您是 %{amendable_title} 的作者。
|
|
385
|
-
email_subject: '%{amendable_title} 的 %{emendation_author_nickname} 修正案被拒绝'
|
|
386
|
-
notification_title: 由 <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> 创建的 <a href="%{emendation_path}">项修正</a> 已被 <a href="%{amendable_path}">%{amendable_title}</a> 拒绝。
|
|
387
379
|
follower:
|
|
388
380
|
email_intro: '%{amendable_title}的修订已被拒绝。您可以从这个页面查看:'
|
|
389
381
|
email_outro: 您收到此通知是因为您正在关注 %{amendable_title}。您可以停止收到跟随上一个链接的通知。
|
|
390
|
-
email_subject: '%{amendable_title} 的 %{emendation_author_nickname} 修正案被拒绝'
|
|
391
|
-
notification_title: 由 <a href="%{emendation_author_path}">%{emendation_author_nickname}</a> 创建的 <a href="%{emendation_path}">项修正</a> 已被 <a href="%{amendable_path}">%{amendable_title}</a> 拒绝。
|
|
392
382
|
attachments:
|
|
393
383
|
attachment_created:
|
|
394
384
|
email_intro: '一个新文档已添加到 %{resource_title}。您可以从这个页面查看:'
|
|
@@ -411,12 +401,6 @@ zh-CN:
|
|
|
411
401
|
email_outro: 您收到此通知是因为您在我们的网站上进行了活动。
|
|
412
402
|
level_up:
|
|
413
403
|
email_outro: 您收到此通知是因为您在我们的网站上进行了活动。
|
|
414
|
-
users:
|
|
415
|
-
profile_updated:
|
|
416
|
-
email_intro: 您关注的 %{name} (%{nickname}) 的 <a href="%{resource_url}">个人资料页面</a> 已经更新。
|
|
417
|
-
email_outro: 您收到此通知是因为您正在关注 %{nickname}。您可以停止收到跟随上一个链接的通知。
|
|
418
|
-
email_subject: "%{nickname} 更新了他们的个人资料"
|
|
419
|
-
notification_title: 您关注的 %{name} (%{nickname}) 的 <a href="%{resource_path}">个人资料页面</a> 已经更新。
|
|
420
404
|
export_mailer:
|
|
421
405
|
download_your_data_export:
|
|
422
406
|
download: 下载
|
data/config/locales/zh-TW.yml
CHANGED
|
@@ -550,13 +550,9 @@ zh-TW:
|
|
|
550
550
|
affected_user:
|
|
551
551
|
email_intro: '已接受對於 %{amendable_title} 的修正案。您可以從此頁面中查看:'
|
|
552
552
|
email_outro: 你收到此通知,是因為你是%{amendable_title} 的作者。
|
|
553
|
-
email_subject: 已接受對於 %{amendable_title} 的修正案,來自於 %{emendation_author_nickname}
|
|
554
|
-
notification_title: <a href="%{emendation_path}">修正案</a>由<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>創建,已被接受適用於<a href="%{amendable_path}">%{amendable_title}</a>。
|
|
555
553
|
follower:
|
|
556
554
|
email_intro: '已接受對於 %{amendable_title} 的修正案。您可以從此頁面中查看:'
|
|
557
555
|
email_outro: 您收到此通知,是因為您正在關注 %{amendable_title}。您可以使用上面的連結停止接收通知。
|
|
558
|
-
email_subject: 已接受對於 %{amendable_title} 的修正案,來自於 %{emendation_author_nickname}
|
|
559
|
-
notification_title: <a href="%{emendation_path}">修正案</a>由<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>創建,已被接受適用於<a href="%{amendable_path}">%{amendable_title}</a>。
|
|
560
556
|
amendment_created:
|
|
561
557
|
affected_user:
|
|
562
558
|
email_intro: '已為 %{amendable_title} 創建一個新的修正案。您可以從此頁面查看:'
|
|
@@ -572,24 +568,16 @@ zh-TW:
|
|
|
572
568
|
affected_user:
|
|
573
569
|
email_intro: '一個被拒絕的修正案已被發佈為新的 %{amendable_type},針對 %{amendable_title}。您可以從此頁面查看:'
|
|
574
570
|
email_outro: 你收到此通知,是因為你是%{amendable_title} 的作者。
|
|
575
|
-
email_subject: 來自 %{emendation_author_nickname} 的修正案已被發佈為新的 %{amendable_type}
|
|
576
|
-
notification_title: 一個<a href="%{emendation_path}">被拒絕的修正案</a>已由<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>發佈為新的 %{amendable_type},針對<a href="%{amendable_path}">%{amendable_title}</a>。
|
|
577
571
|
follower:
|
|
578
572
|
email_intro: '一個被拒絕的修正案已被發佈為新的 %{amendable_type},針對 %{amendable_title}。您可以從此頁面查看:'
|
|
579
573
|
email_outro: 您收到此通知,是因為您正在關注 %{amendable_title}。您可以使用上面的連結停止接收通知。
|
|
580
|
-
email_subject: 來自 %{emendation_author_nickname} 的修正案已被發佈為新的 %{amendable_type}
|
|
581
|
-
notification_title: 一個<a href="%{emendation_path}">被拒絕的修正案</a>已由<a href="%{emendation_author_path}">%{emendation_author_nickname}</a>發佈為新的 %{amendable_type},針對<a href="%{amendable_path}">%{amendable_title}</a>。
|
|
582
574
|
amendment_rejected:
|
|
583
575
|
affected_user:
|
|
584
576
|
email_intro: '一個修正案已被拒絕,針對 %{amendable_title}。您可以從此頁面查看:'
|
|
585
577
|
email_outro: 你收到此通知,是因為你是%{amendable_title} 的作者。
|
|
586
|
-
email_subject: 修正案由 %{emendation_author_nickname} 提交,針對 %{amendable_title},已被拒絕。
|
|
587
|
-
notification_title: <a href="%{emendation_path}">%{emendation_author_nickname}</a>創建的<a href="%{emendation_path}">修正案</a>已被拒絕,針對<a href="%{amendable_path}">%{amendable_title}</a>。
|
|
588
578
|
follower:
|
|
589
579
|
email_intro: '一個修正案已被拒絕,針對 %{amendable_title}。您可以從此頁面查看:'
|
|
590
580
|
email_outro: 您收到此通知,是因為您正在關注 %{amendable_title}。您可以使用上面的連結停止接收通知。
|
|
591
|
-
email_subject: 修正案由 %{emendation_author_nickname} 提交,針對 %{amendable_title},已被拒絕。
|
|
592
|
-
notification_title: <a href="%{emendation_path}">%{emendation_author_nickname}</a>創建的<a href="%{emendation_path}">修正案</a>已被拒絕,針對<a href="%{amendable_path}">%{amendable_title}</a>。
|
|
593
581
|
attachments:
|
|
594
582
|
attachment_created:
|
|
595
583
|
email_intro: '已新增一個文件至 %{resource_title}。您可以從此頁面查看:'
|
|
@@ -626,16 +614,9 @@ zh-TW:
|
|
|
626
614
|
notification_title: |-
|
|
627
615
|
一位管理員因為 %{report_reasons} 的舉報,移除了您的%{resource_type}。</br> <i>%{resource_content}</i>
|
|
628
616
|
users:
|
|
629
|
-
profile_updated:
|
|
630
|
-
email_intro: 你正在追蹤的 %{name}(%{nickname}) 的<a href="%{resource_path}">個人資料頁面</a>已被更新。
|
|
631
|
-
email_outro: 您收到此通知是因為您正在關注 %{nickname}。您可以點擊上方的連結停止接收通知。
|
|
632
|
-
email_subject: "%{nickname} 更新了他們的個人資料。"
|
|
633
|
-
notification_title: 你正在追蹤的 %{name}(%{nickname}) 的<a href="%{resource_path}">個人資料頁面</a>已被更新。
|
|
634
617
|
user_officialized:
|
|
635
|
-
email_intro: 參與者 %{name} (%{nickname}) 已被官方認證。
|
|
636
618
|
email_outro: 您收到此通知是因為您是該組織的管理員。
|
|
637
619
|
email_subject: "%{name} 已被官方認證。"
|
|
638
|
-
notification_title: 參與者 %{name} (%{nickname}) 已被官方認證。
|
|
639
620
|
export_mailer:
|
|
640
621
|
download_your_data_export:
|
|
641
622
|
download: 下載
|
|
@@ -33,8 +33,8 @@ class ConvertUserGroupsIntoUsers < ActiveRecord::Migration[7.0]
|
|
|
33
33
|
def up
|
|
34
34
|
User.old_group.find_each do |group|
|
|
35
35
|
if group.email.blank? || another_user_with_same_email_in_organization?(group)
|
|
36
|
-
group.update_attribute(:email, "user_group_#{group.id}@#{group.organization.host}.invalid")
|
|
37
36
|
group.update_attribute(:extended_data, (group.extended_data || {}).merge("patched" => true, "previous_email" => group.email))
|
|
37
|
+
group.update_attribute(:email, "user_group_#{group.id}@#{group.organization.host}.invalid")
|
|
38
38
|
|
|
39
39
|
group.reload
|
|
40
40
|
end
|
|
@@ -49,7 +49,8 @@ class ConvertUserGroupsIntoUsers < ActiveRecord::Migration[7.0]
|
|
|
49
49
|
User.new_group.find_each do |group|
|
|
50
50
|
group.update_attribute(:officialized_at, nil)
|
|
51
51
|
group.update_attribute(:type, "Decidim::UserGroup")
|
|
52
|
-
group.update_attribute(:
|
|
52
|
+
group.update_attribute(:email, group.extended_data["previous_email"]) if group.extended_data["previous_email"].present?
|
|
53
|
+
group.update_attribute(:extended_data, (group.extended_data || {}).except("group", "patched", "previous_email"))
|
|
53
54
|
end
|
|
54
55
|
end
|
|
55
56
|
# rubocop:enable Rails/SkipsModelValidations
|
data/decidim-core.gemspec
CHANGED
|
@@ -74,6 +74,9 @@ Gem::Specification.new do |s|
|
|
|
74
74
|
s.add_dependency "premailer-rails", "~> 1.10"
|
|
75
75
|
s.add_dependency "rack", "~> 2.2", ">= 2.2.8.1"
|
|
76
76
|
s.add_dependency "rack-attack", "~> 6.0"
|
|
77
|
+
# Workaround until shakapacker releases a new version compatible with rack-proxy v1.0
|
|
78
|
+
# @see https://github.com/shakacode/shakapacker/issues/1220
|
|
79
|
+
s.add_dependency "rack-proxy", "~> 0.8.3", "< 1.0"
|
|
77
80
|
s.add_dependency "rails", "~> 7.2.0", ">= 7.2.2.2"
|
|
78
81
|
s.add_dependency "rails-i18n", "~> 7.0"
|
|
79
82
|
s.add_dependency "ransack", "~> 4.2.0"
|
|
@@ -8,7 +8,7 @@ shared_examples "amendment event" do
|
|
|
8
8
|
it_behaves_like "a simple event email"
|
|
9
9
|
it_behaves_like "a simple event notification"
|
|
10
10
|
|
|
11
|
-
let(:
|
|
11
|
+
let(:emendation_author_name) { emendation.creator_author.name }
|
|
12
12
|
let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
|
|
13
13
|
let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
|
|
14
14
|
let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
|
|
@@ -16,5 +16,5 @@ shared_examples "amendment event" do
|
|
|
16
16
|
let(:email_intro) { "An amendment has been #{amendment_type} for #{amendable_title}. You can see it from this page:" }
|
|
17
17
|
let(:email_outro) { "You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link." }
|
|
18
18
|
|
|
19
|
-
let(:notification_title) { "The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{
|
|
19
|
+
let(:notification_title) { "The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_name}</a> has been #{amendment_type} for <a href=\"#{amendable_path}\">#{amendable_title}</a>." } # rubocop:disable Layout/LineLength
|
|
20
20
|
end
|
|
@@ -10,15 +10,15 @@ shared_examples "amendment promoted event" do
|
|
|
10
10
|
it_behaves_like "a simple event email"
|
|
11
11
|
it_behaves_like "a simple event notification"
|
|
12
12
|
|
|
13
|
-
let(:
|
|
13
|
+
let(:emendation_author_name) { emendation.creator_author.name }
|
|
14
14
|
let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
|
|
15
15
|
let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
|
|
16
16
|
let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
|
|
17
17
|
|
|
18
|
-
let(:email_subject) { "An amendment from #{
|
|
18
|
+
let(:email_subject) { "An amendment from #{emendation_author_name} has been published as a new proposal" }
|
|
19
19
|
let(:email_intro) { "A rejected amendment for #{amendable_title} has been published as a new #{amendable_type}. You can see it from this page:" }
|
|
20
20
|
let(:email_outro) { "You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link." }
|
|
21
21
|
# rubocop:disable Layout/LineLength
|
|
22
|
-
let(:notification_title) { "A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{
|
|
22
|
+
let(:notification_title) { "A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_name}</a>." }
|
|
23
23
|
# rubocop:enable Layout/LineLength
|
|
24
24
|
end
|
|
@@ -147,6 +147,16 @@ shared_examples "comments" do
|
|
|
147
147
|
expect(page).to have_css(".comment-thread")
|
|
148
148
|
end
|
|
149
149
|
|
|
150
|
+
it "opens the login modal when clicking the comment button" do
|
|
151
|
+
visit resource_path
|
|
152
|
+
|
|
153
|
+
expect(page).to have_no_css("#loginModal-content", visible: :visible)
|
|
154
|
+
|
|
155
|
+
find(".add-comment-mobile").click
|
|
156
|
+
|
|
157
|
+
expect(page).to have_css("#loginModal-content", visible: :visible)
|
|
158
|
+
end
|
|
159
|
+
|
|
150
160
|
context "when user visit a mobile browser" do
|
|
151
161
|
before do
|
|
152
162
|
driven_by(:iphone)
|
|
@@ -176,6 +186,22 @@ shared_examples "comments" do
|
|
|
176
186
|
expect(page).to have_css(".add-comment form")
|
|
177
187
|
end
|
|
178
188
|
|
|
189
|
+
it "does not show login modal when clicking the comment button" do
|
|
190
|
+
visit resource_path
|
|
191
|
+
|
|
192
|
+
find("a.add-comment-mobile").click
|
|
193
|
+
|
|
194
|
+
expect(page).to have_no_css("#loginModal-content", visible: :visible)
|
|
195
|
+
end
|
|
196
|
+
|
|
197
|
+
it "guides the user to the comment form when clicking the comment button" do
|
|
198
|
+
visit resource_path
|
|
199
|
+
|
|
200
|
+
find("a.add-comment-mobile").click
|
|
201
|
+
|
|
202
|
+
expect(page).to have_css("#add-comment-anchor")
|
|
203
|
+
end
|
|
204
|
+
|
|
179
205
|
context "when user visit a computer browser" do
|
|
180
206
|
before do
|
|
181
207
|
switch_to_host(organization.host)
|
|
@@ -8,7 +8,8 @@ shared_examples_for "has space in m-cell" do
|
|
|
8
8
|
let(:show_space) { true }
|
|
9
9
|
|
|
10
10
|
it "renders the space where the model belongs to" do
|
|
11
|
-
expect(cell_html).to have_content(
|
|
11
|
+
expect(cell_html).to have_content(translated_attribute(model.component.participatory_space.title))
|
|
12
|
+
expect(cell_html.to_s).to include(decidim_escape_translated(model.component.participatory_space.title).gsub(""", "\""))
|
|
12
13
|
end
|
|
13
14
|
end
|
|
14
15
|
end
|