decidim-core 0.28.5 → 0.28.6
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/participatory_space_dropdown_metadata/show.erb +5 -3
- data/app/cells/decidim/resource_types_filter/show.erb +1 -1
- data/app/cells/decidim/resource_types_filter_cell.rb +6 -6
- data/app/cells/decidim/user_activity/show.erb +1 -1
- data/app/commands/decidim/create_omniauth_registration.rb +14 -8
- data/app/commands/decidim/search.rb +14 -0
- data/app/controllers/decidim/profiles_controller.rb +2 -2
- data/app/controllers/decidim/reports_controller.rb +1 -1
- data/app/controllers/decidim/user_activities_controller.rb +1 -1
- data/app/forms/decidim/account_form.rb +5 -2
- data/app/helpers/decidim/orders_helper.rb +2 -1
- data/app/helpers/decidim/participatory_space_helpers.rb +1 -1
- data/app/models/decidim/user.rb +0 -4
- data/app/models/decidim/user_base_entity.rb +4 -0
- data/app/packs/src/decidim/index.js +4 -2
- data/app/packs/src/decidim/map/provider/here.js +1 -1
- data/app/packs/stylesheets/decidim/_hashtags.scss +5 -0
- data/app/packs/stylesheets/decidim/_header.scss +20 -2
- data/app/packs/stylesheets/decidim/application.scss +1 -0
- data/app/presenters/decidim/log/user_presenter.rb +1 -0
- data/app/services/decidim/base_diff_renderer.rb +2 -0
- data/app/services/decidim/static_map_generator.rb +1 -1
- data/app/views/decidim/last_activities/index.html.erb +1 -1
- data/app/views/decidim/reported_mailer/hide.html.erb +1 -1
- data/app/views/decidim/reported_mailer/report.html.erb +1 -1
- data/app/views/decidim/searches/_count.html.erb +1 -1
- data/app/views/decidim/searches/_filters.html.erb +40 -38
- data/app/views/decidim/shared/_orders.html.erb +2 -2
- data/config/locales/ar.yml +44 -13
- data/config/locales/bg.yml +17 -8
- data/config/locales/bs-BA.yml +2 -0
- data/config/locales/ca-IT.yml +2115 -0
- data/config/locales/ca.yml +56 -13
- data/config/locales/cs.yml +57 -15
- data/config/locales/de.yml +51 -8
- data/config/locales/el.yml +14 -2
- data/config/locales/en.yml +43 -0
- data/config/locales/eo.yml +2 -0
- data/config/locales/es-MX.yml +56 -13
- data/config/locales/es-PY.yml +60 -17
- data/config/locales/es.yml +61 -18
- data/config/locales/eu.yml +114 -73
- data/config/locales/fi-plain.yml +46 -11
- data/config/locales/fi.yml +48 -13
- data/config/locales/fr-CA.yml +52 -9
- data/config/locales/fr.yml +51 -8
- data/config/locales/ga-IE.yml +6 -0
- data/config/locales/gl.yml +29 -2
- data/config/locales/hu.yml +16 -9
- data/config/locales/id-ID.yml +28 -3
- data/config/locales/is-IS.yml +14 -1
- data/config/locales/it.yml +44 -14
- data/config/locales/ja.yml +55 -10
- data/config/locales/lb.yml +27 -7
- data/config/locales/lt.yml +8 -2
- data/config/locales/lv.yml +22 -2
- data/config/locales/nl.yml +27 -5
- data/config/locales/no.yml +20 -0
- data/config/locales/pl.yml +14 -5
- data/config/locales/pt-BR.yml +17 -7
- data/config/locales/pt.yml +20 -0
- data/config/locales/ro-RO.yml +232 -73
- data/config/locales/ru.yml +29 -1
- data/config/locales/sk.yml +34 -6
- data/config/locales/sl.yml +4 -0
- data/config/locales/sr-CS.yml +2 -0
- data/config/locales/sv.yml +28 -9
- data/config/locales/tr-TR.yml +26 -7
- data/config/locales/uk.yml +16 -1
- data/config/locales/zh-CN.yml +22 -2
- data/config/locales/zh-TW.yml +10 -0
- data/lib/decidim/attributes/time_with_zone.rb +5 -1
- data/lib/decidim/content_parsers/blob_parser.rb +10 -8
- data/lib/decidim/content_parsers/user_parser.rb +1 -1
- data/lib/decidim/core/test/shared_examples/reports_examples.rb +48 -6
- data/lib/decidim/core/test/shared_examples/uncommentable_component_examples.rb +26 -0
- data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +26 -0
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/map/provider/dynamic_map/here.rb +1 -40
- data/lib/decidim/map/provider/static_map/here.rb +34 -0
- data/lib/decidim/nicknamizable.rb +1 -1
- data/lib/decidim/reportable.rb +6 -2
- data/lib/decidim/translatable_attributes.rb +5 -1
- data/lib/decidim/view_model.rb +1 -0
- data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +23 -20
- metadata +8 -7
- data/app/packs/src/decidim/vendor/leaflet-tilelayer-here.js +0 -212
data/config/locales/ru.yml
CHANGED
@@ -23,6 +23,8 @@ ru:
|
|
23
23
|
password_confirmation: Подтвердите свой пароль
|
24
24
|
personal_url: Личный веб-адрес
|
25
25
|
remove_avatar: Удалить аватар
|
26
|
+
user_group:
|
27
|
+
avatar: Аватар
|
26
28
|
models:
|
27
29
|
decidim/attachment_created_event: Прикрепленный файл
|
28
30
|
decidim/component_published_event: Действующая составляющая
|
@@ -51,6 +53,8 @@ ru:
|
|
51
53
|
'false': 'Нет'
|
52
54
|
'true': 'Да'
|
53
55
|
date:
|
56
|
+
buttons:
|
57
|
+
select: Выбрать
|
54
58
|
formats:
|
55
59
|
decidim_short: "%d.%m.%Y"
|
56
60
|
decidim_with_month_name: "%d %B %Y"
|
@@ -406,6 +410,9 @@ ru:
|
|
406
410
|
email_help: Электронная почта вашей организации, ассоциации, коллектива, группы и т.д.
|
407
411
|
join:
|
408
412
|
success: Запрос на присоединение успешно создан. Администратор рассмотрит ваш запрос перед тем, как принять вас в группу.
|
413
|
+
members:
|
414
|
+
accept_request: Принять
|
415
|
+
reject_request: Отклонить
|
409
416
|
last_activities:
|
410
417
|
all: Все виды активности
|
411
418
|
index:
|
@@ -436,10 +443,18 @@ ru:
|
|
436
443
|
home: Главная
|
437
444
|
messaging:
|
438
445
|
conversation_mailer:
|
446
|
+
comanagers_new_conversation:
|
447
|
+
greeting: Здравствуйте, %{recipient}!
|
448
|
+
comanagers_new_message:
|
449
|
+
greeting: Здравствуйте, %{recipient}!
|
439
450
|
new_conversation:
|
440
451
|
greeting: Здравствуйте, %{recipient}!
|
441
452
|
intro: "%{sender} начал с вами новую беседу. Кликните здесь, чтобы прочитать её:"
|
442
453
|
subject: "%{sender} начал беседу с вами"
|
454
|
+
new_group_conversation:
|
455
|
+
greeting: Здравствуйте, %{recipient}!
|
456
|
+
new_group_message:
|
457
|
+
greeting: Здравствуйте, %{recipient}!
|
443
458
|
new_message:
|
444
459
|
greeting: Здравствуйте, %{recipient}!
|
445
460
|
intro: "%{sender} написал новые сообщения в вашей беседе. Кликните здесь, чтобы посмотреть их:"
|
@@ -507,15 +522,24 @@ ru:
|
|
507
522
|
conversations: Беседы
|
508
523
|
followers: Читают
|
509
524
|
following: Следит за
|
525
|
+
group_admins: Управление админами
|
526
|
+
group_members: Управление участниками
|
510
527
|
sidebar:
|
511
528
|
badges:
|
512
529
|
info: Значки заработаны за выполнение определенных действий на платформе.
|
513
530
|
title: Значки
|
514
531
|
user:
|
515
|
-
|
532
|
+
actions:
|
533
|
+
edit_profile: Редактировать профиль
|
534
|
+
edit_user_group: Изменить профиль группы
|
535
|
+
invite_user: Пригласить участника
|
536
|
+
manage_user_group_admins: Управление админами
|
537
|
+
manage_user_group_users: Управление участниками
|
516
538
|
edit_profile: Редактировать профиль
|
517
539
|
edit_user_group: Изменить профиль группы
|
518
540
|
invite_user: Пригласить участника
|
541
|
+
manage_user_group_admins: Управление админами
|
542
|
+
manage_user_group_users: Управление участниками
|
519
543
|
reported_mailer:
|
520
544
|
hide:
|
521
545
|
hello: Здравствуйте, %{name}!
|
@@ -556,6 +580,8 @@ ru:
|
|
556
580
|
report: Пожаловаться
|
557
581
|
spam: Содержит кликоловки (манипулятивно-сенсационные заголовки), рекламу, мошенничество или лохотроны.
|
558
582
|
title: Пожаловаться на проблему
|
583
|
+
flag_user_modal:
|
584
|
+
close: Закрыть
|
559
585
|
floating_help:
|
560
586
|
help: Справка
|
561
587
|
login_modal:
|
@@ -570,6 +596,8 @@ ru:
|
|
570
596
|
statistics:
|
571
597
|
comments_count: Комментариев
|
572
598
|
user_conversations:
|
599
|
+
reply:
|
600
|
+
send: Отправить
|
573
601
|
update:
|
574
602
|
error: Сообщение не отправлено. Попробуйте позже
|
575
603
|
wizard_step_form:
|
data/config/locales/sk.yml
CHANGED
@@ -23,6 +23,8 @@ sk:
|
|
23
23
|
password_confirmation: Potvrdenie hesla
|
24
24
|
personal_url: Osobné adresa URL
|
25
25
|
remove_avatar: Odstrániť avatara
|
26
|
+
user_group:
|
27
|
+
avatar: Avatar
|
26
28
|
models:
|
27
29
|
decidim/attachment_created_event: Príloha
|
28
30
|
decidim/component_published_event: Aktívna súčasť
|
@@ -67,6 +69,8 @@ sk:
|
|
67
69
|
'false': 'Nie'
|
68
70
|
'true': 'Áno'
|
69
71
|
date:
|
72
|
+
buttons:
|
73
|
+
select: Vybrat
|
70
74
|
formats:
|
71
75
|
decidim_short: "%d/%m/%Y"
|
72
76
|
decidim_short_with_month_name_short: "%d %b %Y"
|
@@ -338,6 +342,8 @@ sk:
|
|
338
342
|
view_all: Zobraziť všetko
|
339
343
|
metrics:
|
340
344
|
name: Štatistika organizácie
|
345
|
+
participatory_space_metrics:
|
346
|
+
name: Metriky
|
341
347
|
stats:
|
342
348
|
name: Štatistiky organizácie
|
343
349
|
sub_hero:
|
@@ -585,7 +591,7 @@ sk:
|
|
585
591
|
current_admins: 'Aktuálni administrátori:'
|
586
592
|
manage_admins: Správa administrátorov
|
587
593
|
group_invites:
|
588
|
-
accept_invitation:
|
594
|
+
accept_invitation: Prijať
|
589
595
|
accept_or_reject_group_invitations: 'Nasledujúce skupiny vás pozvali, aby ste sa k nim pripojili. Prijať alebo odmietnuť ich požiadavky: '
|
590
596
|
index:
|
591
597
|
invite: Pozvať
|
@@ -616,8 +622,8 @@ sk:
|
|
616
622
|
success: Skupina úspěšně opustila.
|
617
623
|
members:
|
618
624
|
accept_or_reject_join_requests: 'Následující uživatelé se připojili k této skupině. Přijmout nebo odmítnout jejich požadavky:'
|
619
|
-
accept_request:
|
620
|
-
reject_request:
|
625
|
+
accept_request: Prijať
|
626
|
+
reject_request: Odmietnuť
|
621
627
|
new:
|
622
628
|
create_user_group: Vytvořit skupinu
|
623
629
|
new_user_group: Nová skupina
|
@@ -661,10 +667,18 @@ sk:
|
|
661
667
|
home: Domov
|
662
668
|
messaging:
|
663
669
|
conversation_mailer:
|
670
|
+
comanagers_new_conversation:
|
671
|
+
greeting: Dobrý deň, %{recipient}!
|
672
|
+
comanagers_new_message:
|
673
|
+
greeting: Dobrý deň, %{recipient}!
|
664
674
|
new_conversation:
|
665
675
|
greeting: Dobrý deň, %{recipient}!
|
666
676
|
intro: "%{sender} zahájil novú diskusiu s vami. Kliknite sem pre zobrazenie:"
|
667
677
|
subject: "%{sender} začal s vami konverzovať"
|
678
|
+
new_group_conversation:
|
679
|
+
greeting: Dobrý deň, %{recipient}!
|
680
|
+
new_group_message:
|
681
|
+
greeting: Dobrý deň, %{recipient}!
|
668
682
|
new_message:
|
669
683
|
greeting: Dobrý deň, %{recipient}!
|
670
684
|
intro: "%{sender} poslala nové správy vo vašej konverzácii. Kliknite sem pre ich zobrazenie:"
|
@@ -692,11 +706,9 @@ sk:
|
|
692
706
|
participants:
|
693
707
|
description: Počet aktívnych účastníkov v organizácii
|
694
708
|
object: účastníci
|
695
|
-
title: Účastníci
|
696
709
|
users:
|
697
710
|
description: Počet účastníkov v organizácii
|
698
711
|
object: účastníci
|
699
|
-
title: Účastníci
|
700
712
|
newsletter_mailer:
|
701
713
|
newsletter:
|
702
714
|
unsubscribe: Chcete-li odhlásit přijímání tento typ e-mailů, <a href="%{link}" target="_blank" class="unsubscribe">Odhlásit</a>.
|
@@ -792,6 +804,8 @@ sk:
|
|
792
804
|
badges: Odznaky
|
793
805
|
followers: Sledujúci
|
794
806
|
following: Nasleduje
|
807
|
+
group_admins: Správa administrátorov
|
808
|
+
group_members: Správa členov
|
795
809
|
groups: Skupiny
|
796
810
|
members: Členovia
|
797
811
|
sidebar:
|
@@ -799,7 +813,17 @@ sk:
|
|
799
813
|
info: Odznaky získate za určité aktivity a účasť na platforme.
|
800
814
|
title: Odznaky
|
801
815
|
user:
|
802
|
-
|
816
|
+
actions:
|
817
|
+
create_user_group: Vytvořit skupinu
|
818
|
+
edit_profile: Editovať profil
|
819
|
+
edit_user_group: Upraviť profil skupiny
|
820
|
+
invite_user: Pozvať užívateľa
|
821
|
+
join_user_group: Žiadosť o pripojenie k skupine
|
822
|
+
leave_user_group: Opustiť skupinu
|
823
|
+
manage_user_group_admins: Správa administrátorov
|
824
|
+
manage_user_group_users: Správa členov
|
825
|
+
resend_email_confirmation_instructions: Opakujte e-mailové pokyny na potvrdenie
|
826
|
+
create_user_group: Vytvořit skupinu
|
803
827
|
edit_profile: Editovať profil
|
804
828
|
edit_user_group: Upraviť profil skupiny
|
805
829
|
invite_user: Pozvať užívateľa
|
@@ -861,6 +885,8 @@ sk:
|
|
861
885
|
report: Správa
|
862
886
|
spam: Obsahuje clickbait, reklama, podvody alebo skripty.
|
863
887
|
title: Nahlásiť problém
|
888
|
+
flag_user_modal:
|
889
|
+
close: Zavrieť
|
864
890
|
floating_help:
|
865
891
|
help: Pomoc
|
866
892
|
login_modal:
|
@@ -884,6 +910,8 @@ sk:
|
|
884
910
|
comments_count: Komentáre
|
885
911
|
user_contact_disabled: Tento účastník nepovoľuje posielanie priamych správ.
|
886
912
|
user_conversations:
|
913
|
+
reply:
|
914
|
+
send: Poslat
|
887
915
|
update:
|
888
916
|
error: Zpráva nebyla odeslána. Zkuste to později znovu
|
889
917
|
user_interests:
|
data/config/locales/sl.yml
CHANGED
data/config/locales/sr-CS.yml
CHANGED
data/config/locales/sv.yml
CHANGED
@@ -4,6 +4,8 @@ sv:
|
|
4
4
|
attributes:
|
5
5
|
account:
|
6
6
|
delete_reason: Skäl att ta bort ditt konto
|
7
|
+
attachment:
|
8
|
+
image: Bild
|
7
9
|
common:
|
8
10
|
created_at: Skapad
|
9
11
|
conversation:
|
@@ -33,6 +35,14 @@ sv:
|
|
33
35
|
personal_url: Personlig URL
|
34
36
|
remove_avatar: Ta bort avatar
|
35
37
|
tos_agreement: Användarvillkor
|
38
|
+
user_group:
|
39
|
+
avatar: Profilbild
|
40
|
+
errors:
|
41
|
+
models:
|
42
|
+
user:
|
43
|
+
attributes:
|
44
|
+
nickname:
|
45
|
+
format: Smeknamnet ska vara små bokstäver utan mellanslag
|
36
46
|
models:
|
37
47
|
decidim/attachment_created_event: Bilaga
|
38
48
|
decidim/component_published_event: Aktiv komponent
|
@@ -85,6 +95,9 @@ sv:
|
|
85
95
|
file_size_too_large: Filen är för stor
|
86
96
|
not_inside_organization: Filen är inte kopplad till någon organisation
|
87
97
|
date:
|
98
|
+
buttons:
|
99
|
+
close: Stäng
|
100
|
+
select: Välj
|
88
101
|
formats:
|
89
102
|
decidim_short: "%d/%m/%Y"
|
90
103
|
decidim_short_dashed: "%d-%m-%Y"
|
@@ -92,6 +105,10 @@ sv:
|
|
92
105
|
decidim_with_day_and_month_name: "%A %d %b %Y"
|
93
106
|
decidim_with_month_name: "%d %B %Y"
|
94
107
|
decidim_with_month_name_short: "%d %b"
|
108
|
+
help:
|
109
|
+
date_format: 'Format: dd/mm/åååå'
|
110
|
+
order: d-m-y
|
111
|
+
separator: "/"
|
95
112
|
datetime:
|
96
113
|
distance_in_words:
|
97
114
|
about_x_hours:
|
@@ -499,6 +516,8 @@ sv:
|
|
499
516
|
dummy_step_attribute1: Dummy Step Attribut 1
|
500
517
|
dummy_step_attribute2: Dummy Step Attribut 2
|
501
518
|
dummy_step_translatable_text: Översättningsbar text för exempelsteg
|
519
|
+
pagination:
|
520
|
+
page_title: "%{component_name} - Sida %{current_page} av %{total_pages}"
|
502
521
|
contact: Kontakt
|
503
522
|
content_blocks:
|
504
523
|
announcement:
|
@@ -958,7 +977,7 @@ sv:
|
|
958
977
|
accept:
|
959
978
|
error: Det gick inte att godkänna den här inbjudan.
|
960
979
|
success: Inbjudan har godkänts.
|
961
|
-
accept_invitation:
|
980
|
+
accept_invitation: Acceptera
|
962
981
|
accept_or_reject_group_invitations: 'Du har blivit inbjuden till följande grupper. Godkänn eller avvisa deras förfrågningar:'
|
963
982
|
index:
|
964
983
|
invite: Inbjudan
|
@@ -1016,7 +1035,7 @@ sv:
|
|
1016
1035
|
success: Du har lämnat gruppen.
|
1017
1036
|
members:
|
1018
1037
|
accept_or_reject_join_requests: 'Följande användare har ansökt om att få gå med i den här gruppen. Godkänn eller avvisa deras förfrågningar:'
|
1019
|
-
accept_request:
|
1038
|
+
accept_request: Acceptera
|
1020
1039
|
reject_request: Avvisa
|
1021
1040
|
new:
|
1022
1041
|
create_user_group: Skapa grupp
|
@@ -1093,13 +1112,13 @@ sv:
|
|
1093
1112
|
conversation_mailer:
|
1094
1113
|
comanagers_new_conversation:
|
1095
1114
|
admin_in_group: Du får detta eftersom du är administratör i %{group}.
|
1096
|
-
greeting:
|
1115
|
+
greeting: Hej %{recipient}!
|
1097
1116
|
intro: "%{manager} har startat en ny konversation som %{group}. Klicka här för att se den:"
|
1098
1117
|
outro: Ha det så kul!
|
1099
1118
|
subject: "%{manager} har startat en ny konversation som %{group}"
|
1100
1119
|
comanagers_new_message:
|
1101
1120
|
admin_in_group: Du får detta eftersom du är administratör i %{group}.
|
1102
|
-
greeting:
|
1121
|
+
greeting: Hej %{recipient}!
|
1103
1122
|
intro: "%{manager} har postat nya meddelanden i en konversation som %{group}. Klicka här för att se dem:"
|
1104
1123
|
outro: Ha det så kul!
|
1105
1124
|
subject: "%{manager} har skickat nya meddelanden som %{group}"
|
@@ -1110,13 +1129,13 @@ sv:
|
|
1110
1129
|
subject: "%{sender} har startat en konversation med dig"
|
1111
1130
|
new_group_conversation:
|
1112
1131
|
admin_in_group: Du får detta eftersom du är administratör i %{group}.
|
1113
|
-
greeting:
|
1132
|
+
greeting: Hej %{recipient}!
|
1114
1133
|
intro: "%{sender} har startat en ny konversation med gruppen %{group}. Klicka här för att se den:"
|
1115
1134
|
outro: Ha det så kul!
|
1116
1135
|
subject: "%{sender} har startat en konversation med %{group}"
|
1117
1136
|
new_group_message:
|
1118
1137
|
admin_in_group: Du får detta eftersom du är administratör i %{group}.
|
1119
|
-
greeting:
|
1138
|
+
greeting: Hej %{recipient}!
|
1120
1139
|
intro: "%{sender} har postat nya meddelanden i en konversation med gruppen %{group}. Klicka här för att se den:"
|
1121
1140
|
outro: Ha det så kul!
|
1122
1141
|
subject: "%{group} har fått nya meddelanden från %{sender}"
|
@@ -1368,15 +1387,15 @@ sv:
|
|
1368
1387
|
create_user_group: Skapa grupp
|
1369
1388
|
disabled_message: Meddelande
|
1370
1389
|
edit_profile: Redigera profil
|
1371
|
-
edit_user_group: Redigera
|
1390
|
+
edit_user_group: Redigera grupprofil
|
1372
1391
|
invite_user: Bjud in deltagare
|
1373
|
-
join_user_group:
|
1392
|
+
join_user_group: Begäran att gå med i grupp
|
1374
1393
|
leave_user_group: Lämna grupp
|
1375
1394
|
manage_user_group: Hantera grupp
|
1376
1395
|
manage_user_group_admins: Hantera administratörer
|
1377
1396
|
manage_user_group_users: Hantera medlemmar
|
1378
1397
|
message: Meddelande
|
1379
|
-
resend_email_confirmation_instructions: Skicka e-
|
1398
|
+
resend_email_confirmation_instructions: Skicka anvisningarna om bekräftelse om e-post igen
|
1380
1399
|
confirmation_instructions_sent: Instruktioner för e-postbekräftelse har skickats.
|
1381
1400
|
create_user_group: Skapa grupp
|
1382
1401
|
edit_profile: Redigera profil
|
data/config/locales/tr-TR.yml
CHANGED
@@ -25,6 +25,8 @@ tr:
|
|
25
25
|
password_confirmation: Şifrenizi Onaylayın
|
26
26
|
personal_url: Kişisel URL
|
27
27
|
remove_avatar: Avatarı kaldır
|
28
|
+
user_group:
|
29
|
+
avatar: Avatar
|
28
30
|
models:
|
29
31
|
decidim/attachment_created_event: Ek dosya
|
30
32
|
decidim/component_published_event: Aktif bileşen
|
@@ -61,6 +63,8 @@ tr:
|
|
61
63
|
'false': 'Hayır'
|
62
64
|
'true': 'Evet'
|
63
65
|
date:
|
66
|
+
buttons:
|
67
|
+
select: seçmek
|
64
68
|
formats:
|
65
69
|
decidim_short: "%d/%m/%Y"
|
66
70
|
decidim_short_with_month_name_short: "%d %b %Y"
|
@@ -368,6 +372,8 @@ tr:
|
|
368
372
|
view_all: Tümünü görüntüle
|
369
373
|
metrics:
|
370
374
|
name: Organizasyon metrikleri
|
375
|
+
participatory_space_metrics:
|
376
|
+
name: Metrikler
|
371
377
|
static_page:
|
372
378
|
section:
|
373
379
|
name: Bölüm
|
@@ -750,14 +756,15 @@ tr:
|
|
750
756
|
conversation_mailer:
|
751
757
|
comanagers_new_conversation:
|
752
758
|
admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
|
753
|
-
greeting: Merhaba
|
759
|
+
greeting: Merhaba %{recipient}!
|
754
760
|
intro: "%{manager}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
|
755
761
|
outro: Platformun tadını çıkarın!
|
756
762
|
subject: "%{manager}, %{group} olarak yeni bir görüşme başlattı"
|
757
763
|
comanagers_new_message:
|
758
764
|
admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
|
759
|
-
greeting: Merhaba
|
765
|
+
greeting: Merhaba %{recipient}!
|
760
766
|
intro: "%{manager}, %{group} adına bir görüşmede yeni mesajlar yayınladı. Onları görmek için buraya tıklayın:"
|
767
|
+
outro: Platformun tadını çıkarın!
|
761
768
|
subject: "%{manager} %{group} olarak yeni mesajlar gönderdi"
|
762
769
|
new_conversation:
|
763
770
|
greeting: Merhaba %{recipient}!
|
@@ -766,13 +773,13 @@ tr:
|
|
766
773
|
subject: "%{sender} sizinle bir konuşma başlattı"
|
767
774
|
new_group_conversation:
|
768
775
|
admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
|
769
|
-
greeting: Merhaba
|
776
|
+
greeting: Merhaba %{recipient}!
|
770
777
|
intro: "%{sender}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
|
771
778
|
outro: Platformun tadını çıkarın!
|
772
779
|
subject: "%{sender}, %{group} olarak yeni bir görüşme başlattı"
|
773
780
|
new_group_message:
|
774
781
|
admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
|
775
|
-
greeting: Merhaba
|
782
|
+
greeting: Merhaba %{recipient}!
|
776
783
|
intro: "%{sender}, %{group} grubuyla bir görüşmede yeni mesajlar yayınladı. Görmek için buraya tıklayın:"
|
777
784
|
outro: Platformun tadını çıkarın!
|
778
785
|
subject: "%{group}, %{sender} adlı kişiden yeni mesajlar aldı"
|
@@ -796,6 +803,8 @@ tr:
|
|
796
803
|
new_conversation: Yeni görüşme
|
797
804
|
next: Sonraki
|
798
805
|
title: Konuşmalar
|
806
|
+
reply_form:
|
807
|
+
placeholder: Cevabınız...
|
799
808
|
show:
|
800
809
|
back: Tüm görüşmelere dön
|
801
810
|
chat_with: ile görüşme
|
@@ -808,15 +817,13 @@ tr:
|
|
808
817
|
followers:
|
809
818
|
description: Bu katılım alanını takip eden kullanıcı sayısı
|
810
819
|
object: takipçiler
|
811
|
-
title:
|
820
|
+
title: İzleyiciler
|
812
821
|
participants:
|
813
822
|
description: Kuruluştaki aktif kullanıcı sayısı
|
814
823
|
object: katılımcılar
|
815
|
-
title: Katılımcılar
|
816
824
|
users:
|
817
825
|
description: Kuruluştaki katılımcı sayısı
|
818
826
|
object: katılımcılar
|
819
|
-
title: Katılımcılar
|
820
827
|
newsletter_mailer:
|
821
828
|
newsletter:
|
822
829
|
unsubscribe: Bu tür bir e-posta almayı iptal etmek için, <a href="%{link}" target="_blank" class="unsubscribe">Abonelikten Ayrıl</a>.
|
@@ -915,6 +922,8 @@ tr:
|
|
915
922
|
conversations: Konuşmalar
|
916
923
|
followers: Takipçiler
|
917
924
|
following: Takip Et
|
925
|
+
group_admins: Yöneticileri yönet
|
926
|
+
group_members: Üyeleri yönet
|
918
927
|
groups: Gruplar
|
919
928
|
members: Üyeler
|
920
929
|
officialized: Resmi katılımcı
|
@@ -923,6 +932,16 @@ tr:
|
|
923
932
|
info: Rozetler, platformda belirli etkinlikler gerçekleştirilerek kazanılır.
|
924
933
|
title: Rozetler
|
925
934
|
user:
|
935
|
+
actions:
|
936
|
+
create_user_group: Grup oluştur
|
937
|
+
edit_profile: Profili Düzenle
|
938
|
+
edit_user_group: Grup profilini düzenle
|
939
|
+
invite_user: Katılımcı davet et
|
940
|
+
join_user_group: Gruba katılma isteği
|
941
|
+
leave_user_group: Gruptan ayrıl
|
942
|
+
manage_user_group_admins: Yöneticileri yönet
|
943
|
+
manage_user_group_users: Üyeleri yönet
|
944
|
+
resend_email_confirmation_instructions: E-posta doğrulama talimatlarını tekrar gönder
|
926
945
|
create_user_group: Grup oluştur
|
927
946
|
edit_profile: Profili Düzenle
|
928
947
|
edit_user_group: Grup profilini düzenle
|
data/config/locales/uk.yml
CHANGED
@@ -22,7 +22,6 @@ uk:
|
|
22
22
|
attributes:
|
23
23
|
decidim/user:
|
24
24
|
current_password: Поточний пароль
|
25
|
-
email: Адреса електронної пошти
|
26
25
|
name: Ім'я учасника
|
27
26
|
password: Пароль
|
28
27
|
password_confirmation: Підтвердження паролю
|
@@ -37,6 +36,8 @@ uk:
|
|
37
36
|
'false': 'Ні'
|
38
37
|
'true': 'Так'
|
39
38
|
date:
|
39
|
+
buttons:
|
40
|
+
select: Оберіть
|
40
41
|
formats:
|
41
42
|
decidim_short: "%d.%m.%Y"
|
42
43
|
decidim_with_month_name: "%d %B %Y"
|
@@ -331,10 +332,18 @@ uk:
|
|
331
332
|
home: Головна
|
332
333
|
messaging:
|
333
334
|
conversation_mailer:
|
335
|
+
comanagers_new_conversation:
|
336
|
+
greeting: Вітаємо, %{recipient}!
|
337
|
+
comanagers_new_message:
|
338
|
+
greeting: Вітаємо, %{recipient}!
|
334
339
|
new_conversation:
|
335
340
|
greeting: Вітаємо, %{recipient}!
|
336
341
|
intro: "%{sender} почав з вами нову бесіду. Клацніть тут, щоб прочитати її:"
|
337
342
|
subject: "%{sender} почав з вами бесіду"
|
343
|
+
new_group_conversation:
|
344
|
+
greeting: Вітаємо, %{recipient}!
|
345
|
+
new_group_message:
|
346
|
+
greeting: Вітаємо, %{recipient}!
|
338
347
|
new_message:
|
339
348
|
greeting: Доброго дня, %{recipient}!
|
340
349
|
intro: "%{sender} написав нові повідомлення у вашій бесіді. Клацніть тут, щоб переглянути їх:"
|
@@ -403,6 +412,8 @@ uk:
|
|
403
412
|
followers: Ті, хто стежить
|
404
413
|
following: 'Стежить за:'
|
405
414
|
user:
|
415
|
+
actions:
|
416
|
+
edit_profile: Редагувати профіль
|
406
417
|
edit_profile: Редагувати профіль
|
407
418
|
reported_mailer:
|
408
419
|
hide:
|
@@ -443,6 +454,8 @@ uk:
|
|
443
454
|
report: Поскаржитись
|
444
455
|
spam: Містить клацоловки (маніпулятивно-сенсаційні заголовки), рекламу, афери або лохотрони.
|
445
456
|
title: Поскаржитись на ускладнення
|
457
|
+
flag_user_modal:
|
458
|
+
close: Закрити
|
446
459
|
login_modal:
|
447
460
|
sign_up: Зареєструватися
|
448
461
|
reference:
|
@@ -455,6 +468,8 @@ uk:
|
|
455
468
|
statistics:
|
456
469
|
comments_count: Коментарів
|
457
470
|
user_conversations:
|
471
|
+
reply:
|
472
|
+
send: Надіслати
|
458
473
|
update:
|
459
474
|
error: Повідомлення не надіслано. Спробуйте ще раз пізніше
|
460
475
|
devise:
|
data/config/locales/zh-CN.yml
CHANGED
@@ -25,6 +25,8 @@ zh-CN:
|
|
25
25
|
password_confirmation: 确认您的密码
|
26
26
|
personal_url: 个人网址
|
27
27
|
remove_avatar: 删除头像
|
28
|
+
user_group:
|
29
|
+
avatar: 头像
|
28
30
|
models:
|
29
31
|
decidim/attachment_created_event: 附文
|
30
32
|
decidim/component_published_event: 活动组件
|
@@ -57,6 +59,8 @@ zh-CN:
|
|
57
59
|
'false': '否'
|
58
60
|
'true': '否'
|
59
61
|
date:
|
62
|
+
buttons:
|
63
|
+
select: 选择
|
60
64
|
formats:
|
61
65
|
decidim_short: "%d/%m/%Y"
|
62
66
|
decidim_with_day_and_month_name: "%A %d %b %Y"
|
@@ -320,6 +324,8 @@ zh-CN:
|
|
320
324
|
view_all: 查看全部
|
321
325
|
metrics:
|
322
326
|
name: 组织指标
|
327
|
+
participatory_space_metrics:
|
328
|
+
name: 指标
|
323
329
|
stats:
|
324
330
|
name: 组织统计
|
325
331
|
sub_hero:
|
@@ -712,6 +718,8 @@ zh-CN:
|
|
712
718
|
new_conversation: 新建对话
|
713
719
|
next: 下一个
|
714
720
|
title: 对话
|
721
|
+
reply_form:
|
722
|
+
placeholder: 您的回复...
|
715
723
|
show:
|
716
724
|
back: 回到所有对话
|
717
725
|
chat_with: 对话
|
@@ -726,11 +734,9 @@ zh-CN:
|
|
726
734
|
participants:
|
727
735
|
description: 组织中的活跃参与者人数
|
728
736
|
object: 参与者
|
729
|
-
title: 参加者
|
730
737
|
users:
|
731
738
|
description: 参加组织的人数
|
732
739
|
object: 参与者
|
733
|
-
title: 参加者
|
734
740
|
newsletter_mailer:
|
735
741
|
newsletter:
|
736
742
|
unsubscribe: 选择不接收这种类型的电子邮件, <a href="%{link}" target="_blank" class="unsubscribe">取消订阅</a>。
|
@@ -827,6 +833,8 @@ zh-CN:
|
|
827
833
|
conversations: 对话
|
828
834
|
followers: 关注者
|
829
835
|
following: 关注的问题
|
836
|
+
group_admins: 管理管理员
|
837
|
+
group_members: 管理成员
|
830
838
|
groups: 群組
|
831
839
|
members: 成员
|
832
840
|
officialized: 官方参与者
|
@@ -835,6 +843,16 @@ zh-CN:
|
|
835
843
|
info: 徽章是通过在平台上执行特定活动赚取的。
|
836
844
|
title: 徽章
|
837
845
|
user:
|
846
|
+
actions:
|
847
|
+
create_user_group: 创建组
|
848
|
+
edit_profile: 编辑配置文件
|
849
|
+
edit_user_group: 编辑群组资料
|
850
|
+
invite_user: Invite participant
|
851
|
+
join_user_group: 加入组的请求
|
852
|
+
leave_user_group: 离开组
|
853
|
+
manage_user_group_admins: 管理管理员
|
854
|
+
manage_user_group_users: 管理成员
|
855
|
+
resend_email_confirmation_instructions: 重新发送电子邮件确认说明
|
838
856
|
create_user_group: 创建组
|
839
857
|
edit_profile: 编辑配置文件
|
840
858
|
edit_user_group: 编辑群组资料
|
@@ -920,6 +938,8 @@ zh-CN:
|
|
920
938
|
report: 报告
|
921
939
|
spam: 包含点击、广告、骗子或脚本机器人。
|
922
940
|
title: 报告不恰当的内容
|
941
|
+
flag_user_modal:
|
942
|
+
close: 关闭
|
923
943
|
floating_help:
|
924
944
|
help: 帮助
|
925
945
|
login_modal:
|
data/config/locales/zh-TW.yml
CHANGED
@@ -31,6 +31,8 @@ zh-TW:
|
|
31
31
|
personal_url: 個人 URL
|
32
32
|
remove_avatar: 刪除頭像
|
33
33
|
tos_agreement: 同意服務條款
|
34
|
+
user_group:
|
35
|
+
avatar: 頭像
|
34
36
|
models:
|
35
37
|
decidim/attachment_created_event: 附件
|
36
38
|
decidim/component_published_event: 啟用組件
|
@@ -76,6 +78,8 @@ zh-TW:
|
|
76
78
|
errors:
|
77
79
|
file_size_too_large: 檔案太大。
|
78
80
|
date:
|
81
|
+
buttons:
|
82
|
+
select: 選擇
|
79
83
|
formats:
|
80
84
|
decidim_short: "%d/%m/%Y"
|
81
85
|
decidim_short_with_month_name_short: "%d %b %Y"
|
@@ -481,6 +485,8 @@ zh-TW:
|
|
481
485
|
view_all: 檢視全部
|
482
486
|
metrics:
|
483
487
|
name: 組織指標
|
488
|
+
participatory_space_metrics:
|
489
|
+
name: 指標
|
484
490
|
static_page:
|
485
491
|
section:
|
486
492
|
name: 節
|
@@ -1239,6 +1245,8 @@ zh-TW:
|
|
1239
1245
|
conversations: 對話
|
1240
1246
|
followers: 追隨者
|
1241
1247
|
following: 關注
|
1248
|
+
group_admins: 管理管理員
|
1249
|
+
group_members: 管理成員
|
1242
1250
|
groups: 群組
|
1243
1251
|
members: 成員
|
1244
1252
|
officialized: 正式認證參與者
|
@@ -1254,9 +1262,11 @@ zh-TW:
|
|
1254
1262
|
edit_user_group: 編輯群組資料
|
1255
1263
|
invite_user: 邀請參與者
|
1256
1264
|
join_user_group: 申請加入群組
|
1265
|
+
leave_user_group: 退出群組
|
1257
1266
|
manage_user_group_admins: 管理管理員
|
1258
1267
|
manage_user_group_users: 管理成員
|
1259
1268
|
message: 訊息
|
1269
|
+
resend_email_confirmation_instructions: 重新發送電子郵件確認指示
|
1260
1270
|
confirmation_instructions_sent: 電子郵件確認指示已發送.
|
1261
1271
|
create_user_group: 建立群組
|
1262
1272
|
edit_profile: 編輯個人資料
|
@@ -23,7 +23,11 @@ module Decidim
|
|
23
23
|
def cast_value(value)
|
24
24
|
return value unless value.is_a?(String)
|
25
25
|
|
26
|
-
|
26
|
+
if Date._iso8601(value).present?
|
27
|
+
Time.zone.iso8601(value)
|
28
|
+
else
|
29
|
+
Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
|
30
|
+
end
|
27
31
|
rescue ArgumentError
|
28
32
|
fallback = super
|
29
33
|
return fallback unless fallback.is_a?(Time)
|