decidim-core 0.30.1 → 0.30.2
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/activity/show.erb +6 -6
- data/app/cells/decidim/content_blocks/participatory_space_main_data/title.erb +11 -2
- data/app/cells/decidim/footer_topics/show.erb +2 -2
- data/app/cells/decidim/group_admins/show.erb +3 -1
- data/app/cells/decidim/group_members/show.erb +6 -2
- data/app/cells/decidim/images_panel/show.erb +5 -2
- data/app/cells/decidim/report_button/flag_modal.erb +11 -9
- data/app/cells/decidim/report_user_button/flag_modal.erb +11 -10
- data/app/cells/decidim/upload_modal/files.erb +4 -4
- data/app/cells/decidim/upload_modal_cell.rb +5 -3
- data/app/commands/decidim/amendable/accept.rb +2 -1
- data/app/commands/decidim/create_omniauth_registration.rb +1 -1
- data/app/controllers/decidim/amendments_controller.rb +3 -3
- data/app/helpers/decidim/amendments_helper.rb +2 -1
- data/app/helpers/decidim/filters_helper.rb +25 -0
- data/app/helpers/decidim/layout_helper.rb +6 -0
- data/app/packs/images/decidim/default-avatar.svg +1 -1
- data/app/packs/src/decidim/callout.js +13 -8
- data/app/packs/src/decidim/confirm.js +15 -3
- data/app/packs/src/decidim/datepicker/generate_datepicker.js +2 -0
- data/app/packs/src/decidim/datepicker/generate_timepicker.js +2 -0
- data/app/packs/src/decidim/direct_uploads/upload_field.js +3 -4
- data/app/packs/src/decidim/direct_uploads/upload_modal.js +8 -9
- data/app/packs/src/decidim/dropdown_menu.js +18 -0
- data/app/packs/src/decidim/editor/common/suggestion.js +11 -1
- data/app/packs/src/decidim/index.js +1 -0
- data/app/packs/stylesheets/decidim/_activity.scss +4 -4
- data/app/packs/stylesheets/decidim/_cards.scss +5 -1
- data/app/packs/stylesheets/decidim/_filters.scss +1 -1
- data/app/packs/stylesheets/decidim/_header.scss +11 -3
- data/app/packs/stylesheets/decidim/_layout.scss +2 -2
- data/app/packs/stylesheets/decidim/_modal.scss +1 -5
- data/app/packs/stylesheets/decidim/_modal_update.scss +5 -1
- data/app/permissions/decidim/permissions.rb +13 -1
- data/app/validators/translated_etiquette_validator.rb +2 -0
- data/app/views/decidim/errors/internal_server_error.html.erb +1 -1
- data/app/views/decidim/errors/not_found.html.erb +1 -1
- data/app/views/decidim/newsletters/unsubscribe.html.erb +16 -4
- data/app/views/decidim/searches/_filters.html.erb +48 -13
- data/app/views/decidim/shared/_component_announcement.html.erb +1 -1
- data/app/views/decidim/shared/_confirm_modal.html.erb +3 -5
- data/app/views/decidim/shared/_filters.html.erb +6 -4
- data/app/views/layouts/decidim/footer/_main.html.erb +1 -1
- data/app/views/layouts/decidim/footer/_main_intro.html.erb +1 -1
- data/app/views/layouts/decidim/footer/_mini.html.erb +2 -2
- data/app/views/layouts/decidim/header/_main.html.erb +2 -2
- data/app/views/layouts/decidim/header/_main_links_desktop.html.erb +6 -0
- data/app/views/layouts/decidim/header/_main_links_dropdown.html.erb +2 -0
- data/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb +1 -1
- data/app/views/layouts/decidim/header/_mobile_language_choose.html.erb +1 -1
- data/config/locales/ar.yml +0 -3
- data/config/locales/bg-BG.yml +2 -2
- data/config/locales/bg.yml +0 -5
- data/config/locales/ca-IT.yml +28 -5
- data/config/locales/ca.yml +28 -5
- data/config/locales/cs.yml +15 -6
- data/config/locales/de.yml +53 -21
- data/config/locales/el.yml +0 -4
- data/config/locales/en.yml +28 -5
- data/config/locales/es-MX.yml +28 -5
- data/config/locales/es-PY.yml +28 -5
- data/config/locales/es.yml +28 -5
- data/config/locales/eu.yml +66 -43
- data/config/locales/fi-plain.yml +76 -5
- data/config/locales/fi.yml +77 -6
- data/config/locales/fr-CA.yml +28 -5
- data/config/locales/fr-LU.yml +3 -3
- data/config/locales/fr.yml +28 -5
- data/config/locales/gl.yml +0 -3
- data/config/locales/hu.yml +0 -5
- data/config/locales/id-ID.yml +0 -3
- data/config/locales/is-IS.yml +0 -1
- data/config/locales/it.yml +165 -3
- data/config/locales/ja.yml +36 -5
- data/config/locales/lb-LU.yml +2 -2
- data/config/locales/lb.yml +0 -3
- data/config/locales/lt.yml +0 -5
- data/config/locales/lv.yml +0 -3
- data/config/locales/nl.yml +0 -3
- data/config/locales/no.yml +0 -3
- data/config/locales/pl.yml +0 -5
- data/config/locales/pt-BR.yml +0 -4
- data/config/locales/pt.yml +0 -3
- data/config/locales/ro-RO.yml +0 -4
- data/config/locales/ru.yml +0 -3
- data/config/locales/sk-SK.yml +3 -3
- data/config/locales/sk.yml +2 -3
- data/config/locales/sv.yml +27 -4
- data/config/locales/tr-TR.yml +0 -3
- data/config/locales/uk.yml +0 -2
- data/config/locales/zh-CN.yml +0 -3
- data/config/locales/zh-TW.yml +0 -5
- data/lib/decidim/assets/tailwind/tailwind.config.js.erb +2 -1
- data/lib/decidim/core/test/factories.rb +2 -2
- data/lib/decidim/core/test/shared_examples/announcements_examples.rb +4 -0
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +7 -5
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/form_builder.rb +14 -0
- metadata +7 -6
data/config/locales/pt-BR.yml
CHANGED
@@ -911,7 +911,6 @@ pt-BR:
|
|
911
911
|
title: O que são as medalhas?
|
912
912
|
group_admins:
|
913
913
|
actions:
|
914
|
-
are_you_sure: Você tem certeza? Isso não removerá o usuário do grupo.
|
915
914
|
demote_admin: Remover Administrador
|
916
915
|
demote:
|
917
916
|
error: Ocorreu um erro ao remover este usuário da lista de administradores.
|
@@ -938,7 +937,6 @@ pt-BR:
|
|
938
937
|
reject_invitation: Rejeitar
|
939
938
|
group_members:
|
940
939
|
actions:
|
941
|
-
are_you_sure: Você tem certeza?
|
942
940
|
promote_to_admin: Tornar administrador
|
943
941
|
remove_from_group: Remover usuário
|
944
942
|
index:
|
@@ -1141,7 +1139,6 @@ pt-BR:
|
|
1141
1139
|
error: Ocorreu um erro ao se desinscrever.
|
1142
1140
|
success: Você está inscrito com sucesso.
|
1143
1141
|
token_error: O link expirou.
|
1144
|
-
unsubscribe: Cancelar subscrição
|
1145
1142
|
newsletters_opt_in:
|
1146
1143
|
unauthorized: Desculpe, este link não está mais disponível.
|
1147
1144
|
update:
|
@@ -1149,7 +1146,6 @@ pt-BR:
|
|
1149
1146
|
success: Configurações de boletim informativo atualizadas com sucesso.
|
1150
1147
|
newsletters_opt_in_mailer:
|
1151
1148
|
notify:
|
1152
|
-
body_1: O processamento de dados pessoais e sua proteção estão se tornando cada vez mais importantes para todos nós. Com o novo Regulamento Geral de Proteção de Dados (GDPR) de 25 de maio de 2018, os indivíduos têm melhor controle sobre seus dados pessoais. Por esse motivo, precisamos que seu "OK" continue enviando informações relevantes sobre as atividades do %{organization_name}.
|
1153
1149
|
body_2: 'Como você pode nos dar seu consentimento? Basta clicar no seguinte botão:'
|
1154
1150
|
body_3: Com esse consentimento, você poderá continuar recebendo informações sobre os serviços da plataforma. Se, pelo contrário, não recebermos uma confirmação positiva da sua parte, deixaremos de lhe enviar as nossas mensagens. Se você confirmar que deseja continuar sendo informado, sempre terá a opção de cancelar a qualquer momento.
|
1155
1151
|
button: Sim, quero continuar recebendo informações relevantes
|
data/config/locales/pt.yml
CHANGED
@@ -635,7 +635,6 @@ pt:
|
|
635
635
|
reject_invitation: Rejeitar
|
636
636
|
group_members:
|
637
637
|
actions:
|
638
|
-
are_you_sure: Tem a certeza?
|
639
638
|
promote_to_admin: Tornar administrador
|
640
639
|
remove_from_group: Remover participante
|
641
640
|
index:
|
@@ -810,10 +809,8 @@ pt:
|
|
810
809
|
unsubscribe:
|
811
810
|
success: Subscrição cancelada corretamente.
|
812
811
|
token_error: A hiperligação expirou.
|
813
|
-
unsubscribe: Cancelar subscrição
|
814
812
|
newsletters_opt_in_mailer:
|
815
813
|
notify:
|
816
|
-
body_1: O processamento de dados pessoais e a sua proteção estão a tornar-se cada vez mais importantes para todos nós. Com o novo Regulamento Geral de Proteção de Dados (GDPR) de 25 de maio de 2018, os indivíduos têm melhor controlo sobre os seus dados pessoais. Por este motivo, precisamos do seu "OK" para continuar a enviar informações relevantes sobre as atividades de %{organization_name}.
|
817
814
|
body_2: 'Como pode dar-nos o seu consentimento? Basta clicar no seguinte botão:'
|
818
815
|
body_3: Com este consentimento, poderá continuar a receber informações sobre os serviços da plataforma. Se, pelo contrário, não recebermos uma confirmação positiva da sua parte, deixaremos de lhe enviar as nossas mensagens. Se confirmar que deseja continuar a ser informado, terá sempre a opção de cancelar a qualquer momento.
|
819
816
|
button: Sim, quero continuar a receber informações relevantes
|
data/config/locales/ro-RO.yml
CHANGED
@@ -1095,7 +1095,6 @@ ro:
|
|
1095
1095
|
reject_invitation: Respingeți
|
1096
1096
|
group_members:
|
1097
1097
|
actions:
|
1098
|
-
are_you_sure: Sunteți sigur?
|
1099
1098
|
promote_to_admin: Setare ca administrator
|
1100
1099
|
remove_from_group: Eliminați participantul
|
1101
1100
|
index:
|
@@ -1283,17 +1282,14 @@ ro:
|
|
1283
1282
|
main_image: Imaginea principală
|
1284
1283
|
newsletters:
|
1285
1284
|
unsubscribe:
|
1286
|
-
check_subscription: Dacă doriți să vă schimbați preferințele, puteți face acest lucru în <a href="%{link}" target="_blank">pagina de configurare</a>.
|
1287
1285
|
error: A apărut o eroare la dezabonare.
|
1288
1286
|
success: Sunteți dezabonat cu succes.
|
1289
1287
|
token_error: Link-ul a expirat.
|
1290
|
-
unsubscribe: Dezabonare
|
1291
1288
|
newsletters_opt_in:
|
1292
1289
|
update:
|
1293
1290
|
error: A apărut o eroare la actualizarea acestui buletin informativ.
|
1294
1291
|
newsletters_opt_in_mailer:
|
1295
1292
|
notify:
|
1296
|
-
body_1: Prelucrarea datelor cu caracter personal şi protecţia acesteia devin din ce în ce mai importante pentru noi toţi. Prin noul Regulament general privind protecția datelor (RGDP) din 25 mai 2018, persoanele fizice dețin un control mai bun asupra datelor lor cu caracter personal. Din acest motiv avem nevoie de "OK-ul tău" pentru a continua să trimiți informații relevante despre activitățile %{organization_name}.
|
1297
1293
|
body_2: 'Cum ne puteți da acordul? Doar faceți clic pe următorul buton:'
|
1298
1294
|
body_3: Cu acest consimțământ veți putea primi în continuare informații despre serviciile platformei. Dacă, dimpotrivă, nu primim o confirmare pozitivă din partea dumneavoastră, vom înceta să vă trimitem mesajele. Dacă confirmați că doriți să fiți informat în continuare, veți avea întotdeauna opțiunea de a anula oricând.
|
1299
1295
|
button: Da, doresc să continui să primesc informații relevante
|
data/config/locales/ru.yml
CHANGED
@@ -375,7 +375,6 @@ ru:
|
|
375
375
|
reject_invitation: Отклонить
|
376
376
|
group_members:
|
377
377
|
actions:
|
378
|
-
are_you_sure: Вы уверены?
|
379
378
|
remove_from_group: Удалить участника
|
380
379
|
index:
|
381
380
|
manage_members: Управление участниками
|
@@ -452,10 +451,8 @@ ru:
|
|
452
451
|
unsubscribe:
|
453
452
|
success: Вы успешно отменили подписку.
|
454
453
|
token_error: Срок действия ссылки истек.
|
455
|
-
unsubscribe: Отписаться
|
456
454
|
newsletters_opt_in_mailer:
|
457
455
|
notify:
|
458
|
-
body_1: Обработка персональных данных и их защита становятся все более важными для всех нас. По новому "Общему положению о защите данных" от 25 мая 2018 года люди получают возможность управлять своими личными данными. Поэтому нам нужно ваше согласие, чтобы продолжить отправлять вам свежие новости о деятельности %{organization_name}.
|
459
456
|
body_2: 'Как вы можете дать нам свое согласие? Просто нажмите следующую кнопку:'
|
460
457
|
body_3: Согласившись, вы сможете продолжить получать сведения об услугах площадки. Если же мы не получим вашего согласия, то мы прекратим отправку наших сообщений. Если вы подтвердите, что хотите получать новости, вы в любой момент потом сможете отказаться от их получения.
|
461
458
|
button: Да, я хочу продолжать получать свежие новости
|
data/config/locales/sk-SK.yml
CHANGED
@@ -409,7 +409,7 @@ sk:
|
|
409
409
|
newsletter: Dostávajte príležitostný spravodajca s relevantnými informáciami
|
410
410
|
newsletter_title: Povolenie kontaktu
|
411
411
|
nickname_help: Vaša prezývka v %{organization}
|
412
|
-
password_help: "%{
|
412
|
+
password_help: "%{minimum_characters} minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
|
413
413
|
sign_in: Prihlásiť sa
|
414
414
|
sign_up: Zaregistrovať sa
|
415
415
|
sign_up_as:
|
@@ -1225,7 +1225,7 @@ sk:
|
|
1225
1225
|
change_your_password: Zmeňte si svoje heslo
|
1226
1226
|
confirm_new_password: Potvrďte nové heslo
|
1227
1227
|
new_password: Nové heslo
|
1228
|
-
password_help: "%{
|
1228
|
+
password_help: "%{minimum_characters} je minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
|
1229
1229
|
new:
|
1230
1230
|
forgot_your_password: Zabudli ste heslo?
|
1231
1231
|
send_me_reset_password_instructions: Pošlite mi pokyny na resetovanie hesla
|
@@ -1408,7 +1408,7 @@ sk:
|
|
1408
1408
|
dropdown:
|
1409
1409
|
choose_diff_view_html: 'Mód zobrazenia HTML:'
|
1410
1410
|
choose_diff_view_mode: 'Mód srovnávacího zobrazení:'
|
1411
|
-
option_escaped: Nepoužívané
|
1411
|
+
option_escaped: Nepoužívané
|
1412
1412
|
option_split: Vedle sebe (Sbs)
|
1413
1413
|
option_unescaped: Používané
|
1414
1414
|
option_unified: Sjednocené
|
data/config/locales/sk.yml
CHANGED
@@ -572,7 +572,6 @@ sk:
|
|
572
572
|
reject_invitation: Odmietnuť
|
573
573
|
group_members:
|
574
574
|
actions:
|
575
|
-
are_you_sure: Ste si istí?
|
576
575
|
promote_to_admin: Urobiť adminom
|
577
576
|
remove_from_group: Odstrániť užívateľa
|
578
577
|
index:
|
@@ -707,10 +706,8 @@ sk:
|
|
707
706
|
unsubscribe:
|
708
707
|
success: Úspešne ste odhlásení.
|
709
708
|
token_error: Platnosť odkazu vypršala.
|
710
|
-
unsubscribe: Odhlásiť odber
|
711
709
|
newsletters_opt_in_mailer:
|
712
710
|
notify:
|
713
|
-
body_1: Spracovanie osobných údajov a ich ochrana sú pre nás všetkých stále dôležitejšie. S novým všeobecným nariadením o ochrane osobných údajov (GDPR) z 25. mája 2018 majú jednotlivci lepšiu kontrolu nad svojimi osobnými údajmi. Z tohto dôvodu potrebujeme vaše "OK" pre pokračovanie v zasielanie relevantných informácií o aktivitách%{organization_name}.
|
714
711
|
body_2: 'Ako nám môžete dať svoj súhlas? Stačí kliknúť na nasledujúce tlačidlo: '
|
715
712
|
body_3: S týmto súhlasom budete môcť pokračovať v prijímaní informácií o službách platformy. Pokiaľ naopak nedostaneme pozitívne potvrdenie z vášho hľadiska, prestaneme vám posielať naše správy. Ak potvrdíte, že chcete byť stále informovaný, máte vždy možnosť kedykoľvek zrušiť.
|
716
713
|
button: Áno, chcem aj naďalej prijímať relevantné informácie
|
@@ -930,6 +927,8 @@ sk:
|
|
930
927
|
change_my_password: Zmeňte heslo
|
931
928
|
confirm_new_password: Potvrďte nové heslo
|
932
929
|
new_password: Nové heslo
|
930
|
+
password_help: "%{minimum_characters} je minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
|
931
|
+
password_help_admin: "%{minimum_characters} je minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
|
933
932
|
new:
|
934
933
|
forgot_your_password: Zabudli ste heslo?
|
935
934
|
send_me_reset_password_instructions: Pošlite mi pokyny na resetovanie hesla
|
data/config/locales/sv.yml
CHANGED
@@ -156,6 +156,13 @@ sv:
|
|
156
156
|
x_seconds:
|
157
157
|
one: 1 sekund
|
158
158
|
other: "%{count} sekunder"
|
159
|
+
widget:
|
160
|
+
label:
|
161
|
+
date: Välj datum för %{label}
|
162
|
+
time: Välj tidpunkt för %{label}
|
163
|
+
picker:
|
164
|
+
date_button: Öppna kalenderväljare för %{label}
|
165
|
+
time_button: Öppen tidsväljare för %{label}
|
159
166
|
decidim:
|
160
167
|
accessibility:
|
161
168
|
external_link: Extern länk
|
@@ -1086,7 +1093,12 @@ sv:
|
|
1086
1093
|
title: Vilka är märkena?
|
1087
1094
|
group_admins:
|
1088
1095
|
actions:
|
1089
|
-
|
1096
|
+
confirm_modal:
|
1097
|
+
ok_add: Lägg till en administratör
|
1098
|
+
ok_remove: Ta bort administratören
|
1099
|
+
title_add: Bekräfta den nya administratören
|
1100
|
+
title_remove: Ta bort administratören
|
1101
|
+
confirm_remove_from_admin: Är du säker på att du vill ta bort administratören från denna grupp?
|
1090
1102
|
demote_admin: Ta bort administratör
|
1091
1103
|
demote:
|
1092
1104
|
error: Det gick inte att ta bort den här deltagaren från administratörslistan.
|
@@ -1116,7 +1128,11 @@ sv:
|
|
1116
1128
|
error: Det gick inte att godkänna denna förfrågan att gå med.
|
1117
1129
|
success: Förfrågan att gå med har godkänts.
|
1118
1130
|
actions:
|
1119
|
-
|
1131
|
+
confirm_modal:
|
1132
|
+
ok_remove: Ta bort medlemmen
|
1133
|
+
title_remove: Ta bort medlemmen
|
1134
|
+
confirm_promote_to_admin: Är du säker på att du vill lägga till den här användaren som administratör?
|
1135
|
+
confirm_remove_from_group: Är du säker på att du vill ta bort den här användaren från gruppen?
|
1120
1136
|
promote_to_admin: Gör till administratör
|
1121
1137
|
remove_from_group: Ta bort deltagaren
|
1122
1138
|
index:
|
@@ -1348,11 +1364,12 @@ sv:
|
|
1348
1364
|
main_image: Huvudbild
|
1349
1365
|
newsletters:
|
1350
1366
|
unsubscribe:
|
1351
|
-
|
1367
|
+
check_subscription_html: Om du vill börja ta emot dem igen, kan du återaktivera din prenumeration när som helst från <a href="%{link}" target="_blank">inställningssidan</a>.
|
1352
1368
|
error: Det gick inte att avsluta prenumerationen.
|
1369
|
+
subscription_preferences: Vi har uppdaterat dina prenumerationsinställningar, och du får inte längre nyhetsbrev från %{organization_name}.
|
1353
1370
|
success: Prenumerationen har avslutats.
|
1354
1371
|
token_error: Länken är inte längre giltig.
|
1355
|
-
unsubscribe:
|
1372
|
+
unsubscribe: Avregistrera dig från nyhetsbrev
|
1356
1373
|
newsletters_opt_in:
|
1357
1374
|
unauthorized: Länken är tyvärr inte längre tillgänglig.
|
1358
1375
|
update:
|
@@ -1570,6 +1587,7 @@ sv:
|
|
1570
1587
|
searches:
|
1571
1588
|
filters:
|
1572
1589
|
jump_to: 'Gå till:'
|
1590
|
+
resource: "%{label} bland %{collection}"
|
1573
1591
|
search: Sök
|
1574
1592
|
state:
|
1575
1593
|
active: Pågående
|
@@ -2035,13 +2053,16 @@ sv:
|
|
2035
2053
|
edit: Redigera
|
2036
2054
|
footer:
|
2037
2055
|
cc_by_license: Creative Commons-licens
|
2056
|
+
current_organization_img: "%{organization} (hemma)"
|
2038
2057
|
data_consent_settings: Inställningar för cookies
|
2039
2058
|
decidim_logo: Decidims logotyp
|
2040
2059
|
decidim_title: Decidim
|
2060
|
+
help: Hjälp
|
2041
2061
|
log_in: Logga in
|
2042
2062
|
made_with_open_source: Webbplats skapad med <a target="_blank" href="https://github.com/decidim/decidim">fri programvara</a>.
|
2043
2063
|
resources: Innehåll
|
2044
2064
|
sign_up: Skapa ett konto
|
2065
|
+
social_media: Sociala medier
|
2045
2066
|
terms_of_service: Användarvillkor
|
2046
2067
|
header:
|
2047
2068
|
log_in: Logga in
|
@@ -2079,6 +2100,8 @@ sv:
|
|
2079
2100
|
profile: Mitt konto
|
2080
2101
|
public_profile: Min offentliga profil
|
2081
2102
|
title: Profillänkar
|
2103
|
+
unread_conversations: Du har olästa konversationer
|
2104
|
+
unread_notifications: Du har olästa meddelanden
|
2082
2105
|
user_profile:
|
2083
2106
|
account: Konto
|
2084
2107
|
authorizations: Auktoriseringar
|
data/config/locales/tr-TR.yml
CHANGED
@@ -647,7 +647,6 @@ tr:
|
|
647
647
|
reject_invitation: Reddet
|
648
648
|
group_members:
|
649
649
|
actions:
|
650
|
-
are_you_sure: Emin misiniz?
|
651
650
|
promote_to_admin: Yönetici yap
|
652
651
|
remove_from_group: Katılımcıyı kaldır
|
653
652
|
index:
|
@@ -819,10 +818,8 @@ tr:
|
|
819
818
|
unsubscribe:
|
820
819
|
success: Abonelikten başarıyla çıktınız.
|
821
820
|
token_error: Bağlantının süresi doldu.
|
822
|
-
unsubscribe: Abonelikten ayrıl
|
823
821
|
newsletters_opt_in_mailer:
|
824
822
|
notify:
|
825
|
-
body_1: Kişisel verilerin işlenmesi ve korunması, hepimiz için giderek daha önemli hale gelmektedir. 25 Mayıs 2018 tarihli yeni Genel Veri Koruma Yönetmeliği (GDPR) ile bireyler kişisel verileri üzerinde daha iyi bir kontrole sahiptir. Bu nedenle, %{organization_name}faaliyetleri hakkında ilgili bilgileri göndermeye devam etmek için "OK" e ihtiyacımız var.
|
826
823
|
body_2: 'Bize onayınızı nasıl verirsiniz? Aşağıdaki düğmeyi tıklamanız yeterlidir:'
|
827
824
|
body_3: Bu izinle, platformun hizmetleri hakkında bilgi almaya devam edebileceksiniz. Aksine, sizin tarafınızdan olumlu bir onay almazsak, size mesajlarımızı göndermeyi durduracağız. Bilgilendirilmeye devam etmek istediğinizi onaylarsanız, her zaman istediğiniz zaman iptal etme seçeneğiniz olacaktır.
|
828
825
|
button: Evet, alakalı bilgileri almaya devam etmek istiyorum
|
data/config/locales/uk.yml
CHANGED
@@ -345,10 +345,8 @@ uk:
|
|
345
345
|
unsubscribe:
|
346
346
|
success: Ви успішно скасували підписку.
|
347
347
|
token_error: Строк дії посилання закінчився.
|
348
|
-
unsubscribe: Скасувати підписку
|
349
348
|
newsletters_opt_in_mailer:
|
350
349
|
notify:
|
351
|
-
body_1: Обробка особистих даних та їх захист стають дедалі важливішими для всіх нас. За новим "Загальним положенням про захист даних" (GDPR) від 25 травня 2018 року люди мають змогу керувати своїми особистими даними. Тому ми потребуємо вашої згоди, щоб продовжувати надсилати вам свіжі новини про діяльність %{organization_name}.
|
352
350
|
body_2: 'Як ви можете дати нам свою згоду? Просто натисніть цю кнопку:'
|
353
351
|
body_3: Погодившись, ви зможете продовжувати отримувати відомості про послуги нашого майданчику. Якщо ж ми не отримаємо вашої згоди, ми припинимо надсилати вам наші повідомлення. Якщо ви підтвердите, що хочете продовжувати отримувати новини, ви зможете потім в будь-який момент від них відмовитись.
|
354
352
|
button: Так, я хочу продовжувати отримувати новини
|
data/config/locales/zh-CN.yml
CHANGED
@@ -568,7 +568,6 @@ zh-CN:
|
|
568
568
|
reject_invitation: 拒绝
|
569
569
|
group_members:
|
570
570
|
actions:
|
571
|
-
are_you_sure: 您确定吗?
|
572
571
|
promote_to_admin: 设为管理员
|
573
572
|
remove_from_group: Remove participant
|
574
573
|
index:
|
@@ -730,10 +729,8 @@ zh-CN:
|
|
730
729
|
unsubscribe:
|
731
730
|
success: 您已成功取消订阅。
|
732
731
|
token_error: 链接已过期。
|
733
|
-
unsubscribe: 取消订阅
|
734
732
|
newsletters_opt_in_mailer:
|
735
733
|
notify:
|
736
|
-
body_1: 个人数据的处理和对数据的保护对我们大家都越来越重要。 根据2018年5月25日新的《一般数据保护条例》,个人可以更好地控制自己的个人数据。 为此原因,我们需要您的“确定”继续发送有关 %{organization_name} 活动的信息。
|
737
734
|
body_2: '你如何能够给予我们同意?只需点击下面的按钮:'
|
738
735
|
body_3: 如果您同意,您将能够继续接收有关平台服务的信息。 相反,如果我们没有得到你的肯定确认,我们将停止向你发送我们的信息。 如果您确认要随时收到通知,您将随时有取消的选项。
|
739
736
|
button: 是的,我想继续收到相关信息
|
data/config/locales/zh-TW.yml
CHANGED
@@ -814,7 +814,6 @@ zh-TW:
|
|
814
814
|
title: 徽章是什麼?
|
815
815
|
group_admins:
|
816
816
|
actions:
|
817
|
-
are_you_sure: 確定嗎?這將不會將該參與者從該組中移除。
|
818
817
|
demote_admin: 移除管理員
|
819
818
|
demote:
|
820
819
|
error: 刪除此參與者的管理員名單時發生問題。
|
@@ -843,7 +842,6 @@ zh-TW:
|
|
843
842
|
error: 加入請求接受時發生問題.
|
844
843
|
success: 加入申請已成功接受.
|
845
844
|
actions:
|
846
|
-
are_you_sure: 您確定嗎?
|
847
845
|
promote_to_admin: 設為管理員
|
848
846
|
remove_from_group: 刪除該參與者
|
849
847
|
index:
|
@@ -1056,18 +1054,15 @@ zh-TW:
|
|
1056
1054
|
main_image: 主圖片
|
1057
1055
|
newsletters:
|
1058
1056
|
unsubscribe:
|
1059
|
-
check_subscription: 如果您想更改您的偏好設定,您可以在<a href="%{link}" target="_blank">配置頁面</a>進行更改。
|
1060
1057
|
error: 取消訂閱時發生問題.
|
1061
1058
|
success: 你已經成功取消訂閱
|
1062
1059
|
token_error: 該連結已過期。
|
1063
|
-
unsubscribe: 取消訂閱
|
1064
1060
|
newsletters_opt_in:
|
1065
1061
|
update:
|
1066
1062
|
error: 儲存通訊設定時出現問題。
|
1067
1063
|
success: 成功更新電子報設定.
|
1068
1064
|
newsletters_opt_in_mailer:
|
1069
1065
|
notify:
|
1070
|
-
body_1: 個人資料的處理和保護對我們所有人來說變得越來越重要。隨著2018年5月25日新的《通用數據保護條例》(GDPR)的出台,個人對其個人資料擁有更好的控制權。因此,我們需要您的「確認」,以繼續向您發送有關 %{organization_name} 活動的相關資訊。
|
1071
1066
|
body_2: '您如何給予我們您的同意?只需點擊下面的按鈕:'
|
1072
1067
|
body_3: 通過此同意,您將能夠繼續接收有關平台服務的資訊。如果您沒有給予積極的確認,我們將停止向您發送訊息。如果您確認希望繼續收到資訊,您隨時可以選擇取消訂閱。
|
1073
1068
|
button: 是的,我希望繼續接收相關資訊。
|
@@ -5,7 +5,7 @@
|
|
5
5
|
// https://docs.decidim.org/en/develop/customize/styles
|
6
6
|
//
|
7
7
|
|
8
|
-
const { inherit, current, transparent, white } = require("tailwindcss/colors")
|
8
|
+
const { inherit, current, transparent, white, neutral } = require("tailwindcss/colors")
|
9
9
|
|
10
10
|
const withOpacity =
|
11
11
|
(variable) =>
|
@@ -33,6 +33,7 @@ module.exports = {
|
|
33
33
|
current,
|
34
34
|
transparent,
|
35
35
|
white,
|
36
|
+
neutral,
|
36
37
|
primary: withOpacity("--primary-rgb"),
|
37
38
|
secondary: withOpacity("--secondary-rgb"),
|
38
39
|
tertiary: withOpacity("--tertiary-rgb"),
|
@@ -127,8 +127,8 @@ FactoryBot.define do
|
|
127
127
|
sequence(:host) { |n| "#{n}.lvh.me" }
|
128
128
|
description { generate_localized_description(:organization_description, skip_injection:) }
|
129
129
|
favicon { Decidim::Dev.test_file("icon.png", "image/png") }
|
130
|
-
default_locale {
|
131
|
-
available_locales {
|
130
|
+
default_locale { "en" }
|
131
|
+
available_locales { %w(en ca es) }
|
132
132
|
users_registration_mode { :enabled }
|
133
133
|
official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
|
134
134
|
official_url { Faker::Internet.url }
|
@@ -14,6 +14,8 @@ shared_examples "manage announcements" do
|
|
14
14
|
|
15
15
|
click_on "Update"
|
16
16
|
|
17
|
+
expect(page).to have_content "The component was updated successfully"
|
18
|
+
|
17
19
|
visit main_component_path(current_component)
|
18
20
|
|
19
21
|
within page.find("[data-announcement]", match: :first) do
|
@@ -48,6 +50,8 @@ shared_examples "manage announcements" do
|
|
48
50
|
|
49
51
|
click_on "Update"
|
50
52
|
|
53
|
+
expect(page).to have_content "The component was updated successfully"
|
54
|
+
|
51
55
|
visit main_component_path(current_component)
|
52
56
|
|
53
57
|
within page.find("[data-announcement]", match: :first) do
|
@@ -181,10 +181,10 @@ shared_examples "comments" do
|
|
181
181
|
click_on "Accept all"
|
182
182
|
login_as user, scope: :user
|
183
183
|
visit resource_path
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
184
|
+
if page.has_content?("Log in")
|
185
|
+
login_as user, scope: :user
|
186
|
+
visit resource_path
|
187
|
+
end
|
188
188
|
end
|
189
189
|
|
190
190
|
it "does not show a message so user can Log in or create an account" do
|
@@ -192,7 +192,7 @@ shared_examples "comments" do
|
|
192
192
|
end
|
193
193
|
|
194
194
|
it "shows a modal with the comment form" do
|
195
|
-
|
195
|
+
expect(page).to have_content("Add comment")
|
196
196
|
click_on "Add comment"
|
197
197
|
sleep 1
|
198
198
|
expect(page).to have_content("Add comment")
|
@@ -567,6 +567,8 @@ shared_examples "comments" do
|
|
567
567
|
field.native.send_keys content
|
568
568
|
click_on "Publish comment"
|
569
569
|
end
|
570
|
+
|
571
|
+
expect(page).to have_content(content)
|
570
572
|
end
|
571
573
|
|
572
574
|
it "shows comment to the user, updates the comments counter and clears the comment textarea" do
|
data/lib/decidim/core/version.rb
CHANGED
data/lib/decidim/form_builder.rb
CHANGED
@@ -92,6 +92,20 @@ module Decidim
|
|
92
92
|
safe_join [label_tabs, tabs_content]
|
93
93
|
end
|
94
94
|
|
95
|
+
def datetime_field(attribute, opts = {})
|
96
|
+
label = label_for(attribute)
|
97
|
+
opts.reverse_merge!(
|
98
|
+
data: {
|
99
|
+
"date-label": I18n.t("datetime.widget.label.date", label:),
|
100
|
+
"time-label": I18n.t("datetime.widget.label.time", label:),
|
101
|
+
"button-date-label": I18n.t("datetime.widget.picker.date_button", label:),
|
102
|
+
"button-time-label": I18n.t("datetime.widget.picker.time_button", label:)
|
103
|
+
}
|
104
|
+
)
|
105
|
+
|
106
|
+
super
|
107
|
+
end
|
108
|
+
|
95
109
|
def password_field(attribute, options = {})
|
96
110
|
field attribute, options do |opts|
|
97
111
|
opts[:autocomplete] ||= :off
|
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.30.
|
4
|
+
version: 0.30.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Josep Jaume Rey Peroy
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2025-
|
13
|
+
date: 2025-09-23 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: concurrent-ruby
|
@@ -780,28 +780,28 @@ dependencies:
|
|
780
780
|
requirements:
|
781
781
|
- - '='
|
782
782
|
- !ruby/object:Gem::Version
|
783
|
-
version: 0.30.
|
783
|
+
version: 0.30.2
|
784
784
|
type: :development
|
785
785
|
prerelease: false
|
786
786
|
version_requirements: !ruby/object:Gem::Requirement
|
787
787
|
requirements:
|
788
788
|
- - '='
|
789
789
|
- !ruby/object:Gem::Version
|
790
|
-
version: 0.30.
|
790
|
+
version: 0.30.2
|
791
791
|
- !ruby/object:Gem::Dependency
|
792
792
|
name: decidim-dev
|
793
793
|
requirement: !ruby/object:Gem::Requirement
|
794
794
|
requirements:
|
795
795
|
- - '='
|
796
796
|
- !ruby/object:Gem::Version
|
797
|
-
version: 0.30.
|
797
|
+
version: 0.30.2
|
798
798
|
type: :development
|
799
799
|
prerelease: false
|
800
800
|
version_requirements: !ruby/object:Gem::Requirement
|
801
801
|
requirements:
|
802
802
|
- - '='
|
803
803
|
- !ruby/object:Gem::Version
|
804
|
-
version: 0.30.
|
804
|
+
version: 0.30.2
|
805
805
|
description: Adds core features so other engines can hook into the framework.
|
806
806
|
email:
|
807
807
|
- josepjaume@gmail.com
|
@@ -1606,6 +1606,7 @@ files:
|
|
1606
1606
|
- app/packs/src/decidim/direct_uploads/upload_modal.js
|
1607
1607
|
- app/packs/src/decidim/direct_uploads/upload_utility.js
|
1608
1608
|
- app/packs/src/decidim/direct_uploads/uploader.js
|
1609
|
+
- app/packs/src/decidim/dropdown_menu.js
|
1609
1610
|
- app/packs/src/decidim/editor/common/bubble_menu.js
|
1610
1611
|
- app/packs/src/decidim/editor/common/helpers.js
|
1611
1612
|
- app/packs/src/decidim/editor/common/input_dialog.js
|