decidim-core 0.26.4 → 0.26.5
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of decidim-core might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/cells/decidim/newsletter_templates/base_cell.rb +8 -0
- data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb +4 -4
- data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb +4 -4
- data/app/commands/decidim/unendorse_resource.rb +1 -1
- data/app/controllers/decidim/groups_controller.rb +5 -0
- data/app/controllers/decidim/links_controller.rb +4 -2
- data/app/controllers/decidim/profiles_controller.rb +1 -1
- data/app/helpers/decidim/icon_helper.rb +3 -3
- data/app/helpers/decidim/newsletters_helper.rb +1 -0
- data/app/mailers/decidim/newsletter_mailer.rb +10 -3
- data/app/models/decidim/newsletter.rb +28 -0
- data/app/models/decidim/user.rb +0 -2
- data/app/models/decidim/user_base_entity.rb +2 -0
- data/app/models/decidim/user_block.rb +2 -2
- data/app/models/decidim/user_group.rb +1 -1
- data/app/packs/src/decidim/form_filter.component.test.js +148 -5
- data/app/packs/src/decidim/form_filter.js +26 -4
- data/app/packs/stylesheets/decidim/email.scss +7 -0
- data/app/presenters/decidim/admin_log/user_group_presenter.rb +1 -1
- data/app/presenters/decidim/admin_log/user_moderation_presenter.rb +1 -1
- data/app/views/decidim/newsletter_mailer/newsletter.html.erb +3 -3
- data/app/views/decidim/newsletters/show.html.erb +1 -1
- data/app/views/layouts/decidim/_mailer_logo.html.erb +2 -2
- data/app/views/layouts/decidim/newsletter_base.html.erb +2 -2
- data/config/locales/ar.yml +5 -4
- data/config/locales/bg.yml +5 -4
- data/config/locales/ca.yml +16 -12
- data/config/locales/cs.yml +6 -3
- data/config/locales/de.yml +2 -5
- data/config/locales/el.yml +4 -5
- data/config/locales/en.yml +6 -2
- data/config/locales/es-MX.yml +9 -5
- data/config/locales/es-PY.yml +9 -5
- data/config/locales/es.yml +14 -10
- data/config/locales/eu.yml +21 -22
- data/config/locales/fi-plain.yml +6 -2
- data/config/locales/fi.yml +7 -3
- data/config/locales/fr-CA.yml +6 -5
- data/config/locales/fr.yml +6 -5
- data/config/locales/gl.yml +2 -4
- data/config/locales/hu.yml +4 -5
- data/config/locales/id-ID.yml +5 -4
- data/config/locales/is-IS.yml +0 -1
- data/config/locales/it.yml +1 -5
- data/config/locales/ja.yml +20 -16
- data/config/locales/ka-GE.yml +1 -0
- data/config/locales/lb.yml +0 -4
- data/config/locales/lt.yml +0 -4
- data/config/locales/lv.yml +5 -4
- data/config/locales/nl.yml +0 -4
- data/config/locales/no.yml +2 -6
- data/config/locales/pl.yml +2 -5
- data/config/locales/pt-BR.yml +0 -4
- data/config/locales/pt.yml +0 -4
- data/config/locales/ro-RO.yml +5 -3
- data/config/locales/ru.yml +5 -1
- data/config/locales/sk.yml +5 -4
- data/config/locales/sv.yml +2 -5
- data/config/locales/tr-TR.yml +4 -5
- data/config/locales/uk.yml +5 -1
- data/config/locales/zh-CN.yml +3 -4
- data/lib/decidim/api/types/localized_string_type.rb +9 -0
- data/lib/decidim/api/types/translated_field_type.rb +20 -5
- data/lib/decidim/core/test/factories.rb +13 -6
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/form_builder.rb +1 -1
- data/lib/decidim/participatory_space_resourceable.rb +7 -1
- metadata +7 -6
data/config/locales/lv.yml
CHANGED
@@ -300,6 +300,8 @@ lv:
|
|
300
300
|
explanation_html: Lai veiktu šo darbību, jums jābūt autorizētam, bet pirms tam jāapstiprina savs e-pasts <strong>%{email}</strong>.
|
301
301
|
request_confirmation_instructions: Pieprasīt apstiprināšanas norādījumus
|
302
302
|
title: Apstiprināt e-pastu
|
303
|
+
show:
|
304
|
+
close_modal: Aizvērt modal
|
303
305
|
collapsible_list:
|
304
306
|
hidden_elements_count:
|
305
307
|
zero: un %{count} vēl
|
@@ -751,6 +753,9 @@ lv:
|
|
751
753
|
index:
|
752
754
|
last_activity: Pēdējā aktivitāte
|
753
755
|
resource_type: Veids
|
756
|
+
links:
|
757
|
+
warning:
|
758
|
+
close_modal: Aizvērt modal
|
754
759
|
log:
|
755
760
|
base_presenter:
|
756
761
|
create: "%{user_name} izveidoja %{resource_name}"
|
@@ -858,7 +863,6 @@ lv:
|
|
858
863
|
newsletter_mailer:
|
859
864
|
newsletter:
|
860
865
|
note: Jūs saņēmāt šo e-pasta ziņojumu, jo esat abonējis informatīvos biļetenus vietnē %{organization_name}. Iestatījumus var mainīt jūsu <a href="%{link}"> paziņojumu lapā </a>.
|
861
|
-
see_on_website: Vai nevarat pareizi redzēt šo e-pastu? Skatiet to <a href="%{link}" target="_blank"> tīmekļvietnē </a>.
|
862
866
|
unsubscribe: Lai atteiktos no šāda veida e-pasta saņemšanas, <a href="%{link}" target="_blank" class="unsubscribe"> Anulēt abonementu</a>.
|
863
867
|
newsletter_templates:
|
864
868
|
basic_only_text:
|
@@ -1100,9 +1104,6 @@ lv:
|
|
1100
1104
|
share_link: Kopīgot saiti
|
1101
1105
|
statistics:
|
1102
1106
|
comments_count: Komentāri
|
1103
|
-
user_activity:
|
1104
|
-
index:
|
1105
|
-
no_activities_warning: Šis dalībnieks vēl nav veicis nekādas aktivitātes
|
1106
1107
|
user_contact_disabled: Šis dalībnieks nepieņem tiešās ziņas.
|
1107
1108
|
user_conversations:
|
1108
1109
|
create:
|
data/config/locales/nl.yml
CHANGED
@@ -992,7 +992,6 @@ nl:
|
|
992
992
|
newsletter_mailer:
|
993
993
|
newsletter:
|
994
994
|
note: U ontvangt deze e-mail omdat u bent geabonneerd op nieuwsbrieven van %{organization_name}. U kunt uw instellingen op uw <a href="%{link}">notificatiepagina</a> veranderen.
|
995
|
-
see_on_website: Wordt deze e-mail niet correct worden weergegeven? Bekijk hem via deze link <a href="%{link}" target="_blank">website</a>.
|
996
995
|
unsubscribe: Om je uit te schrijven, <a href="%{link}" target="_blank" class="unsubscribe">Uitschrijven</a>.
|
997
996
|
newsletter_templates:
|
998
997
|
basic_only_text:
|
@@ -1292,9 +1291,6 @@ nl:
|
|
1292
1291
|
tags:
|
1293
1292
|
filter_results_for_category: 'Resultaten filteren voor categorie: %{resource}'
|
1294
1293
|
filter_results_for_scope: 'Filter resultaten voor bereik: %{resource}'
|
1295
|
-
user_activity:
|
1296
|
-
index:
|
1297
|
-
no_activities_warning: Deze deelnemer heeft nog geen activiteit gehad.
|
1298
1294
|
user_contact_disabled: Deze gebruiker accepteert geen directe berichten.
|
1299
1295
|
user_conversations:
|
1300
1296
|
create:
|
data/config/locales/no.yml
CHANGED
@@ -362,7 +362,7 @@
|
|
362
362
|
request_confirmation_instructions: Be om bekreftels instruksjoner
|
363
363
|
title: Bekreft e-posten din
|
364
364
|
show:
|
365
|
-
close_modal: Lukk
|
365
|
+
close_modal: Lukk modal
|
366
366
|
block_user_mailer:
|
367
367
|
notify:
|
368
368
|
body_1: Kontoen din ble blokkert.
|
@@ -887,7 +887,7 @@
|
|
887
887
|
body_1: Du er i ferd med å besøke en ekstern lenke, og vi vil at du skal være forsiktig med hensyn til innholdet på det eksterne nettstedet.
|
888
888
|
body_2: Vennligst sjekk linken du er i ferd med å besøke og sørg for at du anser den som et sikkert nettsted før du fortsetter.
|
889
889
|
cancel: Avbryt
|
890
|
-
close_modal: Lukk
|
890
|
+
close_modal: Lukk modal
|
891
891
|
proceed: Fortsett
|
892
892
|
title: Åpne ekstern lenke
|
893
893
|
log:
|
@@ -1019,7 +1019,6 @@
|
|
1019
1019
|
newsletter_mailer:
|
1020
1020
|
newsletter:
|
1021
1021
|
note: Du mottok denne e-posten fordi du abonnerer på nyhetsbrev for %{organization_name}. Du kan endre innstillingene dine på <a href="%{link}">varslings siden din</a>.
|
1022
|
-
see_on_website: Kan ikke se denne e-posten riktig? Se den på <a href="%{link}" target="_blank">nettsiden</a>.
|
1023
1022
|
unsubscribe: For å velge bort å motta denne typen e-mailer, <a href="%{link}" target="_blank" class="unsubscribe">Avslutt abonnementet</a>.
|
1024
1023
|
newsletter_templates:
|
1025
1024
|
basic_only_text:
|
@@ -1333,9 +1332,6 @@
|
|
1333
1332
|
help_text: "<strong>Advarsel:</strong> Innhold kan automatisk bli oversatt og ikke alltid være 100 % nøyaktig."
|
1334
1333
|
show_original: Vis originaltekst
|
1335
1334
|
show_translated: Vis automatisk oversatt tekst
|
1336
|
-
user_activity:
|
1337
|
-
index:
|
1338
|
-
no_activities_warning: Denne deltakeren har ikke hatt noe aktivitet ennå.
|
1339
1335
|
user_contact_disabled: Denne deltakeren godtar ikke direktemeldinger.
|
1340
1336
|
user_conversations:
|
1341
1337
|
create:
|
data/config/locales/pl.yml
CHANGED
@@ -763,7 +763,7 @@ pl:
|
|
763
763
|
create:
|
764
764
|
button: Obserwuj
|
765
765
|
error: Wystąpił błąd podczas próby obserwowania tego zasobu.
|
766
|
-
participatory_space:
|
766
|
+
participatory_space: Obserwuj <span class="show-for-sr">%{resource_name}</span>
|
767
767
|
destroy:
|
768
768
|
button: Przestań obserwować
|
769
769
|
error: Nastąpił błąd podczas cofania obserwowania tego zasobu.
|
@@ -1040,7 +1040,6 @@ pl:
|
|
1040
1040
|
newsletter_mailer:
|
1041
1041
|
newsletter:
|
1042
1042
|
note: Otrzymujesz ten e-mail, ponieważ subskrybujesz newslettery %{organization_name}. Możesz zmienić swoje ustawienia na <a href="%{link}">stronie powiadomień</a>.
|
1043
|
-
see_on_website: Nie widzisz tego e-maila poprawnie? Wyświetl go w <a href="%{link}" target="_blank">przeglądarce</a>.
|
1044
1043
|
unsubscribe: Aby zrezygnować z otrzymywania tego typu wiadomości e-mail, <a href="%{link}" target="_blank" class="unsubscribe">cofnij subskrypcję</a>.
|
1045
1044
|
newsletter_templates:
|
1046
1045
|
basic_only_text:
|
@@ -1346,9 +1345,6 @@ pl:
|
|
1346
1345
|
help_text: "<strong>Uwaga:</strong> Zawartość może być tłumaczeniem automatycznym i może nie być w 100% dokładna."
|
1347
1346
|
show_original: Pokaż oryginalny tekst
|
1348
1347
|
show_translated: Pokaż automatyczne tłumaczenie
|
1349
|
-
user_activity:
|
1350
|
-
index:
|
1351
|
-
no_activities_warning: Ten użytkownik nie ma jeszcze żadnej aktywności.
|
1352
1348
|
user_contact_disabled: Ten użytkownik nie przyjmuje bezpośrednich wiadomości.
|
1353
1349
|
user_conversations:
|
1354
1350
|
create:
|
@@ -1673,6 +1669,7 @@ pl:
|
|
1673
1669
|
email_included_in_password: jest zbyt podobne do twojego adresu e-mail
|
1674
1670
|
fallback: nie jest poprawne
|
1675
1671
|
name_included_in_password: jest zbyt podobne do twojego imienia
|
1672
|
+
nickname_included_in_password: jest zbyt podobne do twojego nicka
|
1676
1673
|
not_enough_unique_characters: nie ma wystarczającej liczby unikalnych znaków
|
1677
1674
|
password_not_allowed: nie jest dozwolone
|
1678
1675
|
password_too_common: jest zbyt powszechne
|
data/config/locales/pt-BR.yml
CHANGED
@@ -981,7 +981,6 @@ pt-BR:
|
|
981
981
|
newsletter_mailer:
|
982
982
|
newsletter:
|
983
983
|
note: Você recebeu este e-mail porque está inscrito em boletins informativos em %{organization_name}. Você pode alterar suas configurações em suas <a href="%{link}">notifications page</a>.
|
984
|
-
see_on_website: Não é possível ver este email corretamente? Visualize-o no <a href="%{link}" target="_blank">website</a>.
|
985
984
|
unsubscribe: Para optar por não receber esse tipo de email, <a href="%{link}" target="_blank" class="unsubscribe">Unsubscribe</a>.
|
986
985
|
newsletter_templates:
|
987
986
|
basic_only_text:
|
@@ -1289,9 +1288,6 @@ pt-BR:
|
|
1289
1288
|
help_text: "<strong>Aviso:</strong> O conteúdo pode ser traduzido automaticamente e não está 100% correto."
|
1290
1289
|
show_original: Exibir texto original
|
1291
1290
|
show_translated: Mostrar texto traduzido automaticamente
|
1292
|
-
user_activity:
|
1293
|
-
index:
|
1294
|
-
no_activities_warning: Este usuário ainda não possui nenhuma atividade.
|
1295
1291
|
user_contact_disabled: Este usuário não aceita mensagens diretas.
|
1296
1292
|
user_conversations:
|
1297
1293
|
create:
|
data/config/locales/pt.yml
CHANGED
@@ -981,7 +981,6 @@ pt:
|
|
981
981
|
newsletter_mailer:
|
982
982
|
newsletter:
|
983
983
|
note: Recebeu este e-mail porque está inscrito em boletins informativos de %{organization_name}. Pode alterar as suas configurações na sua <a href="%{link}">página de notificações</a>.
|
984
|
-
see_on_website: Não consegue ver este e-mail corretamente? Visualize-o no <a href="%{link}" target="_blank">website</a>.
|
985
984
|
unsubscribe: Para optar por não receber este tipo de e-mail, <a href="%{link}" target="_blank" class="unsubscribe">Cancele a subscrição</a>.
|
986
985
|
newsletter_templates:
|
987
986
|
basic_only_text:
|
@@ -1289,9 +1288,6 @@ pt:
|
|
1289
1288
|
help_text: "<strong>Aviso:</strong> O conteúdo pode ser traduzido automaticamente e não ser 100% fidedigno."
|
1290
1289
|
show_original: Mostrar texto original
|
1291
1290
|
show_translated: Mostrar texto traduzido automaticamente
|
1292
|
-
user_activity:
|
1293
|
-
index:
|
1294
|
-
no_activities_warning: Este participante ainda não possui nenhuma atividade.
|
1295
1291
|
user_contact_disabled: Este participante não aceita mensagens diretas.
|
1296
1292
|
user_conversations:
|
1297
1293
|
create:
|
data/config/locales/ro-RO.yml
CHANGED
@@ -40,6 +40,9 @@ ro:
|
|
40
40
|
decidim/promote_to_admin: Promovat ca administrator
|
41
41
|
decidim/removed_from_group: Eliminat din grup
|
42
42
|
decidim/resource_endorsed_event: Resursă susținută
|
43
|
+
decidim/resource_hidden_event: Resursă ascunsă
|
44
|
+
decidim/user_group_created_event: Grup de utilizatori creat
|
45
|
+
decidim/welcome_notification_event: Mesaj de întâmpinare
|
43
46
|
activerecord:
|
44
47
|
attributes:
|
45
48
|
decidim/user:
|
@@ -877,7 +880,7 @@ ro:
|
|
877
880
|
body_1: Ești pe cale de a vizita un link extern și am dori să fii precaut în ceea ce privește conținutul de pe site-ul extern.
|
878
881
|
body_2: Te rugăm să verifici link-ul pe care urmează să îl vizitezi și să te asiguri că îl este un site sigur înainte de a continua.
|
879
882
|
cancel: Anulare
|
880
|
-
close_modal:
|
883
|
+
close_modal: Închide fereastra
|
881
884
|
proceed: Continuă
|
882
885
|
title: Deschide link-ul extern
|
883
886
|
log:
|
@@ -1009,7 +1012,6 @@ ro:
|
|
1009
1012
|
newsletter_mailer:
|
1010
1013
|
newsletter:
|
1011
1014
|
note: Ați primit acest e-mail deoarece sunteți abonat la buletinele informative de pe %{organization_name}. Puteți modifica setările de pe pagina <a href="%{link}">de notificări</a>.
|
1012
|
-
see_on_website: Nu se poate vedea corect acest e-mail? Vizualizați-l pe <a href="%{link}" target="_blank">site-ul</a>.
|
1013
1015
|
unsubscribe: Pentru a renunța la primirea acestui tip de e-mail, <a href="%{link}" target="_blank" class="unsubscribe">Dezabonați-vă</a>.
|
1014
1016
|
newsletter_templates:
|
1015
1017
|
basic_only_text:
|
@@ -1326,7 +1328,7 @@ ro:
|
|
1326
1328
|
show_translated: Arată textul tradus automat
|
1327
1329
|
user_activity:
|
1328
1330
|
index:
|
1329
|
-
no_activities_warning: Acest participant nu
|
1331
|
+
no_activities_warning: Acest participant nu are nicio activitate încă.
|
1330
1332
|
user_contact_disabled: Acest participant nu acceptă mesaje directe.
|
1331
1333
|
user_conversations:
|
1332
1334
|
create:
|
data/config/locales/ru.yml
CHANGED
@@ -227,6 +227,8 @@ ru:
|
|
227
227
|
title: Не подтвердили свою личность
|
228
228
|
unconfirmed:
|
229
229
|
title: Подтвердите вашу электронную почту
|
230
|
+
show:
|
231
|
+
close_modal: Закрыть окошко
|
230
232
|
collapsible_list:
|
231
233
|
hidden_elements_count:
|
232
234
|
one: и еще %{count}
|
@@ -466,6 +468,9 @@ ru:
|
|
466
468
|
all: Все виды активности
|
467
469
|
index:
|
468
470
|
last_activity: Последняя активность
|
471
|
+
links:
|
472
|
+
warning:
|
473
|
+
close_modal: Закрыть окошко
|
469
474
|
log:
|
470
475
|
base_presenter:
|
471
476
|
create: "%{user_name} добавил %{resource_name}"
|
@@ -515,7 +520,6 @@ ru:
|
|
515
520
|
newsletter_mailer:
|
516
521
|
newsletter:
|
517
522
|
note: Вы получили это электронное письмо, потому что подписались на новостные рассылки %{organization_name}. Вы можете изменить свои настройки на своей <a href="%{link}">странице уведомлений</a>.
|
518
|
-
see_on_website: Не удается толком прочитать это письмо? Прочитайте его на <a href="%{link}" target="_blank">сайте</a>.
|
519
523
|
unsubscribe: Чтобы отказаться от получения таких сообщений, кликните <a href="%{link}" target="_blank" class="unsubscribe">Отменить подписку</a>.
|
520
524
|
newsletters:
|
521
525
|
unsubscribe:
|
data/config/locales/sk.yml
CHANGED
@@ -312,6 +312,8 @@ sk:
|
|
312
312
|
explanation_html: Aby ste mohli vykonať túto akciu, musíte byť autorizovaní, pred tým musíte potvrdiť svoj email <strong>%{email} </strong>.
|
313
313
|
request_confirmation_instructions: Požiadajte o pokyny pre potvrdenie
|
314
314
|
title: Potvrdiť svoj email
|
315
|
+
show:
|
316
|
+
close_modal: Zatvoriť okno
|
315
317
|
collapsible_list:
|
316
318
|
hidden_elements_count:
|
317
319
|
one: a %{count} ďalších
|
@@ -755,6 +757,9 @@ sk:
|
|
755
757
|
index:
|
756
758
|
last_activity: Posledná aktivita
|
757
759
|
resource_type: Typ
|
760
|
+
links:
|
761
|
+
warning:
|
762
|
+
close_modal: Zatvoriť okno
|
758
763
|
log:
|
759
764
|
base_presenter:
|
760
765
|
create: "%{user_name} vytvořeno %{resource_name}"
|
@@ -831,7 +836,6 @@ sk:
|
|
831
836
|
newsletter_mailer:
|
832
837
|
newsletter:
|
833
838
|
note: Tento e-mail jste obdrželi, protože jste odběrateli bulletinů na %{organization_name}. Můžete změnit nastavení na <a href="%{link}">oznámení straně</a>.
|
834
|
-
see_on_website: Nelze vidět tento e-mail správně? Zobrazte jej na webu <a href="%{link}" target="_blank"></a>.
|
835
839
|
unsubscribe: Chcete-li odhlásit přijímání tento typ e-mailů, <a href="%{link}" target="_blank" class="unsubscribe">Odhlásit</a>.
|
836
840
|
newsletter_templates:
|
837
841
|
basic_only_text:
|
@@ -1076,9 +1080,6 @@ sk:
|
|
1076
1080
|
share_link: Zdieľať odkaz
|
1077
1081
|
statistics:
|
1078
1082
|
comments_count: Komentáre
|
1079
|
-
user_activity:
|
1080
|
-
index:
|
1081
|
-
no_activities_warning: Tento účastník zatiaľ nemá žiadnu aktivitu.
|
1082
1083
|
user_contact_disabled: Tento účastník nepovoľuje posielanie priamych správ.
|
1083
1084
|
user_conversations:
|
1084
1085
|
update:
|
data/config/locales/sv.yml
CHANGED
@@ -41,6 +41,7 @@ sv:
|
|
41
41
|
decidim/promote_to_admin: Befordrad till gruppadministratör
|
42
42
|
decidim/removed_from_group: Borttagen från gruppen
|
43
43
|
decidim/resource_endorsed_event: Resurs instämd
|
44
|
+
decidim/user_group_created_event: Användargrupp skapad
|
44
45
|
decidim/welcome_notification_event: Välkomstmeddelande
|
45
46
|
activerecord:
|
46
47
|
attributes:
|
@@ -889,7 +890,7 @@ sv:
|
|
889
890
|
body_1: Du är på väg att besöka en extern länk och vi vill att du ska vara försiktig med innehållet på den externa webbplatsen.
|
890
891
|
body_2: Kontrollera länken du är på väg att besöka och se till att den är säker innan du fortsätter.
|
891
892
|
cancel: Avbryt
|
892
|
-
close_modal: Stäng
|
893
|
+
close_modal: Stäng modal
|
893
894
|
proceed: Fortsätt
|
894
895
|
title: Öppna extern länk
|
895
896
|
log:
|
@@ -1021,7 +1022,6 @@ sv:
|
|
1021
1022
|
newsletter_mailer:
|
1022
1023
|
newsletter:
|
1023
1024
|
note: Du har fått det här e-brevet eftersom du prenumererar på nyhetsbrev från %{organization_name}. Du kan ändra dina inställningar på <a href="%{link}">meddelandesidan</a>.
|
1024
|
-
see_on_website: Visa inte e-brevet som det ska? Läs det på <a href="%{link}" target="_blank">webbplatsen</a>.
|
1025
1025
|
unsubscribe: Välj att <a href="%{link}" target="_blank" class="unsubscribe">Avprenumerera</a> om du inte vill få denna typ av brev.
|
1026
1026
|
newsletter_templates:
|
1027
1027
|
basic_only_text:
|
@@ -1335,9 +1335,6 @@ sv:
|
|
1335
1335
|
help_text: "<strong>OBS:</strong> Innehåll översattes kanske automatiskt och inte är 100% korrekt."
|
1336
1336
|
show_original: Visa originaltexten
|
1337
1337
|
show_translated: Visa maskinöversatt texten
|
1338
|
-
user_activity:
|
1339
|
-
index:
|
1340
|
-
no_activities_warning: Den här användaren har inte haft någon aktivitet än.
|
1341
1338
|
user_contact_disabled: Deltagaren tar inte emot inte direktmeddelanden.
|
1342
1339
|
user_conversations:
|
1343
1340
|
create:
|
data/config/locales/tr-TR.yml
CHANGED
@@ -322,7 +322,7 @@ tr:
|
|
322
322
|
request_confirmation_instructions: Onaylama talimatlarını tekrar gönder
|
323
323
|
title: E-posta adresinizi doğrulayın
|
324
324
|
show:
|
325
|
-
close_modal:
|
325
|
+
close_modal: Yakın kalıcı
|
326
326
|
block_user_mailer:
|
327
327
|
notify:
|
328
328
|
body_1: Hesabınız kilitlendi.
|
@@ -830,6 +830,9 @@ tr:
|
|
830
830
|
index:
|
831
831
|
last_activity: Son Aktivite
|
832
832
|
resource_type: Türü
|
833
|
+
links:
|
834
|
+
warning:
|
835
|
+
close_modal: Yakın kalıcı
|
833
836
|
log:
|
834
837
|
base_presenter:
|
835
838
|
create: "%{user_name}, %{resource_name} oluşturdu"
|
@@ -956,7 +959,6 @@ tr:
|
|
956
959
|
newsletter_mailer:
|
957
960
|
newsletter:
|
958
961
|
note: Bu e-postayı, %{organization_name} bültenlere abone olduğunuz için aldınız. Eğer ayarlarınızı değiştirebilirsiniz <a href="%{link}">bildirimleri sayfa</a>.
|
959
|
-
see_on_website: Bu e-postayı doğru göremiyor musunuz? Onu <a href="%{link}" target="_blank">web sitesinde görüntüle</a>.
|
960
962
|
unsubscribe: Bu tür bir e-posta almayı iptal etmek için, <a href="%{link}" target="_blank" class="unsubscribe">Abonelikten Ayrıl</a>.
|
961
963
|
newsletter_templates:
|
962
964
|
basic_only_text:
|
@@ -1247,9 +1249,6 @@ tr:
|
|
1247
1249
|
help_text: "<strong> Uyarı: </strong> İçerik otomatik olarak çevrilebilir ve %100 doğru olmayabilir."
|
1248
1250
|
show_original: Orijinal metni göster
|
1249
1251
|
show_translated: Otomatik olarak çevrilmiş metni göster
|
1250
|
-
user_activity:
|
1251
|
-
index:
|
1252
|
-
no_activities_warning: Bu kullanıcının henüz herhangi bir etkinliği olmadı.
|
1253
1252
|
user_contact_disabled: Bu katılımcı doğrudan mesajları kabul etmiyor.
|
1254
1253
|
user_conversations:
|
1255
1254
|
create:
|
data/config/locales/uk.yml
CHANGED
@@ -173,6 +173,8 @@ uk:
|
|
173
173
|
invalid_field: "Для поля %{field} значення %{value} неприпустиме."
|
174
174
|
ok: Гаразд
|
175
175
|
title: Недостатньо прав через відсутність підтвердження особи
|
176
|
+
show:
|
177
|
+
close_modal: Закрити віконце
|
176
178
|
collapsible_list:
|
177
179
|
see_less: "(читати менше)"
|
178
180
|
see_more: "(читати далі)"
|
@@ -343,6 +345,9 @@ uk:
|
|
343
345
|
errors:
|
344
346
|
error: У цьому полі є помилка.
|
345
347
|
remove_this_file: Видалити цей файл
|
348
|
+
links:
|
349
|
+
warning:
|
350
|
+
close_modal: Закрити віконце
|
346
351
|
log:
|
347
352
|
base_presenter:
|
348
353
|
create: "%{user_name} створив %{resource_name}"
|
@@ -391,7 +396,6 @@ uk:
|
|
391
396
|
newsletter_mailer:
|
392
397
|
newsletter:
|
393
398
|
note: Ви отримали цього електронного листа, оскільки ви підписалися на новини щодо %{organization_name}. Ви можете змінити свої налаштування на <a href="%{link}">сторінці сповіщень</a>.
|
394
|
-
see_on_website: Не вдається до пуття переглянути це повідомлення? Перегляньте його на сайті <a href="%{link}" target="_blank"></a>.
|
395
399
|
unsubscribe: Щоб відмовитися від отримання таких повідомлень, клацніть на <a href="%{link}" target="_blank" class="unsubscribe">Відмовитися</a>.
|
396
400
|
newsletters:
|
397
401
|
unsubscribe:
|
data/config/locales/zh-CN.yml
CHANGED
@@ -757,6 +757,9 @@ zh-CN:
|
|
757
757
|
index:
|
758
758
|
last_activity: 上次活动
|
759
759
|
resource_type: 类型
|
760
|
+
links:
|
761
|
+
warning:
|
762
|
+
close_modal: 关闭模式
|
760
763
|
log:
|
761
764
|
base_presenter:
|
762
765
|
create: "%{user_name} 创建了 %{resource_name}"
|
@@ -881,7 +884,6 @@ zh-CN:
|
|
881
884
|
newsletter_mailer:
|
882
885
|
newsletter:
|
883
886
|
note: 您收到这封邮件是因为您订阅了 %{organization_name}的新闻通讯。您可以在您的 <a href="%{link}">通知页面</a> 更改您的设置。
|
884
|
-
see_on_website: 找不到正确的电子邮件?在 <a href="%{link}" target="_blank">网站</a> 上查看。
|
885
887
|
unsubscribe: 选择不接收这种类型的电子邮件, <a href="%{link}" target="_blank" class="unsubscribe">取消订阅</a>。
|
886
888
|
newsletter_templates:
|
887
889
|
basic_only_text:
|
@@ -1158,9 +1160,6 @@ zh-CN:
|
|
1158
1160
|
help_text: "<strong>警告:</strong> 内容可能会被自动翻译而不是100%的准确性。"
|
1159
1161
|
show_original: 显示原始文本
|
1160
1162
|
show_translated: 显示自动翻译的文本
|
1161
|
-
user_activity:
|
1162
|
-
index:
|
1163
|
-
no_activities_warning: 此参与者尚未有任何活动。
|
1164
1163
|
user_contact_disabled: 此参与者不接受私信。
|
1165
1164
|
user_conversations:
|
1166
1165
|
create:
|
@@ -8,6 +8,15 @@ module Decidim
|
|
8
8
|
|
9
9
|
field :locale, GraphQL::Types::String, "The standard locale of this translation.", null: false
|
10
10
|
field :text, GraphQL::Types::String, "The content of this translation.", null: true
|
11
|
+
field :machine_translated, GraphQL::Types::Boolean, "Whether this string is machine translated or not.", null: false
|
12
|
+
|
13
|
+
def machine_translated
|
14
|
+
if object.respond_to?(:machine_translated)
|
15
|
+
object.machine_translated.present?
|
16
|
+
else
|
17
|
+
false
|
18
|
+
end
|
19
|
+
end
|
11
20
|
end
|
12
21
|
end
|
13
22
|
end
|
@@ -17,19 +17,34 @@ module Decidim
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def locales
|
20
|
-
|
20
|
+
(defined_translations.keys + machine_translations.keys).uniq
|
21
21
|
end
|
22
22
|
|
23
23
|
def translation(locale: "")
|
24
|
-
|
25
|
-
translations[locale]
|
24
|
+
display_translations[locale]
|
26
25
|
end
|
27
26
|
|
28
27
|
def translations(locales: [])
|
29
|
-
translations =
|
28
|
+
translations = display_translations
|
30
29
|
translations = translations.slice(*locales) unless locales.empty?
|
31
30
|
|
32
|
-
translations.map { |locale, text| OpenStruct.new(locale: locale, text: text) }
|
31
|
+
translations.map { |locale, text| OpenStruct.new(locale: locale, text: text, machine_translated: defined_translations[locale].blank?) }
|
32
|
+
end
|
33
|
+
|
34
|
+
private
|
35
|
+
|
36
|
+
def display_translations
|
37
|
+
@display_translations ||= locales.index_with do |locale|
|
38
|
+
defined_translations[locale].presence || machine_translations[locale]
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
def defined_translations
|
43
|
+
object.stringify_keys.except("machine_translations")
|
44
|
+
end
|
45
|
+
|
46
|
+
def machine_translations
|
47
|
+
object.stringify_keys["machine_translations"]&.stringify_keys || {}
|
33
48
|
end
|
34
49
|
end
|
35
50
|
end
|
@@ -226,13 +226,20 @@ FactoryBot.define do
|
|
226
226
|
confirmed_at { Time.current }
|
227
227
|
end
|
228
228
|
|
229
|
+
trait :blocked do
|
230
|
+
blocked { true }
|
231
|
+
blocked_at { Time.current }
|
232
|
+
extended_data { { user_name: generate(:name) } }
|
233
|
+
name { "Blocked user group" }
|
234
|
+
end
|
235
|
+
|
229
236
|
after(:build) do |user_group, evaluator|
|
230
|
-
user_group.extended_data = {
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
237
|
+
user_group.extended_data = user_group.extended_data.merge({
|
238
|
+
document_number: evaluator.document_number,
|
239
|
+
phone: evaluator.phone,
|
240
|
+
rejected_at: evaluator.rejected_at,
|
241
|
+
verified_at: evaluator.verified_at
|
242
|
+
})
|
236
243
|
end
|
237
244
|
|
238
245
|
after(:create) do |user_group, evaluator|
|
data/lib/decidim/core/version.rb
CHANGED
data/lib/decidim/form_builder.rb
CHANGED
@@ -47,7 +47,7 @@ module Decidim
|
|
47
47
|
# rubocop:enable Metrics/ParameterLists
|
48
48
|
|
49
49
|
def create_language_selector(locales, tabs_id, name)
|
50
|
-
if
|
50
|
+
if locales.count > 4
|
51
51
|
language_selector_select(locales, tabs_id, name)
|
52
52
|
else
|
53
53
|
language_tabs(locales, tabs_id, name)
|
@@ -47,7 +47,13 @@ module Decidim
|
|
47
47
|
.joins(:participatory_space_resource_links_to)
|
48
48
|
.where(decidim_participatory_space_links: { name: link_name, from_id: id, from_type: self.class.name })
|
49
49
|
|
50
|
-
klass.where(id: from).or(klass.where(id: to))
|
50
|
+
query = klass.where(id: from).or(klass.where(id: to)).published
|
51
|
+
|
52
|
+
if klass.column_names.include?("weight")
|
53
|
+
query.order(:weight)
|
54
|
+
else
|
55
|
+
query.order(created_at: :desc)
|
56
|
+
end
|
51
57
|
end
|
52
58
|
|
53
59
|
def participatory_space_sibling_scope(participatory_space_name)
|
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.26.
|
4
|
+
version: 0.26.5
|
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:
|
13
|
+
date: 2023-02-13 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: active_link_to
|
@@ -754,28 +754,28 @@ dependencies:
|
|
754
754
|
requirements:
|
755
755
|
- - '='
|
756
756
|
- !ruby/object:Gem::Version
|
757
|
-
version: 0.26.
|
757
|
+
version: 0.26.5
|
758
758
|
type: :runtime
|
759
759
|
prerelease: false
|
760
760
|
version_requirements: !ruby/object:Gem::Requirement
|
761
761
|
requirements:
|
762
762
|
- - '='
|
763
763
|
- !ruby/object:Gem::Version
|
764
|
-
version: 0.26.
|
764
|
+
version: 0.26.5
|
765
765
|
- !ruby/object:Gem::Dependency
|
766
766
|
name: decidim-dev
|
767
767
|
requirement: !ruby/object:Gem::Requirement
|
768
768
|
requirements:
|
769
769
|
- - '='
|
770
770
|
- !ruby/object:Gem::Version
|
771
|
-
version: 0.26.
|
771
|
+
version: 0.26.5
|
772
772
|
type: :development
|
773
773
|
prerelease: false
|
774
774
|
version_requirements: !ruby/object:Gem::Requirement
|
775
775
|
requirements:
|
776
776
|
- - '='
|
777
777
|
- !ruby/object:Gem::Version
|
778
|
-
version: 0.26.
|
778
|
+
version: 0.26.5
|
779
779
|
description: Adds core features so other engines can hook into the framework.
|
780
780
|
email:
|
781
781
|
- josepjaume@gmail.com
|
@@ -1984,6 +1984,7 @@ files:
|
|
1984
1984
|
- config/locales/is.yml
|
1985
1985
|
- config/locales/it.yml
|
1986
1986
|
- config/locales/ja.yml
|
1987
|
+
- config/locales/ka-GE.yml
|
1987
1988
|
- config/locales/ko-KR.yml
|
1988
1989
|
- config/locales/ko.yml
|
1989
1990
|
- config/locales/lb-LU.yml
|