decidim-consultations 0.26.0.rc2 → 0.26.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/concerns/decidim/consultations/needs_consultation.rb +1 -1
- data/app/controllers/concerns/decidim/consultations/needs_question.rb +3 -1
- data/app/models/decidim/consultations/question.rb +1 -0
- data/app/views/decidim/consultations/questions/show.html.erb +4 -4
- data/app/views/layouts/decidim/_question_components.html.erb +19 -34
- data/app/views/layouts/decidim/_question_header.html.erb +2 -2
- data/config/locales/ar.yml +13 -1
- data/config/locales/ca.yml +0 -1
- data/config/locales/cs.yml +0 -1
- data/config/locales/de.yml +1 -1
- data/config/locales/el.yml +0 -1
- data/config/locales/en.yml +0 -1
- data/config/locales/es-MX.yml +0 -1
- data/config/locales/es-PY.yml +0 -1
- data/config/locales/es.yml +0 -1
- data/config/locales/eu.yml +0 -1
- data/config/locales/fi-plain.yml +0 -1
- data/config/locales/fi.yml +0 -1
- data/config/locales/fr-CA.yml +0 -1
- data/config/locales/fr.yml +0 -1
- data/config/locales/ga-IE.yml +0 -4
- data/config/locales/gl.yml +0 -1
- data/config/locales/hu.yml +0 -1
- data/config/locales/id-ID.yml +0 -1
- data/config/locales/is-IS.yml +0 -1
- data/config/locales/it.yml +0 -1
- data/config/locales/ja.yml +0 -1
- data/config/locales/lb.yml +0 -1
- data/config/locales/lv.yml +0 -1
- data/config/locales/nl.yml +0 -1
- data/config/locales/no.yml +9 -1
- data/config/locales/pl.yml +0 -1
- data/config/locales/pt-BR.yml +0 -1
- data/config/locales/pt.yml +0 -1
- data/config/locales/ro-RO.yml +0 -1
- data/config/locales/ru.yml +0 -1
- data/config/locales/sk.yml +0 -1
- data/config/locales/sv.yml +0 -1
- data/config/locales/tr-TR.yml +0 -1
- data/config/locales/uk.yml +0 -1
- data/config/locales/zh-CN.yml +0 -1
- data/lib/decidim/consultations/version.rb +1 -1
- metadata +12 -12
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 36e83e1093f23673048618259e416d511410b51ff07ef504fff36b1011f4b732
|
4
|
+
data.tar.gz: c767572a5560e95927fd076f91250193f2fe82111286b56f11d24f09aff816fd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c66328041708960eb979b00304fcd17d067491d9b9065472b3695821f06706ca833ac32e15eedec50addbd74bfed9f57a39464c92b4b895a42d0e12e857a1edd
|
7
|
+
data.tar.gz: 58b20e8996a0f024aada27e4fd0b3dac570b3947d85c519147ae7090374ef1cce7b890c124f51f9fe32cca60ed73b773451531ae7b3377beabdf8a916950e779
|
@@ -38,7 +38,7 @@ module Decidim
|
|
38
38
|
|
39
39
|
def detect_consultation
|
40
40
|
request.env["current_consultation"] ||
|
41
|
-
organization_consultations.find_by(slug: params[:consultation_slug] || params[:slug])
|
41
|
+
organization_consultations.find_by!(slug: params[:consultation_slug] || params[:slug])
|
42
42
|
end
|
43
43
|
|
44
44
|
def organization_consultations
|
@@ -82,8 +82,10 @@ module Decidim
|
|
82
82
|
private
|
83
83
|
|
84
84
|
def detect_question
|
85
|
+
return unless request.env["current_question"] || params[:question_slug] || params[:slug]
|
86
|
+
|
85
87
|
request.env["current_question"] ||
|
86
|
-
OrganizationQuestions.for(current_organization).find_by(slug: params[:question_slug] || params[:slug])
|
88
|
+
OrganizationQuestions.for(current_organization).find_by!(slug: params[:question_slug] || params[:slug])
|
87
89
|
end
|
88
90
|
|
89
91
|
def detect_consultation
|
@@ -40,17 +40,17 @@
|
|
40
40
|
|
41
41
|
<div class="columns medium-5">
|
42
42
|
<% unless translated_attribute(current_question.origin_scope).blank? %>
|
43
|
-
<
|
43
|
+
<h3 class="heading6"><%= t "question.origin_scope", scope: "activemodel.attributes" %></h3>
|
44
44
|
<p><%= translated_attribute current_question.origin_scope %></p>
|
45
45
|
<% end %>
|
46
46
|
|
47
|
-
<
|
47
|
+
<h3 class="heading6"><%= t "question.promoter_group", scope: "activemodel.attributes" %></h3>
|
48
48
|
<p><%= translated_attribute current_question.promoter_group %></p>
|
49
49
|
|
50
|
-
<
|
50
|
+
<h3 class="heading6"><%= t "question.scope", scope: "activemodel.attributes" %></h3>
|
51
51
|
<p><%= translated_attribute current_question.scope.name %></p>
|
52
52
|
|
53
|
-
<
|
53
|
+
<h3 class="heading6"><%= t "question.participatory_scope", scope: "activemodel.attributes" %></h3>
|
54
54
|
<p><%= translated_attribute current_question.participatory_scope %></p>
|
55
55
|
</div>
|
56
56
|
</div>
|
@@ -1,36 +1,21 @@
|
|
1
|
-
<div class="row column">
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
<span class="process-nav__link">
|
6
|
-
<% if self.try(:current_component) %>
|
7
|
-
<%= component_icon(current_component) %>
|
8
|
-
<%= translated_attribute(current_component.name) %>
|
9
|
-
<% else %>
|
10
|
-
<%= external_icon "media/images/decidim_pages.svg", role: "img", "aria-hidden": true %>
|
11
|
-
<%= t ".question_menu_item" %>
|
12
|
-
<% end %>
|
13
|
-
</span>
|
14
|
-
</button>
|
1
|
+
<div class="row column consultations-nav">
|
2
|
+
<%
|
3
|
+
components = question.components.published.or(Decidim::Component.where(id: self.try(:current_component)))
|
4
|
+
%>
|
15
5
|
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
active: is_active_link?(main_component_path(component), :inclusive)
|
32
|
-
}
|
33
|
-
end)
|
34
|
-
%>
|
35
|
-
</div>
|
6
|
+
<%=
|
7
|
+
extended_navigation_bar([
|
8
|
+
{
|
9
|
+
name: t(".question_menu_item"),
|
10
|
+
url: decidim_consultations.question_path(question),
|
11
|
+
active: is_active_link?(decidim_consultations.question_path(question), :exclusive)
|
12
|
+
}
|
13
|
+
] + components.map do |component|
|
14
|
+
{
|
15
|
+
name: translated_attribute(component.name),
|
16
|
+
url: main_component_path(component),
|
17
|
+
active: is_active_link?(main_component_path(component), :inclusive)
|
18
|
+
}
|
19
|
+
end)
|
20
|
+
%>
|
36
21
|
</div>
|
@@ -23,10 +23,10 @@
|
|
23
23
|
<%= yield :question_header_instructions if content_for? :question_header_instructions %>
|
24
24
|
|
25
25
|
<div class="row column consultations-title">
|
26
|
-
<
|
26
|
+
<h2 class="heading2"><%= decidim_sanitize translated_attribute question.title %></h2>
|
27
27
|
<% unless question.hashtag.blank? %>
|
28
28
|
<div class="text-center">
|
29
|
-
<%= link_to "##{question.hashtag}",
|
29
|
+
<%= link_to "##{question.hashtag}", twitter_hashtag_url(question.hashtag), target: "_blank" %>
|
30
30
|
</div>
|
31
31
|
<% end %>
|
32
32
|
|
data/config/locales/ar.yml
CHANGED
@@ -37,6 +37,11 @@ ar:
|
|
37
37
|
response:
|
38
38
|
decidim_consultations_response_group_id: الفريق
|
39
39
|
errors:
|
40
|
+
models:
|
41
|
+
question:
|
42
|
+
attributes:
|
43
|
+
max_votes:
|
44
|
+
lower_than_min: يجب أن يكون الحد الأقصى لعدد الأصوات أعلى أو يساوي الحد الأدنى.
|
40
45
|
vote:
|
41
46
|
decidim_consultations_response_id:
|
42
47
|
not_found: الرد غير موجود.
|
@@ -85,6 +90,7 @@ ar:
|
|
85
90
|
new_response: استجابة جديدة
|
86
91
|
new_response_group: فريق جديد
|
87
92
|
publish_results: نشر النتائج
|
93
|
+
response_groups: إدارة مجموعات الاستجابة
|
88
94
|
unpublish_results: نتائج غير منشورة
|
89
95
|
consultation_publications:
|
90
96
|
create:
|
@@ -248,6 +254,8 @@ ar:
|
|
248
254
|
label: 'ترتيب المشاورات حسب:'
|
249
255
|
random: عشوائية
|
250
256
|
recent: الأحدث
|
257
|
+
show:
|
258
|
+
dates: التواريخ
|
251
259
|
content_blocks:
|
252
260
|
highlighted_consultations:
|
253
261
|
name: مشاورات أبرزت
|
@@ -359,24 +367,28 @@ ar:
|
|
359
367
|
verification_required: تحقق من حسابك قبل التصويت
|
360
368
|
vote: تصويت
|
361
369
|
vote_modal:
|
370
|
+
close_modal: اغلاق النموذج
|
362
371
|
contextual_help: من فضلك ، حدد خيار.
|
363
372
|
title: 'التشاور: التصويت السؤال'
|
364
373
|
vote_modal_confirm:
|
365
374
|
change: يتغيرون
|
375
|
+
close_modal: اغلاق النموذج
|
366
376
|
confirm: تؤكد
|
367
377
|
contextual_help: يرجى تأكيد الخيار المحدد.
|
368
378
|
title: 'التشاور: تأكيد التصويت'
|
369
379
|
resources:
|
370
380
|
consultations:
|
371
381
|
actions:
|
382
|
+
comment: تعليق
|
372
383
|
vote: صوِّت
|
384
|
+
statistics:
|
385
|
+
votes_count: الأصوات
|
373
386
|
layouts:
|
374
387
|
decidim:
|
375
388
|
consultation_voting_data:
|
376
389
|
start_voting_date: يبدأ التصويت
|
377
390
|
question_components:
|
378
391
|
question_menu_item: السؤال
|
379
|
-
unfold: كشف
|
380
392
|
question_header:
|
381
393
|
back_to_consultation: انظر جميع المشاورات
|
382
394
|
back_to_question: العودة إلى السؤال
|
data/config/locales/ca.yml
CHANGED
data/config/locales/cs.yml
CHANGED
data/config/locales/de.yml
CHANGED
@@ -359,6 +359,7 @@ de:
|
|
359
359
|
resources:
|
360
360
|
consultations:
|
361
361
|
actions:
|
362
|
+
comment: Kommentar
|
362
363
|
vote: Abstimmung
|
363
364
|
statistics:
|
364
365
|
consultations_count: Beratungen
|
@@ -369,7 +370,6 @@ de:
|
|
369
370
|
start_voting_date: Die Abstimmung beginnt
|
370
371
|
question_components:
|
371
372
|
question_menu_item: Die Frage
|
372
|
-
unfold: Entfalten
|
373
373
|
question_header:
|
374
374
|
back_to_consultation: Sehen Sie alle Konsultationen
|
375
375
|
back_to_question: Zurück zur Frage
|
data/config/locales/el.yml
CHANGED
data/config/locales/en.yml
CHANGED
data/config/locales/es-MX.yml
CHANGED
data/config/locales/es-PY.yml
CHANGED
data/config/locales/es.yml
CHANGED
data/config/locales/eu.yml
CHANGED
data/config/locales/fi-plain.yml
CHANGED
data/config/locales/fi.yml
CHANGED
data/config/locales/fr-CA.yml
CHANGED
data/config/locales/fr.yml
CHANGED
data/config/locales/ga-IE.yml
CHANGED
data/config/locales/gl.yml
CHANGED
data/config/locales/hu.yml
CHANGED
data/config/locales/id-ID.yml
CHANGED
data/config/locales/is-IS.yml
CHANGED
data/config/locales/it.yml
CHANGED
data/config/locales/ja.yml
CHANGED
data/config/locales/lb.yml
CHANGED
data/config/locales/lv.yml
CHANGED
data/config/locales/nl.yml
CHANGED
data/config/locales/no.yml
CHANGED
@@ -94,6 +94,7 @@
|
|
94
94
|
create:
|
95
95
|
error: Det oppstod et problem med å lage en ny konsultasjon.
|
96
96
|
success: Konsultasjonen ble opprettet.
|
97
|
+
deprecation_warning: Konsultasjonsmodulen vil bli avviklet i nær fremtid. Vi arbeider med den neste kryptografiske sikre versjonen kalt avstemminger.
|
97
98
|
edit:
|
98
99
|
update: Oppdater
|
99
100
|
form:
|
@@ -320,6 +321,8 @@
|
|
320
321
|
help:
|
321
322
|
participatory_spaces:
|
322
323
|
consultations:
|
324
|
+
contextual: "<p>En <strong>konsultasjon</strong> er et rom som tillater deg å stille et klart spørsmål til alle som danner en organisasjon, be om deltakelse i konsultasjonen, opprette og opprettholde en debatt for eller mot et svar. Når høringsdatoen kommer, kan du stemme og offentliggjøre resultatene av stemmene.</p> <p>Eksempler: Konsultasjonene kan dreie seg om nesten ethvert aspekt som berører en organisasjon: noen eksempler er å endre navnet eller logoen til organisasjonen som tilbyr flere alternativer, bestemmer Ja eller Nei for å bli en del av en større organisasjon, validerer eller avviser en ny strategisk plan eller resultatet av en arbeidsgruppe, eller definere om stillingene skal forbli maksimalt 1, 2 eller 3 mandater.</p>\n"
|
325
|
+
page: "<p>En <strong>konsultasjon</strong> er et rom som tillater deg å stille et klart spørsmål til alle som danner en organisasjon, be om deltakelse i konsultasjonen, opprette og opprettholde en debatt for eller mot et svar. Når høringsdatoen kommer, kan du stemme og offentliggjøre resultatene av stemmene.</p> <p>Eksempler: Konsultasjonene kan dreie seg om nesten ethvert aspekt som berører en organisasjon: noen eksempler er å endre navnet eller logoen til organisasjonen som tilbyr flere alternativer, bestemmer Ja eller Nei for å bli en del av en større organisasjon, validerer eller avviser en ny strategisk plan eller resultatet av en arbeidsgruppe, eller definere om stillingene skal forbli maksimalt 1, 2 eller 3 mandater i organisasjonen.</p>\n"
|
323
326
|
title: Hva er konsultasjoner?
|
324
327
|
menu:
|
325
328
|
consultations: Konsultasjoner
|
@@ -344,24 +347,29 @@
|
|
344
347
|
verification_required: Verifiser kontoen din for å stemme
|
345
348
|
vote: Stemme
|
346
349
|
vote_modal:
|
350
|
+
close_modal: Lukk dialogboks
|
347
351
|
contextual_help: Vennligst velg et alternativ.
|
348
352
|
title: 'Konsultasjon: spørsmål stemme'
|
349
353
|
vote_modal_confirm:
|
350
354
|
change: Endre
|
355
|
+
close_modal: Lukk dialogboks
|
351
356
|
confirm: Bekreft
|
352
357
|
contextual_help: Bekreft det valgte alternativet.
|
353
358
|
title: 'Konsultasjon: bekreft stemme'
|
354
359
|
resources:
|
355
360
|
consultations:
|
356
361
|
actions:
|
362
|
+
comment: Kommenter
|
357
363
|
vote: Stemme
|
364
|
+
statistics:
|
365
|
+
consultations_count: Konsultasjoner
|
366
|
+
votes_count: Stemmer
|
358
367
|
layouts:
|
359
368
|
decidim:
|
360
369
|
consultation_voting_data:
|
361
370
|
start_voting_date: Stemming begynner
|
362
371
|
question_components:
|
363
372
|
question_menu_item: Spørsmålet
|
364
|
-
unfold: Åpne
|
365
373
|
question_header:
|
366
374
|
back_to_consultation: Se alle konsultasjonene
|
367
375
|
back_to_question: Tilbake til spørsmålet
|
data/config/locales/pl.yml
CHANGED
data/config/locales/pt-BR.yml
CHANGED
data/config/locales/pt.yml
CHANGED
data/config/locales/ro-RO.yml
CHANGED
data/config/locales/ru.yml
CHANGED
data/config/locales/sk.yml
CHANGED
data/config/locales/sv.yml
CHANGED
data/config/locales/tr-TR.yml
CHANGED
data/config/locales/uk.yml
CHANGED
data/config/locales/zh-CN.yml
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-consultations
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.26.
|
4
|
+
version: 0.26.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Juan Salvador Perez Garcia
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-06-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: decidim-admin
|
@@ -16,56 +16,56 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.26.
|
19
|
+
version: 0.26.2
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.26.
|
26
|
+
version: 0.26.2
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: decidim-comments
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.26.
|
33
|
+
version: 0.26.2
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 0.26.
|
40
|
+
version: 0.26.2
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: decidim-core
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - '='
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 0.26.
|
47
|
+
version: 0.26.2
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - '='
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 0.26.
|
54
|
+
version: 0.26.2
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: decidim-dev
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - '='
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 0.26.
|
61
|
+
version: 0.26.2
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - '='
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: 0.26.
|
68
|
+
version: 0.26.2
|
69
69
|
description: Extends Decidim adding a first level public consultation component
|
70
70
|
email:
|
71
71
|
- jsperezg@gmail.com
|
@@ -380,9 +380,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
380
380
|
version: '2.7'
|
381
381
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
382
382
|
requirements:
|
383
|
-
- - "
|
383
|
+
- - ">="
|
384
384
|
- !ruby/object:Gem::Version
|
385
|
-
version:
|
385
|
+
version: '0'
|
386
386
|
requirements: []
|
387
387
|
rubygems_version: 3.1.6
|
388
388
|
signing_key:
|