decidim-proposals 0.24.3 → 0.25.0.rc4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/cells/decidim/proposals/cost_report_cell.rb +1 -1
- data/app/cells/decidim/proposals/proposal_m_cell.rb +4 -0
- data/app/cells/decidim/proposals/proposals_picker/show.erb +1 -1
- data/app/commands/decidim/proposals/admin/import_proposals.rb +21 -4
- data/app/controllers/decidim/proposals/admin/proposals_controller.rb +1 -1
- data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb +1 -0
- data/app/controllers/decidim/proposals/proposals_controller.rb +1 -0
- data/app/forms/decidim/proposals/admin/import_participatory_text_form.rb +1 -0
- data/app/forms/decidim/proposals/admin/proposals_import_form.rb +6 -0
- data/app/forms/decidim/proposals/proposal_form.rb +7 -4
- data/app/helpers/decidim/proposals/map_helper.rb +5 -5
- data/app/helpers/decidim/proposals/participatory_texts_helper.rb +1 -1
- data/app/helpers/decidim/proposals/proposal_wizard_helper.rb +0 -16
- data/app/models/decidim/proposals/proposal.rb +11 -1
- data/app/{assets → packs}/documents/decidim/proposals/participatory_texts/participatory_text.md +0 -0
- data/app/{assets → packs}/documents/decidim/proposals/participatory_texts/participatory_text.odt +0 -0
- data/app/packs/entrypoints/decidim_proposals.js +8 -0
- data/app/packs/entrypoints/decidim_proposals_admin.js +3 -0
- data/app/{assets/images/decidim/gamification/badges/accepted_proposals.svg → packs/images/decidim/gamification/badges/decidim_gamification_badges_accepted_proposals.svg} +0 -0
- data/app/{assets/images/decidim/gamification/badges/proposal_votes.svg → packs/images/decidim/gamification/badges/decidim_gamification_badges_proposal_votes.svg} +0 -0
- data/app/{assets/images/decidim/gamification/badges/proposals.svg → packs/images/decidim/gamification/badges/decidim_gamification_badges_proposals.svg} +0 -0
- data/app/{assets/images/decidim/proposals/icon.svg → packs/images/decidim/proposals/decidim_proposals.svg} +0 -0
- data/app/packs/src/decidim/proposals/add_proposal.js +49 -0
- data/app/packs/src/decidim/proposals/admin/proposals.js +143 -0
- data/app/{assets/javascripts/decidim/proposals/admin/proposals_form.js.es6 → packs/src/decidim/proposals/admin/proposals_form.js} +2 -2
- data/app/{assets/javascripts/decidim/proposals/admin/proposals_picker.js.es6 → packs/src/decidim/proposals/admin/proposals_picker.js} +0 -0
- data/app/{assets/javascripts/decidim/proposals/utils.js.es6 → packs/src/decidim/proposals/utils.js} +2 -2
- data/app/packs/stylesheets/decidim/proposals/_proposals.scss +1 -0
- data/app/{assets/stylesheets/decidim/proposals/proposals/_preview.css.scss → packs/stylesheets/decidim/proposals/proposals/_preview.scss} +0 -0
- data/app/presenters/decidim/proposals/proposal_presenter.rb +2 -23
- data/app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb +1 -1
- data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb +1 -1
- data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb +1 -1
- data/app/queries/decidim/proposals/similar_proposals.rb +1 -0
- data/app/services/decidim/proposals/proposal_builder.rb +4 -4
- data/app/views/decidim/proposals/admin/proposals/_form.html.erb +1 -1
- data/app/views/decidim/proposals/admin/proposals/index.html.erb +1 -1
- data/app/views/decidim/proposals/admin/proposals_imports/new.html.erb +6 -0
- data/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb +1 -1
- data/app/views/decidim/proposals/collaborative_drafts/edit.html.erb +1 -1
- data/app/views/decidim/proposals/collaborative_drafts/index.html.erb +0 -2
- data/app/views/decidim/proposals/collaborative_drafts/new.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/_dynamic_map_instructions.html.erb +2 -1
- data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +5 -1
- data/app/views/decidim/proposals/proposals/_filters.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/complete.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/edit.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/edit_draft.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/index.html.erb +4 -6
- data/app/views/decidim/proposals/proposals/new.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/preview.html.erb +7 -31
- data/config/assets.rb +10 -0
- data/config/locales/ar.yml +3 -1
- data/config/locales/bg.yml +3 -1
- data/config/locales/ca.yml +10 -4
- data/config/locales/cs.yml +12 -3
- data/config/locales/de.yml +10 -4
- data/config/locales/el.yml +3 -1
- data/config/locales/en.yml +12 -3
- data/config/locales/es-MX.yml +10 -4
- data/config/locales/es-PY.yml +10 -4
- data/config/locales/es.yml +10 -4
- data/config/locales/eu.yml +3 -1
- data/config/locales/fi-plain.yml +12 -3
- data/config/locales/fi.yml +12 -3
- data/config/locales/fr-CA.yml +8 -3
- data/config/locales/fr-LU.yml +903 -0
- data/config/locales/fr.yml +8 -3
- data/config/locales/gl.yml +11 -3
- data/config/locales/hu.yml +3 -1
- data/config/locales/id-ID.yml +3 -1
- data/config/locales/it.yml +55 -1
- data/config/locales/ja.yml +38 -1
- data/config/locales/lb-LU.yml +1 -0
- data/config/locales/lv.yml +3 -1
- data/config/locales/nl.yml +13 -2
- data/config/locales/no.yml +3 -1
- data/config/locales/pl.yml +14 -10
- data/config/locales/pt-BR.yml +199 -1
- data/config/locales/pt.yml +3 -1
- data/config/locales/ro-RO.yml +6 -1
- data/config/locales/ru.yml +3 -1
- data/config/locales/sk.yml +3 -1
- data/config/locales/sv.yml +13 -4
- data/config/locales/tr-TR.yml +3 -4
- data/config/locales/uk.yml +3 -1
- data/config/locales/zh-CN.yml +3 -1
- data/db/migrate/20201002085508_fix_proposals_data.rb +7 -8
- data/db/migrate/20210318082934_fix_counters_for_copied_proposals.rb +6 -5
- data/lib/decidim/proposals/admin_engine.rb +0 -4
- data/lib/decidim/proposals/commentable_proposal.rb +5 -13
- data/lib/decidim/proposals/component.rb +4 -4
- data/lib/decidim/proposals/engine.rb +14 -19
- data/lib/decidim/proposals/proposal_serializer.rb +1 -0
- data/lib/decidim/proposals/test/capybara_proposals_picker.rb +10 -0
- data/lib/decidim/proposals/test/factories.rb +3 -0
- data/lib/decidim/proposals/version.rb +1 -1
- data/lib/decidim/proposals.rb +0 -1
- metadata +38 -112
- data/app/assets/config/admin/decidim_proposals_manifest.js +0 -2
- data/app/assets/config/decidim_proposals_manifest.js +0 -4
- data/app/assets/javascripts/decidim/proposals/add_proposal.js.es6 +0 -31
- data/app/assets/javascripts/decidim/proposals/admin/proposals.es6 +0 -130
- data/app/assets/stylesheets/decidim/proposals/_proposals.css.scss +0 -1
- data/config/locales/ja-JP.yml +0 -865
data/config/locales/fi-plain.yml
CHANGED
@@ -35,6 +35,7 @@ fi-pl:
|
|
35
35
|
origin_component_id: Osio josta ehdotukset kopioidaan
|
36
36
|
proposals_import:
|
37
37
|
import_proposals: Tuo ehdotuksia
|
38
|
+
keep_answers: Säilytä tilat ja vastaukset
|
38
39
|
keep_authors: Säilytä alkuperäiset laatijat
|
39
40
|
valuation_assignment:
|
40
41
|
admin_log:
|
@@ -47,7 +48,9 @@ fi-pl:
|
|
47
48
|
invalid_document_type: 'Virheellinen asiakirjan tyyppi. Hyväksytyt tiedostomuodot ovat: %{valid_mime_types}'
|
48
49
|
proposal:
|
49
50
|
attributes:
|
50
|
-
|
51
|
+
add_documents:
|
52
|
+
needs_to_be_reattached: Liitettävä uudelleen
|
53
|
+
add_photos:
|
51
54
|
needs_to_be_reattached: Liitettävä uudelleen
|
52
55
|
body:
|
53
56
|
cant_be_equal_to_template: ei voi vastata mallipohjaa
|
@@ -113,9 +116,11 @@ fi-pl:
|
|
113
116
|
proposals:
|
114
117
|
actions:
|
115
118
|
amend: Muokkaa
|
119
|
+
comment: Kommentoi
|
116
120
|
create: Luo
|
117
121
|
endorse: Suosittele
|
118
122
|
vote: Äänestä
|
123
|
+
vote_comment: Äänestä kommenttia
|
119
124
|
withdraw: Peru
|
120
125
|
name: Ehdotukset
|
121
126
|
settings:
|
@@ -711,7 +716,8 @@ fi-pl:
|
|
711
716
|
one: "%{count} ehdotus"
|
712
717
|
other: "%{count} ehdotusta"
|
713
718
|
dynamic_map_instructions:
|
714
|
-
|
719
|
+
description: Koordinaatit päivitetään, kun painat Esikatsele-painiketta. Osoitetekstiä ei muuteta.
|
720
|
+
instructions: Voit siirtää pistettä kartalla.
|
715
721
|
edit:
|
716
722
|
add_documents: Asiakirjat
|
717
723
|
add_images: Tiedosto
|
@@ -783,7 +789,6 @@ fi-pl:
|
|
783
789
|
other: Voit muokata tätä ehdotusta ensimmäisten %{count} minuutin aikana ehdotuksen julkaisemisesta. Kun tämä aikaikkuna sulkeutuu, et pysty muokkaamaan ehdotusta.
|
784
790
|
publish: Julkaise
|
785
791
|
title: Julkaise ehdotuksesi
|
786
|
-
update_position: Päivitä sijainti
|
787
792
|
proposal:
|
788
793
|
creation_date: 'Luontiaika: %{date}'
|
789
794
|
view_proposal: Näytä ehdotus
|
@@ -900,3 +905,7 @@ fi-pl:
|
|
900
905
|
included_proposals:
|
901
906
|
proposal_project: 'Ehdotus sisältyy seuraaviin suunnitelmiin:'
|
902
907
|
proposal_result: 'Ehdotus sisältyy seuraaviin tuloksiin:'
|
908
|
+
statistics:
|
909
|
+
proposals_accepted: Hyväksyttyä ehdotusta
|
910
|
+
proposals_count: Ehdotusta
|
911
|
+
supports_count: Kannatusta
|
data/config/locales/fi.yml
CHANGED
@@ -35,6 +35,7 @@ fi:
|
|
35
35
|
origin_component_id: Osio josta ehdotukset kopioidaan
|
36
36
|
proposals_import:
|
37
37
|
import_proposals: Tuo ehdotuksia
|
38
|
+
keep_answers: Säilytä tilat ja vastaukset
|
38
39
|
keep_authors: Säilytä alkuperäiset laatijat
|
39
40
|
valuation_assignment:
|
40
41
|
admin_log:
|
@@ -47,7 +48,9 @@ fi:
|
|
47
48
|
invalid_document_type: 'Virheellinen asiakirjan tyyppi. Hyväksytyt tiedostomuodot ovat: %{valid_mime_types}'
|
48
49
|
proposal:
|
49
50
|
attributes:
|
50
|
-
|
51
|
+
add_documents:
|
52
|
+
needs_to_be_reattached: Liitettävä uudelleen
|
53
|
+
add_photos:
|
51
54
|
needs_to_be_reattached: Liitettävä uudelleen
|
52
55
|
body:
|
53
56
|
cant_be_equal_to_template: ei voi vastata mallipohjaa
|
@@ -113,9 +116,11 @@ fi:
|
|
113
116
|
proposals:
|
114
117
|
actions:
|
115
118
|
amend: Muokkaa
|
119
|
+
comment: Kommentoi
|
116
120
|
create: Luo
|
117
121
|
endorse: Suosittele
|
118
122
|
vote: Kannata
|
123
|
+
vote_comment: Äänestä kommenttia
|
119
124
|
withdraw: Peru
|
120
125
|
name: Ehdotukset
|
121
126
|
settings:
|
@@ -711,7 +716,8 @@ fi:
|
|
711
716
|
one: "%{count} ehdotus"
|
712
717
|
other: "%{count} ehdotusta"
|
713
718
|
dynamic_map_instructions:
|
714
|
-
|
719
|
+
description: Koordinaatit päivitetään, kun painat Esikatsele-painiketta. Osoitetekstiä ei muuteta.
|
720
|
+
instructions: Voit siirtää pistettä kartalla.
|
715
721
|
edit:
|
716
722
|
add_documents: Asiakirjat
|
717
723
|
add_images: Tiedosto
|
@@ -783,7 +789,6 @@ fi:
|
|
783
789
|
other: Voit muokata tätä ehdotusta ensimmäisten %{count} minuutin aikana ehdotuksen julkaisemisesta. Kun tämä aikaikkuna sulkeutuu, et pysty muokkaamaan ehdotusta.
|
784
790
|
publish: Julkaise
|
785
791
|
title: Julkaise ehdotuksesi
|
786
|
-
update_position: Päivitä sijainti
|
787
792
|
proposal:
|
788
793
|
creation_date: 'Luontiaika: %{date}'
|
789
794
|
view_proposal: Näytä ehdotus
|
@@ -900,3 +905,7 @@ fi:
|
|
900
905
|
included_proposals:
|
901
906
|
proposal_project: 'Ehdotus sisältyy seuraaviin suunnitelmiin:'
|
902
907
|
proposal_result: 'Ehdotus sisältyy seuraaviin tuloksiin:'
|
908
|
+
statistics:
|
909
|
+
proposals_accepted: Hyväksyttyä ehdotusta
|
910
|
+
proposals_count: Ehdotusta
|
911
|
+
supports_count: Kannatusta
|
data/config/locales/fr-CA.yml
CHANGED
@@ -35,6 +35,7 @@ fr-CA:
|
|
35
35
|
origin_component_id: Fonctionnalité dont on veut copier les propositions
|
36
36
|
proposals_import:
|
37
37
|
import_proposals: Importer des propositions
|
38
|
+
keep_answers: Garder l'état et les réponses
|
38
39
|
keep_authors: Gardez les auteurs originaux
|
39
40
|
valuation_assignment:
|
40
41
|
admin_log:
|
@@ -47,7 +48,9 @@ fr-CA:
|
|
47
48
|
invalid_document_type: 'Type de document invalide. Les formats acceptés sont: %{valid_mime_types}'
|
48
49
|
proposal:
|
49
50
|
attributes:
|
50
|
-
|
51
|
+
add_documents:
|
52
|
+
needs_to_be_reattached: Doit être téléchargé de nouveau
|
53
|
+
add_photos:
|
51
54
|
needs_to_be_reattached: Doit être téléchargé de nouveau
|
52
55
|
body:
|
53
56
|
cant_be_equal_to_template: ne peut pas être égal au modèle
|
@@ -113,9 +116,11 @@ fr-CA:
|
|
113
116
|
proposals:
|
114
117
|
actions:
|
115
118
|
amend: Amender
|
119
|
+
comment: Commentaire
|
116
120
|
create: Créer
|
117
121
|
endorse: Soutenir
|
118
122
|
vote: Voter
|
123
|
+
vote_comment: Vote sur le commentaire
|
119
124
|
withdraw: Retirer
|
120
125
|
name: Propositions
|
121
126
|
settings:
|
@@ -707,7 +712,8 @@ fr-CA:
|
|
707
712
|
one: "%{count} proposition"
|
708
713
|
other: "%{count} propositions"
|
709
714
|
dynamic_map_instructions:
|
710
|
-
|
715
|
+
description: Les coordonnées seront mises à jour en cliquant sur le bouton 'Aperçu'. Cependant, l'adresse ne change pas.
|
716
|
+
instructions: Vous pouvez déplacer le point sur la carte.
|
711
717
|
edit:
|
712
718
|
add_documents: Documents
|
713
719
|
add_images: Fichier
|
@@ -779,7 +785,6 @@ fr-CA:
|
|
779
785
|
other: Vous avez la possibilité de modifier cette proposition dans les %{count} minutes suivant sa publication. Une fois ce laps de temps écoulé, vous ne pourrez plus la modifier.
|
780
786
|
publish: Publier
|
781
787
|
title: Publier la proposition
|
782
|
-
update_position: Mettre à jour la position
|
783
788
|
proposal:
|
784
789
|
creation_date: 'Création : %{date}'
|
785
790
|
view_proposal: Voir la proposition
|