decidim-proposals 0.15.0 → 0.15.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb +33 -20
- data/config/locales/ca.yml +2 -2
- data/config/locales/en.yml +1 -1
- data/config/locales/es-PY.yml +2 -2
- data/config/locales/es.yml +2 -2
- data/config/locales/eu.yml +1 -1
- data/config/locales/fi.yml +1 -1
- data/config/locales/fr.yml +3 -3
- data/config/locales/it.yml +2 -2
- data/config/locales/nl.yml +1 -1
- data/config/locales/pt-BR.yml +1 -1
- data/config/locales/ru.yml +0 -1
- data/config/locales/sv.yml +2 -2
- data/config/locales/uk.yml +0 -1
- data/lib/decidim/proposals/version.rb +1 -1
- metadata +18 -18
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9c124c34e344a73c061c7c6a6a6acfb87d7adc18cd0c7f4678751e7a74c7e994
|
4
|
+
data.tar.gz: e0d43142832bfa15f09751440164f575b6b50058eb5f3fe681d49a446e06050f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1dbb0d00bc47e75904487b48a74bb6f7fc4e8025a8198751f9e70ba56e5d00d0385836312a4202796d8acd19a3e175852782b244d7b4cc75c9bbf76a7007b60e
|
7
|
+
data.tar.gz: 21a694d37e86ec18fc01692fa4f7e5b88f775c9ab434e9438d549f00cf2b2a5c65ada2fb81af88da656652daf6ba275efef94d1903b4b2cac0264a0eb4a09963
|
@@ -1,29 +1,42 @@
|
|
1
1
|
<% @proposals.each do |proposal| %>
|
2
|
-
(function() {
|
3
|
-
|
4
|
-
var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');
|
2
|
+
(function() {
|
3
|
+
var $proposalVotesCount = $('#proposal-<%= proposal.id %>-votes-count');
|
5
4
|
|
6
|
-
|
7
|
-
|
8
|
-
}
|
5
|
+
if($proposalVotesCount[0]) {
|
6
|
+
morphdom($proposalVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/votes_count", locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
|
7
|
+
}
|
8
|
+
|
9
|
+
var $proposalVoteButton = $('#proposal-<%= proposal.id %>-vote-button');
|
10
|
+
|
11
|
+
if($proposalVoteButton[0]) {
|
12
|
+
morphdom($proposalVoteButton[0], '<%= j(render partial: "decidim/proposals/proposals/vote_button", locals: { proposal: proposal, from_proposals_list: @from_proposals_list }).strip.html_safe %>');
|
13
|
+
}
|
14
|
+
})();
|
9
15
|
<% end %>
|
10
16
|
|
11
17
|
<% if vote_limit_enabled? %>
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
$
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
18
|
+
(function() {
|
19
|
+
var $remainingVotesCount = $('#remaining-votes-count');
|
20
|
+
var $notVotedButtons = $('.card__button.button').not('.success');
|
21
|
+
|
22
|
+
if(!$remainingVotesCount[0]) { return; }
|
23
|
+
|
24
|
+
morphdom($remainingVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_count").strip.html_safe %>');
|
25
|
+
|
26
|
+
<% if remaining_votes_count_for(current_user) == 0 %>
|
27
|
+
$notVotedButtons.attr('disabled', true);
|
28
|
+
$notVotedButtons.val('<%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %>');
|
29
|
+
<% else %>
|
30
|
+
$notVotedButtons.attr('disabled', false);
|
31
|
+
$notVotedButtons.val('<%= t("decidim.proposals.proposals.vote_button.vote") %>');
|
32
|
+
<% end %>
|
33
|
+
}());
|
24
34
|
<% end %>
|
25
35
|
|
26
36
|
<% if show_voting_rules? %>
|
27
|
-
|
28
|
-
|
37
|
+
(function() {
|
38
|
+
var $votingRules = $('.voting-rules');
|
39
|
+
if(!$votingRules[0]) { return; }
|
40
|
+
morphdom($votingRules[0], '<%= j(render partial: "decidim/proposals/proposals/voting_rules").strip.html_safe %>');
|
41
|
+
}());
|
29
42
|
<% end %>
|
data/config/locales/ca.yml
CHANGED
@@ -550,7 +550,7 @@ ca:
|
|
550
550
|
endorsements_card_row:
|
551
551
|
comments: Comentaris
|
552
552
|
filters:
|
553
|
-
accepted:
|
553
|
+
accepted: Acceptada
|
554
554
|
activity: Activitat
|
555
555
|
all: Tots
|
556
556
|
category: Categoria
|
@@ -560,7 +560,7 @@ ca:
|
|
560
560
|
except_rejected: Totes menys rebutjades
|
561
561
|
official: Oficial
|
562
562
|
origin: Origen
|
563
|
-
rejected:
|
563
|
+
rejected: Rebutjada
|
564
564
|
related_to: Relacionat amb
|
565
565
|
search: Cerca
|
566
566
|
state: Estat
|
data/config/locales/en.yml
CHANGED
@@ -636,7 +636,7 @@ en:
|
|
636
636
|
can_accumulate_supports_beyond_threshold:
|
637
637
|
description: Each proposal can accumulate more than %{limit} supports
|
638
638
|
minimum_votes_per_user:
|
639
|
-
description: You must distribute a minimum of
|
639
|
+
description: You must distribute a minimum of %{votes} votes among different proposals.
|
640
640
|
given_enough_votes: You've given enough supports.
|
641
641
|
supports_remaining: You have to vote %{remaining_votes} more proposals for your votes to be taken into account.
|
642
642
|
proposal_limit:
|
data/config/locales/es-PY.yml
CHANGED
@@ -550,7 +550,7 @@ es-PY:
|
|
550
550
|
endorsements_card_row:
|
551
551
|
comments: Comentarios
|
552
552
|
filters:
|
553
|
-
accepted:
|
553
|
+
accepted: Aceptada
|
554
554
|
activity: Actividad
|
555
555
|
all: Todas
|
556
556
|
category: Categoría
|
@@ -560,7 +560,7 @@ es-PY:
|
|
560
560
|
except_rejected: Todos excepto rechazados
|
561
561
|
official: Oficial
|
562
562
|
origin: Origen
|
563
|
-
rejected:
|
563
|
+
rejected: Rechazada
|
564
564
|
related_to: Relacionado con
|
565
565
|
search: Buscar
|
566
566
|
state: Estado
|
data/config/locales/es.yml
CHANGED
@@ -550,7 +550,7 @@ es:
|
|
550
550
|
endorsements_card_row:
|
551
551
|
comments: Comentarios
|
552
552
|
filters:
|
553
|
-
accepted:
|
553
|
+
accepted: Aceptada
|
554
554
|
activity: Actividad
|
555
555
|
all: Todas
|
556
556
|
category: Categoría
|
@@ -560,7 +560,7 @@ es:
|
|
560
560
|
except_rejected: Todas excepto las rechazadas
|
561
561
|
official: Oficial
|
562
562
|
origin: Origen
|
563
|
-
rejected:
|
563
|
+
rejected: Rechazada
|
564
564
|
related_to: Relacionadas con
|
565
565
|
search: Buscar
|
566
566
|
state: Estado
|
data/config/locales/eu.yml
CHANGED
data/config/locales/fi.yml
CHANGED
data/config/locales/fr.yml
CHANGED
@@ -550,9 +550,9 @@ fr:
|
|
550
550
|
endorsements_card_row:
|
551
551
|
comments: Commentaires
|
552
552
|
filters:
|
553
|
-
accepted:
|
553
|
+
accepted: Retenue
|
554
554
|
activity: Activité
|
555
|
-
all:
|
555
|
+
all: Tout
|
556
556
|
category: Catégorie
|
557
557
|
category_prompt: Sélectionner une catégorie
|
558
558
|
citizens: Propositions citoyennes
|
@@ -560,7 +560,7 @@ fr:
|
|
560
560
|
except_rejected: Toutes sauf les propositions non retenues
|
561
561
|
official: Propositions officielles
|
562
562
|
origin: Auteurs
|
563
|
-
rejected: Non
|
563
|
+
rejected: Non retenue
|
564
564
|
related_to: Liées à
|
565
565
|
search: Rechercher
|
566
566
|
state: État
|
data/config/locales/it.yml
CHANGED
@@ -552,11 +552,11 @@ it:
|
|
552
552
|
filters:
|
553
553
|
accepted: Accettata
|
554
554
|
activity: Attività
|
555
|
-
all:
|
555
|
+
all: Tutti
|
556
556
|
category: Categoria
|
557
557
|
category_prompt: Scegli una categoria
|
558
558
|
citizens: Cittadini
|
559
|
-
evaluating:
|
559
|
+
evaluating: Valutare
|
560
560
|
except_rejected: Tutto tranne rifiutato
|
561
561
|
official: Ufficiale
|
562
562
|
origin: Origine
|
data/config/locales/nl.yml
CHANGED
data/config/locales/pt-BR.yml
CHANGED
data/config/locales/ru.yml
CHANGED
data/config/locales/sv.yml
CHANGED
@@ -552,7 +552,7 @@ sv:
|
|
552
552
|
filters:
|
553
553
|
accepted: Accepterad
|
554
554
|
activity: Aktivitet
|
555
|
-
all:
|
555
|
+
all: Allt
|
556
556
|
category: Kategori
|
557
557
|
category_prompt: Välj en kategori
|
558
558
|
citizens: Medborgare
|
@@ -560,7 +560,7 @@ sv:
|
|
560
560
|
except_rejected: Alla förutom avvisade
|
561
561
|
official: Officiell
|
562
562
|
origin: Ursprung
|
563
|
-
rejected:
|
563
|
+
rejected: Avslaget
|
564
564
|
related_to: Relaterad till
|
565
565
|
search: Sök
|
566
566
|
state: Status
|
data/config/locales/uk.yml
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-proposals
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.15.
|
4
|
+
version: 0.15.1
|
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: 2018-11-
|
13
|
+
date: 2018-11-23 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: acts_as_list
|
@@ -60,28 +60,28 @@ dependencies:
|
|
60
60
|
requirements:
|
61
61
|
- - '='
|
62
62
|
- !ruby/object:Gem::Version
|
63
|
-
version: 0.15.
|
63
|
+
version: 0.15.1
|
64
64
|
type: :runtime
|
65
65
|
prerelease: false
|
66
66
|
version_requirements: !ruby/object:Gem::Requirement
|
67
67
|
requirements:
|
68
68
|
- - '='
|
69
69
|
- !ruby/object:Gem::Version
|
70
|
-
version: 0.15.
|
70
|
+
version: 0.15.1
|
71
71
|
- !ruby/object:Gem::Dependency
|
72
72
|
name: decidim-core
|
73
73
|
requirement: !ruby/object:Gem::Requirement
|
74
74
|
requirements:
|
75
75
|
- - '='
|
76
76
|
- !ruby/object:Gem::Version
|
77
|
-
version: 0.15.
|
77
|
+
version: 0.15.1
|
78
78
|
type: :runtime
|
79
79
|
prerelease: false
|
80
80
|
version_requirements: !ruby/object:Gem::Requirement
|
81
81
|
requirements:
|
82
82
|
- - '='
|
83
83
|
- !ruby/object:Gem::Version
|
84
|
-
version: 0.15.
|
84
|
+
version: 0.15.1
|
85
85
|
- !ruby/object:Gem::Dependency
|
86
86
|
name: kaminari
|
87
87
|
requirement: !ruby/object:Gem::Requirement
|
@@ -144,84 +144,84 @@ dependencies:
|
|
144
144
|
requirements:
|
145
145
|
- - '='
|
146
146
|
- !ruby/object:Gem::Version
|
147
|
-
version: 0.15.
|
147
|
+
version: 0.15.1
|
148
148
|
type: :development
|
149
149
|
prerelease: false
|
150
150
|
version_requirements: !ruby/object:Gem::Requirement
|
151
151
|
requirements:
|
152
152
|
- - '='
|
153
153
|
- !ruby/object:Gem::Version
|
154
|
-
version: 0.15.
|
154
|
+
version: 0.15.1
|
155
155
|
- !ruby/object:Gem::Dependency
|
156
156
|
name: decidim-assemblies
|
157
157
|
requirement: !ruby/object:Gem::Requirement
|
158
158
|
requirements:
|
159
159
|
- - '='
|
160
160
|
- !ruby/object:Gem::Version
|
161
|
-
version: 0.15.
|
161
|
+
version: 0.15.1
|
162
162
|
type: :development
|
163
163
|
prerelease: false
|
164
164
|
version_requirements: !ruby/object:Gem::Requirement
|
165
165
|
requirements:
|
166
166
|
- - '='
|
167
167
|
- !ruby/object:Gem::Version
|
168
|
-
version: 0.15.
|
168
|
+
version: 0.15.1
|
169
169
|
- !ruby/object:Gem::Dependency
|
170
170
|
name: decidim-budgets
|
171
171
|
requirement: !ruby/object:Gem::Requirement
|
172
172
|
requirements:
|
173
173
|
- - '='
|
174
174
|
- !ruby/object:Gem::Version
|
175
|
-
version: 0.15.
|
175
|
+
version: 0.15.1
|
176
176
|
type: :development
|
177
177
|
prerelease: false
|
178
178
|
version_requirements: !ruby/object:Gem::Requirement
|
179
179
|
requirements:
|
180
180
|
- - '='
|
181
181
|
- !ruby/object:Gem::Version
|
182
|
-
version: 0.15.
|
182
|
+
version: 0.15.1
|
183
183
|
- !ruby/object:Gem::Dependency
|
184
184
|
name: decidim-dev
|
185
185
|
requirement: !ruby/object:Gem::Requirement
|
186
186
|
requirements:
|
187
187
|
- - '='
|
188
188
|
- !ruby/object:Gem::Version
|
189
|
-
version: 0.15.
|
189
|
+
version: 0.15.1
|
190
190
|
type: :development
|
191
191
|
prerelease: false
|
192
192
|
version_requirements: !ruby/object:Gem::Requirement
|
193
193
|
requirements:
|
194
194
|
- - '='
|
195
195
|
- !ruby/object:Gem::Version
|
196
|
-
version: 0.15.
|
196
|
+
version: 0.15.1
|
197
197
|
- !ruby/object:Gem::Dependency
|
198
198
|
name: decidim-meetings
|
199
199
|
requirement: !ruby/object:Gem::Requirement
|
200
200
|
requirements:
|
201
201
|
- - '='
|
202
202
|
- !ruby/object:Gem::Version
|
203
|
-
version: 0.15.
|
203
|
+
version: 0.15.1
|
204
204
|
type: :development
|
205
205
|
prerelease: false
|
206
206
|
version_requirements: !ruby/object:Gem::Requirement
|
207
207
|
requirements:
|
208
208
|
- - '='
|
209
209
|
- !ruby/object:Gem::Version
|
210
|
-
version: 0.15.
|
210
|
+
version: 0.15.1
|
211
211
|
- !ruby/object:Gem::Dependency
|
212
212
|
name: decidim-participatory_processes
|
213
213
|
requirement: !ruby/object:Gem::Requirement
|
214
214
|
requirements:
|
215
215
|
- - '='
|
216
216
|
- !ruby/object:Gem::Version
|
217
|
-
version: 0.15.
|
217
|
+
version: 0.15.1
|
218
218
|
type: :development
|
219
219
|
prerelease: false
|
220
220
|
version_requirements: !ruby/object:Gem::Requirement
|
221
221
|
requirements:
|
222
222
|
- - '='
|
223
223
|
- !ruby/object:Gem::Version
|
224
|
-
version: 0.15.
|
224
|
+
version: 0.15.1
|
225
225
|
description: A proposals component for decidim's participatory spaces.
|
226
226
|
email:
|
227
227
|
- josepjaume@gmail.com
|