decidim-budgets 0.8.4 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/app/assets/stylesheets/decidim/budgets/budget/_budget-list.scss +4 -0
- data/app/assets/stylesheets/decidim/budgets/budget/_budget-meter.scss +9 -4
- data/app/assets/stylesheets/decidim/budgets/budget/_progress.scss +3 -1
- data/app/forms/decidim/budgets/admin/project_form.rb +20 -8
- data/app/views/decidim/budgets/admin/projects/_form.html.erb +1 -1
- data/app/views/decidim/budgets/projects/_budget_confirm.html.erb +1 -1
- data/app/views/decidim/budgets/projects/_filters.html.erb +1 -1
- data/app/views/decidim/budgets/projects/_project.html.erb +2 -2
- data/app/views/decidim/budgets/projects/_project_budget_button.html.erb +2 -2
- data/app/views/decidim/budgets/projects/show.html.erb +1 -0
- data/config/locales/ca.yml +0 -3
- data/config/locales/en.yml +0 -2
- data/config/locales/es.yml +4 -7
- data/config/locales/eu.yml +0 -2
- data/config/locales/fi.yml +2 -4
- data/config/locales/fr.yml +2 -4
- data/config/locales/gl.yml +130 -0
- data/config/locales/it.yml +2 -4
- data/config/locales/nl.yml +0 -2
- data/config/locales/pl.yml +0 -2
- data/config/locales/pt-BR.yml +130 -0
- data/config/locales/pt.yml +3 -5
- data/config/locales/ru.yml +0 -2
- data/config/locales/sv.yml +130 -0
- data/config/locales/uk.yml +0 -2
- data/lib/decidim/budgets/feature.rb +1 -1
- data/lib/decidim/budgets/version.rb +1 -1
- metadata +23 -20
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: cd0368cd4ff1c963790f40afdc18c2b9f53dd99500fde8d7f074a9c14f64e339
|
4
|
+
data.tar.gz: dcf520875e8e1744b41f3a65ba7599a62625c24a8cae57887ba03aa16012ae68
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dbdf50453b408f10de968e0eeded3deebb22e03a056a998fbc652c0c2b6880abf1500508e97236561e610100262ca27ff02d67a19176ca0fc7f6159975418175
|
7
|
+
data.tar.gz: 9a9d15b4307b8867cecb7c3f5996cd25f637ddb0d5aec79dbe8c5f7578bd60e48a3e109b03e09f1ae05c5f6c7fe105530f7b87dd4656e885564c12387dd0b40c
|
@@ -3,13 +3,16 @@
|
|
3
3
|
font-size: $global-font-size;
|
4
4
|
}
|
5
5
|
}
|
6
|
+
|
6
7
|
.budget-list__data{
|
7
8
|
flex-basis: 9rem;
|
9
|
+
|
8
10
|
@include breakpoint(medium){
|
9
11
|
flex-direction: row;
|
10
12
|
flex-basis: 16rem;
|
11
13
|
}
|
12
14
|
}
|
15
|
+
|
13
16
|
.budget-list__data--added{
|
14
17
|
background-color: tint($success, 80%);
|
15
18
|
}
|
@@ -18,6 +21,7 @@
|
|
18
21
|
@include breakpoint(medium down){
|
19
22
|
font-size: 1rem;
|
20
23
|
}
|
24
|
+
|
21
25
|
@include breakpoint(medium){
|
22
26
|
flex-grow: 1;
|
23
27
|
font-size: 1.5rem;
|
@@ -5,12 +5,15 @@
|
|
5
5
|
.budget-summary__progressbox{
|
6
6
|
align-items: stretch;
|
7
7
|
margin-bottom: .5rem;
|
8
|
+
|
8
9
|
@include breakpoint(smallmedium down){
|
9
10
|
text-align: center;
|
10
11
|
}
|
12
|
+
|
11
13
|
@include breakpoint(medium){
|
12
14
|
display: flex;
|
13
15
|
}
|
16
|
+
|
14
17
|
.button{
|
15
18
|
margin-bottom: 0;
|
16
19
|
}
|
@@ -23,21 +26,23 @@
|
|
23
26
|
right: 0;
|
24
27
|
z-index: 2;
|
25
28
|
background: $white;
|
26
|
-
box-shadow: 0 2px 7px rgba(black
|
29
|
+
box-shadow: 0 2px 7px rgba(black, .1);
|
27
30
|
display: none;
|
31
|
+
|
28
32
|
&.is-progressbox-visible{
|
29
33
|
display: block;
|
30
34
|
}
|
31
|
-
|
32
35
|
}
|
33
36
|
|
34
37
|
.budget-summary__progressbox--fixed{
|
35
38
|
margin: auto;
|
36
39
|
max-width: $global-width;
|
37
40
|
padding: 1rem 2rem;
|
41
|
+
|
38
42
|
@include breakpoint(mediumlarge){
|
39
43
|
padding: 1rem 4rem;
|
40
44
|
}
|
45
|
+
|
41
46
|
display: flex;
|
42
47
|
}
|
43
48
|
|
@@ -45,6 +50,7 @@
|
|
45
50
|
flex-grow: 1;
|
46
51
|
margin-bottom: .5rem;
|
47
52
|
min-height: 1.5rem;
|
53
|
+
|
48
54
|
@include breakpoint(medium){
|
49
55
|
min-height: 2rem;
|
50
56
|
margin-bottom: 0;
|
@@ -58,9 +64,8 @@
|
|
58
64
|
margin-right: 1rem;
|
59
65
|
}
|
60
66
|
|
61
|
-
|
62
67
|
.budget-progress__meter{
|
63
|
-
min-width:
|
68
|
+
min-width: .1%;
|
64
69
|
}
|
65
70
|
|
66
71
|
.budget-summary__selected{
|
@@ -1,9 +1,11 @@
|
|
1
1
|
//Foundation progress extension
|
2
|
+
|
2
3
|
.progress{
|
3
4
|
position: relative;
|
4
5
|
}
|
6
|
+
|
5
7
|
.progress-meter--minimum{
|
6
|
-
background: repeating-linear-gradient(-55deg, rgba(white,
|
8
|
+
background: repeating-linear-gradient(-55deg, rgba(white, .2), rgba(white, .2) 8px, rgba(black, .03) 8px, rgba(black, .03) 16px);
|
7
9
|
position: absolute;
|
8
10
|
}
|
9
11
|
|
@@ -20,8 +20,11 @@ module Decidim
|
|
20
20
|
validates :description, translatable_presence: true
|
21
21
|
validates :budget, presence: true, numericality: { greater_than: 0 }
|
22
22
|
|
23
|
-
validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
|
24
23
|
validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
|
24
|
+
validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
|
25
|
+
validate { errors.add(:decidim_scope_id, :invalid) if current_participatory_space&.scope && !current_participatory_space&.scope&.ancestor_of?(scope) }
|
26
|
+
|
27
|
+
delegate :categories, to: :current_feature
|
25
28
|
|
26
29
|
def map_model(model)
|
27
30
|
self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
|
@@ -31,20 +34,29 @@ module Decidim
|
|
31
34
|
self.decidim_category_id = model.categorization.decidim_category_id
|
32
35
|
end
|
33
36
|
|
34
|
-
def
|
35
|
-
|
37
|
+
def proposals
|
38
|
+
@proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, current_feature)&.order(title: :asc)&.pluck(:title, :id)
|
36
39
|
end
|
37
40
|
|
38
|
-
|
39
|
-
|
41
|
+
# Finds the Category from the decidim_category_id.
|
42
|
+
#
|
43
|
+
# Returns a Decidim::Category
|
44
|
+
def category
|
45
|
+
@category ||= categories.find_by(id: decidim_category_id)
|
40
46
|
end
|
41
47
|
|
48
|
+
# Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
|
49
|
+
#
|
50
|
+
# Returns a Decidim::Scope
|
42
51
|
def scope
|
43
|
-
@scope ||=
|
52
|
+
@scope ||= @decidim_scope_id ? current_feature.scopes.find_by(id: @decidim_scope_id) : current_participatory_space&.scope
|
44
53
|
end
|
45
54
|
|
46
|
-
|
47
|
-
|
55
|
+
# Scope identifier
|
56
|
+
#
|
57
|
+
# Returns the scope identifier related to the project
|
58
|
+
def decidim_scope_id
|
59
|
+
@decidim_scope_id || scope&.id
|
48
60
|
end
|
49
61
|
end
|
50
62
|
end
|
@@ -18,7 +18,7 @@
|
|
18
18
|
|
19
19
|
<% if current_participatory_space.has_subscopes? %>
|
20
20
|
<div class="row column" >
|
21
|
-
<%= form
|
21
|
+
<%= scopes_picker_field form, :decidim_scope_id %>
|
22
22
|
</div>
|
23
23
|
<% end %>
|
24
24
|
|
@@ -22,7 +22,7 @@
|
|
22
22
|
<p class="text-center"><%= t('.are_you_sure') %></p>
|
23
23
|
<div class="row">
|
24
24
|
<div class="columns medium-8 medium-offset-2">
|
25
|
-
<%= button_to t('.confirm'), checkout_order_path, class: "button expanded" %>
|
25
|
+
<%= button_to t('.confirm'), checkout_order_path, class: "button expanded", data: { disable: true } %>
|
26
26
|
</div>
|
27
27
|
</div>
|
28
28
|
<div class="text-center">
|
@@ -13,7 +13,7 @@
|
|
13
13
|
</div>
|
14
14
|
|
15
15
|
<% if current_participatory_space.has_subscopes? %>
|
16
|
-
<%= form
|
16
|
+
<%= scopes_picker_filter form, :scope_id %>
|
17
17
|
<% end %>
|
18
18
|
|
19
19
|
<% if current_feature.categories.any? %>
|
@@ -15,7 +15,7 @@
|
|
15
15
|
<span class="card--list__data__number budget-list__number">
|
16
16
|
<%= budget_to_currency(project.budget) %>
|
17
17
|
</span>
|
18
|
-
<%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button tiny budget--list__action success" do %>
|
18
|
+
<%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button tiny budget--list__action success" do %>
|
19
19
|
<%= icon("check", class: "icon--small", aria_label: t('.remove'), role: "img") %>
|
20
20
|
<% end %>
|
21
21
|
<% if current_settings.show_votes? %>
|
@@ -29,7 +29,7 @@
|
|
29
29
|
<span class="card--list__data__number budget-list__number">
|
30
30
|
<%= budget_to_currency(project.budget) %>
|
31
31
|
</span>
|
32
|
-
<%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
|
32
|
+
<%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
|
33
33
|
<%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
|
34
34
|
<% end %>
|
35
35
|
<% if current_settings.show_votes? %>
|
@@ -1,8 +1,8 @@
|
|
1
1
|
<% if current_user.present? %>
|
2
2
|
<% if current_order && current_order.projects.include?(project) %>
|
3
|
-
<%= action_authorized_button_to "vote", t('.added'), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
|
3
|
+
<%= action_authorized_button_to "vote", t('.added'), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
|
4
4
|
<% else %>
|
5
|
-
<%= action_authorized_button_to "vote", t('.add'), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
|
5
|
+
<%= action_authorized_button_to "vote", t('.add'), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true, "redirect-url": project_path(project) }, disabled: !current_settings.votes_enabled? || current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
|
6
6
|
<% end %>
|
7
7
|
<% else %>
|
8
8
|
<button class="button expanded button--sc disabled" data-toggle="loginModal"><%= t('.add') %></button>
|
@@ -41,6 +41,7 @@
|
|
41
41
|
<%= render partial: "decidim/shared/tags", locals: { resource: project, tags_class_extra: "tags--project" } %>
|
42
42
|
</div>
|
43
43
|
<%= linked_resources_for project, :proposals, "included_proposals" %>
|
44
|
+
<%= linked_resources_for project, :results, "included_projects" %>
|
44
45
|
</div>
|
45
46
|
</div>
|
46
47
|
|
data/config/locales/ca.yml
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
---
|
2
1
|
ca:
|
3
2
|
activemodel:
|
4
3
|
attributes:
|
@@ -74,8 +73,6 @@ ca:
|
|
74
73
|
filters:
|
75
74
|
category: Categoria
|
76
75
|
category_prompt: Selecciona una categoria
|
77
|
-
scope_prompt: Seleccioneu un àmbit
|
78
|
-
scopes: Àmbits
|
79
76
|
search: Cerca
|
80
77
|
filters_small_view:
|
81
78
|
close_modal: Tancar finestra
|
data/config/locales/en.yml
CHANGED
data/config/locales/es.yml
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
---
|
2
1
|
es:
|
3
2
|
activemodel:
|
4
3
|
attributes:
|
@@ -13,7 +12,7 @@ es:
|
|
13
12
|
budgets:
|
14
13
|
actions:
|
15
14
|
attachments: Archivos adjuntos
|
16
|
-
confirm_destroy:
|
15
|
+
confirm_destroy: '¿Estás seguro de que deseas eliminar este proyecto?'
|
17
16
|
destroy: Borrar
|
18
17
|
edit: Editar
|
19
18
|
new: Nuevo
|
@@ -48,7 +47,7 @@ es:
|
|
48
47
|
title: Título
|
49
48
|
projects:
|
50
49
|
budget_confirm:
|
51
|
-
are_you_sure:
|
50
|
+
are_you_sure: '¿Estás de acuerdo? Una vez que hayas confirmado tu voto, no puedes cambiarlo.'
|
52
51
|
cancel: Cancelar
|
53
52
|
confirm: Confirmar
|
54
53
|
description: Estos son los proyectos que has elegido para formar parte del presupuesto.
|
@@ -59,13 +58,13 @@ es:
|
|
59
58
|
ok: De acuerdo
|
60
59
|
title: Presupuesto excedido
|
61
60
|
budget_summary:
|
62
|
-
are_you_sure:
|
61
|
+
are_you_sure: '¿Estás seguro de que deseas cancelar tu voto?'
|
63
62
|
assigned: 'Asignado:'
|
64
63
|
cancel_order: eliminar tu voto y empezar de nuevo
|
65
64
|
checked_out:
|
66
65
|
description: Ya has votado para el presupuesto. Si has cambiado de idea, puedes %{cancel_link}.
|
67
66
|
title: Voto enviado correctamente
|
68
|
-
description:
|
67
|
+
description: '¿Qué proyectos crees que deberíamos asignar el presupuesto? Asigna por lo menos %{minimum_budget} a los proyectos que desees y vota para definir el presupuesto.'
|
69
68
|
title: Tú decides el presupuesto
|
70
69
|
count:
|
71
70
|
projects_count:
|
@@ -74,8 +73,6 @@ es:
|
|
74
73
|
filters:
|
75
74
|
category: Categoría
|
76
75
|
category_prompt: Selecciona una categoría
|
77
|
-
scope_prompt: Seleccione un ámbito
|
78
|
-
scopes: Ámbitos
|
79
76
|
search: Buscar
|
80
77
|
filters_small_view:
|
81
78
|
close_modal: Cerrar ventana
|
data/config/locales/eu.yml
CHANGED
data/config/locales/fi.yml
CHANGED
@@ -33,7 +33,7 @@ fi:
|
|
33
33
|
update: Päivitä
|
34
34
|
index:
|
35
35
|
finished_orders: Valmiit äänet
|
36
|
-
pending_orders: Odottavat
|
36
|
+
pending_orders: Odottavat äänet
|
37
37
|
title: Projektit
|
38
38
|
new:
|
39
39
|
create: Luo
|
@@ -73,8 +73,6 @@ fi:
|
|
73
73
|
filters:
|
74
74
|
category: Aihepiiri
|
75
75
|
category_prompt: Valitse aihepiiri
|
76
|
-
scope_prompt: Valitse konteksti
|
77
|
-
scopes: Konteksti
|
78
76
|
search: Haku
|
79
77
|
filters_small_view:
|
80
78
|
close_modal: Sulje ikkuna
|
@@ -128,5 +126,5 @@ fi:
|
|
128
126
|
included_proposals:
|
129
127
|
project_proposals: 'Tähän projektiin liittyvät ehdotukset:'
|
130
128
|
index:
|
131
|
-
confirmed_orders_count:
|
129
|
+
confirmed_orders_count: Äänten määrä
|
132
130
|
total_budget: Koko budjetti
|
data/config/locales/fr.yml
CHANGED
@@ -73,8 +73,6 @@ fr:
|
|
73
73
|
filters:
|
74
74
|
category: Catégorie
|
75
75
|
category_prompt: Sélectionner une catégorie
|
76
|
-
scope_prompt: Sélectionnez un périmètre d'application
|
77
|
-
scopes: Zones d'application
|
78
76
|
search: Rechercher
|
79
77
|
filters_small_view:
|
80
78
|
close_modal: Fermer la vue
|
@@ -108,12 +106,12 @@ fr:
|
|
108
106
|
name: Budgets
|
109
107
|
settings:
|
110
108
|
global:
|
111
|
-
announcement:
|
109
|
+
announcement: Message d'annonce
|
112
110
|
comments_enabled: Commentaires activés
|
113
111
|
total_budget: Budget total
|
114
112
|
vote_threshold_percent: Pourcentage de seuil de vote
|
115
113
|
step:
|
116
|
-
announcement:
|
114
|
+
announcement: Message d'annonce
|
117
115
|
comments_blocked: Commentaires bloqués
|
118
116
|
show_votes: Afficher les votes
|
119
117
|
votes_enabled: Votes activés
|
@@ -0,0 +1,130 @@
|
|
1
|
+
gl:
|
2
|
+
activemodel:
|
3
|
+
attributes:
|
4
|
+
project:
|
5
|
+
budget: Orzamento
|
6
|
+
decidim_category_id: Categoría
|
7
|
+
decidim_scope_id: Alcance
|
8
|
+
description: Descrición
|
9
|
+
proposal_ids: Propostas relacionadas
|
10
|
+
title: Título
|
11
|
+
decidim:
|
12
|
+
budgets:
|
13
|
+
actions:
|
14
|
+
attachments: Anexos
|
15
|
+
confirm_destroy: Estás seguro de que queres eliminar este proxecto?
|
16
|
+
destroy: Eliminar
|
17
|
+
edit: Editar
|
18
|
+
new: Novo
|
19
|
+
preview: Vista previa
|
20
|
+
title: Accións
|
21
|
+
admin:
|
22
|
+
models:
|
23
|
+
project:
|
24
|
+
name: Proxecto
|
25
|
+
projects:
|
26
|
+
create:
|
27
|
+
invalid: Produciuse un problema ao crear este proxecto
|
28
|
+
success: O proxecto foi creado con éxito
|
29
|
+
destroy:
|
30
|
+
success: Proxecto destruído con éxito
|
31
|
+
edit:
|
32
|
+
title: Editar proxecto
|
33
|
+
update: Actualización
|
34
|
+
index:
|
35
|
+
finished_orders: Votos rematados
|
36
|
+
pending_orders: Votos pendentes
|
37
|
+
title: Proxectos
|
38
|
+
new:
|
39
|
+
create: Crear
|
40
|
+
title: Novo resultado
|
41
|
+
update:
|
42
|
+
invalid: Produciuse un problema ao actualizar este proxecto
|
43
|
+
success: Proxecto actualizado correctamente
|
44
|
+
models:
|
45
|
+
project:
|
46
|
+
fields:
|
47
|
+
title: Título
|
48
|
+
projects:
|
49
|
+
budget_confirm:
|
50
|
+
are_you_sure: Estás de acordo? Unha vez confirmado o teu voto non podes cambialo.
|
51
|
+
cancel: Cancelar
|
52
|
+
confirm: Confirmar
|
53
|
+
description: Estes son os proxectos que escolleu para formar parte do orzamento.
|
54
|
+
title: Confirmar voto
|
55
|
+
budget_excess:
|
56
|
+
close: Pechar
|
57
|
+
description: Este proxecto supera o orzamento máximo e non se pode engadir. Se o desexa, pode eliminar un proxecto que xa seleccionou para engadir ou facer o seu voto coas súas preferencias.
|
58
|
+
ok: Ok
|
59
|
+
title: O orzamento máximo excedeu
|
60
|
+
budget_summary:
|
61
|
+
are_you_sure: '¿Estás seguro de que queres cancelar o teu voto?'
|
62
|
+
assigned: 'Asignado:'
|
63
|
+
cancel_order: elimine o seu voto e volva comezar
|
64
|
+
checked_out:
|
65
|
+
description: Xa votou polo orzamento. Se mudou de idea, pode %{cancel_link}.
|
66
|
+
title: A votación do orzamento completada
|
67
|
+
description: Que proxectos crees que deberiamos asignar orzamento para? Asigne polo menos %{minimum_budget} aos proxectos que desexe e vote coas súas preferencias para definir o orzamento.
|
68
|
+
title: Vostede decide o orzamento
|
69
|
+
count:
|
70
|
+
projects_count:
|
71
|
+
one: 1 proxecto
|
72
|
+
other: "%{count} proxectos"
|
73
|
+
filters:
|
74
|
+
category: Categoría
|
75
|
+
category_prompt: Selecciona unha categoría
|
76
|
+
search: Busca
|
77
|
+
filters_small_view:
|
78
|
+
close_modal: Pechar modal
|
79
|
+
filter: Filtro
|
80
|
+
filter_by: Filtrar por
|
81
|
+
unfold: Despregar
|
82
|
+
order_progress:
|
83
|
+
vote: Vota
|
84
|
+
order_selected_projects:
|
85
|
+
remove: Quitar
|
86
|
+
selected_projects:
|
87
|
+
one: proxecto seleccionado
|
88
|
+
other: proxectos seleccionados
|
89
|
+
view: Ver
|
90
|
+
project:
|
91
|
+
add: Engadir
|
92
|
+
count:
|
93
|
+
one: 1 apoio
|
94
|
+
other: "%{count} soporta"
|
95
|
+
remove: Quitar
|
96
|
+
project_budget_button:
|
97
|
+
add: Engadir
|
98
|
+
added: Engadido
|
99
|
+
show:
|
100
|
+
budget: Orzamento
|
101
|
+
view_all_projects: Ver todos os proxectos
|
102
|
+
features:
|
103
|
+
budgets:
|
104
|
+
actions:
|
105
|
+
vote: Vota
|
106
|
+
name: Orzamentos
|
107
|
+
settings:
|
108
|
+
global:
|
109
|
+
announcement: Anuncio
|
110
|
+
comments_enabled: Comentarios habilitados
|
111
|
+
total_budget: Orzamento total
|
112
|
+
vote_threshold_percent: Porcentaxe de límite de voto
|
113
|
+
step:
|
114
|
+
announcement: Anuncio
|
115
|
+
comments_blocked: Comentarios bloqueados
|
116
|
+
show_votes: Mostrar votos
|
117
|
+
votes_enabled: Votos habilitados
|
118
|
+
orders:
|
119
|
+
checkout:
|
120
|
+
error: Produciuse un erro ao procesar o teu voto
|
121
|
+
success: O teu voto foi aceptado con éxito
|
122
|
+
destroy:
|
123
|
+
error: Produciuse un erro ao cancelar o teu voto
|
124
|
+
success: O teu voto foi cancelado correctamente
|
125
|
+
resource_links:
|
126
|
+
included_proposals:
|
127
|
+
project_proposals: 'Propostas incluídas neste proxecto:'
|
128
|
+
index:
|
129
|
+
confirmed_orders_count: Reconto de votos
|
130
|
+
total_budget: Orzamento total
|
data/config/locales/it.yml
CHANGED
@@ -32,8 +32,8 @@ it:
|
|
32
32
|
title: Modifica il progetto
|
33
33
|
update: Aggiorna
|
34
34
|
index:
|
35
|
-
finished_orders:
|
36
|
-
pending_orders:
|
35
|
+
finished_orders: Votazione finale
|
36
|
+
pending_orders: Votazione pendente
|
37
37
|
title: Progetti
|
38
38
|
new:
|
39
39
|
create: Crea
|
@@ -73,8 +73,6 @@ it:
|
|
73
73
|
filters:
|
74
74
|
category: Categoria
|
75
75
|
category_prompt: Scegli una categoria
|
76
|
-
scope_prompt: Selezionare un ambito
|
77
|
-
scopes: Visibilità/ambito
|
78
76
|
search: Cerca
|
79
77
|
filters_small_view:
|
80
78
|
close_modal: Chiudi modalità
|
data/config/locales/nl.yml
CHANGED
data/config/locales/pl.yml
CHANGED
@@ -0,0 +1,130 @@
|
|
1
|
+
pt-BR:
|
2
|
+
activemodel:
|
3
|
+
attributes:
|
4
|
+
project:
|
5
|
+
budget: Orçamento
|
6
|
+
decidim_category_id: Categoria
|
7
|
+
decidim_scope_id: Âmbito
|
8
|
+
description: Descrição
|
9
|
+
proposal_ids: Propostas relacionadas
|
10
|
+
title: Título
|
11
|
+
decidim:
|
12
|
+
budgets:
|
13
|
+
actions:
|
14
|
+
attachments: Anexos
|
15
|
+
confirm_destroy: Tem certeza de que deseja excluir esse projeto?
|
16
|
+
destroy: Excluir
|
17
|
+
edit: Editar
|
18
|
+
new: Novo
|
19
|
+
preview: Visualização
|
20
|
+
title: Ações
|
21
|
+
admin:
|
22
|
+
models:
|
23
|
+
project:
|
24
|
+
name: Projeto
|
25
|
+
projects:
|
26
|
+
create:
|
27
|
+
invalid: Tem havido um problema ao criar este projeto
|
28
|
+
success: Projeto criado com sucesso
|
29
|
+
destroy:
|
30
|
+
success: Projeto destruído com sucesso
|
31
|
+
edit:
|
32
|
+
title: Editar projeto
|
33
|
+
update: Actualizar
|
34
|
+
index:
|
35
|
+
finished_orders: Votos finais
|
36
|
+
pending_orders: Votações pendentes
|
37
|
+
title: Projetos
|
38
|
+
new:
|
39
|
+
create: Criar
|
40
|
+
title: Novo resultado
|
41
|
+
update:
|
42
|
+
invalid: Ocorreu um problema ao atualizar este projeto
|
43
|
+
success: Projeto atualizado com sucesso
|
44
|
+
models:
|
45
|
+
project:
|
46
|
+
fields:
|
47
|
+
title: Título
|
48
|
+
projects:
|
49
|
+
budget_confirm:
|
50
|
+
are_you_sure: Você concorda? Depois de confirmar o seu voto, não pode alterá-lo.
|
51
|
+
cancel: Cancelar
|
52
|
+
confirm: confirme
|
53
|
+
description: Estes são os projetos que você escolheu para fazer parte do orçamento.
|
54
|
+
title: Confirmar votação
|
55
|
+
budget_excess:
|
56
|
+
close: Fechar
|
57
|
+
description: Este projeto excede o orçamento máximo e não pode ser adicionado. Se você quiser, você pode excluir um projeto que você já selecionou para adicionar ou fazer seu voto com suas preferências.
|
58
|
+
ok: Está bem
|
59
|
+
title: O orçamento máximo excedeu
|
60
|
+
budget_summary:
|
61
|
+
are_you_sure: Tem certeza de que deseja cancelar o seu voto?
|
62
|
+
assigned: 'Atribuído:'
|
63
|
+
cancel_order: exclua seu voto e comece de novo
|
64
|
+
checked_out:
|
65
|
+
description: Você já votou no orçamento. Se você mudou de idéia, você pode %{cancel_link}.
|
66
|
+
title: Votação do orçamento concluída
|
67
|
+
description: Em que projetos pensa que devemos atribuir orçamento? Atribua pelo menos %{minimum_budget} aos projetos que deseja e vote com suas preferências para definir o orçamento.
|
68
|
+
title: Você decide o orçamento
|
69
|
+
count:
|
70
|
+
projects_count:
|
71
|
+
one: 1 projeto
|
72
|
+
other: "%{count} projetos"
|
73
|
+
filters:
|
74
|
+
category: Categoria
|
75
|
+
category_prompt: Selecione uma categoria
|
76
|
+
search: Pesquisa
|
77
|
+
filters_small_view:
|
78
|
+
close_modal: Fechar modal
|
79
|
+
filter: Filtro
|
80
|
+
filter_by: Filtrar por
|
81
|
+
unfold: Desdobrar
|
82
|
+
order_progress:
|
83
|
+
vote: Voto
|
84
|
+
order_selected_projects:
|
85
|
+
remove: Remover
|
86
|
+
selected_projects:
|
87
|
+
one: projeto selecionado
|
88
|
+
other: projetos selecionados
|
89
|
+
view: Visão
|
90
|
+
project:
|
91
|
+
add: Adicionar
|
92
|
+
count:
|
93
|
+
one: 1 suporte
|
94
|
+
other: "%{count} suporta"
|
95
|
+
remove: Remover
|
96
|
+
project_budget_button:
|
97
|
+
add: Adicionar
|
98
|
+
added: Adicionado
|
99
|
+
show:
|
100
|
+
budget: Despesas
|
101
|
+
view_all_projects: Ver todos os projetos
|
102
|
+
features:
|
103
|
+
budgets:
|
104
|
+
actions:
|
105
|
+
vote: Voto
|
106
|
+
name: Orçamentos
|
107
|
+
settings:
|
108
|
+
global:
|
109
|
+
announcement: Anúncio
|
110
|
+
comments_enabled: Comentários ativados
|
111
|
+
total_budget: Orçamento total
|
112
|
+
vote_threshold_percent: Porcentagem do limiar de voto
|
113
|
+
step:
|
114
|
+
announcement: Anúncio
|
115
|
+
comments_blocked: Comentários bloqueados
|
116
|
+
show_votes: Mostrar votos
|
117
|
+
votes_enabled: Votos ativados
|
118
|
+
orders:
|
119
|
+
checkout:
|
120
|
+
error: Ocorreu um erro ao processar seu voto
|
121
|
+
success: Seu voto foi aceito com sucesso
|
122
|
+
destroy:
|
123
|
+
error: Ocorreu um erro ao cancelar o seu voto
|
124
|
+
success: Seu voto foi cancelado com sucesso
|
125
|
+
resource_links:
|
126
|
+
included_proposals:
|
127
|
+
project_proposals: 'Propostas incluídas neste projeto:'
|
128
|
+
index:
|
129
|
+
confirmed_orders_count: Contagem de votos
|
130
|
+
total_budget: Orçamento total
|
data/config/locales/pt.yml
CHANGED
@@ -4,7 +4,7 @@ pt:
|
|
4
4
|
project:
|
5
5
|
budget: Orçamento
|
6
6
|
decidim_category_id: Categoria
|
7
|
-
decidim_scope_id:
|
7
|
+
decidim_scope_id: Âmbito
|
8
8
|
description: Descrição
|
9
9
|
proposal_ids: Propostas relacionadas
|
10
10
|
title: Título
|
@@ -30,13 +30,13 @@ pt:
|
|
30
30
|
success: Projeto destruído com sucesso
|
31
31
|
edit:
|
32
32
|
title: Editar projeto
|
33
|
-
update:
|
33
|
+
update: Actualizar
|
34
34
|
index:
|
35
35
|
finished_orders: Votos finais
|
36
36
|
pending_orders: Votações pendentes
|
37
37
|
title: Projetos
|
38
38
|
new:
|
39
|
-
create:
|
39
|
+
create: Criar
|
40
40
|
title: Novo resultado
|
41
41
|
update:
|
42
42
|
invalid: Ocorreu um problema ao atualizar este projeto
|
@@ -73,8 +73,6 @@ pt:
|
|
73
73
|
filters:
|
74
74
|
category: Categoria
|
75
75
|
category_prompt: Selecione uma categoria
|
76
|
-
scope_prompt: Selecione um escopo
|
77
|
-
scopes: Escopos
|
78
76
|
search: Pesquisa
|
79
77
|
filters_small_view:
|
80
78
|
close_modal: Fechar modal
|
data/config/locales/ru.yml
CHANGED
@@ -0,0 +1,130 @@
|
|
1
|
+
sv:
|
2
|
+
activemodel:
|
3
|
+
attributes:
|
4
|
+
project:
|
5
|
+
budget: Budget
|
6
|
+
decidim_category_id: Kategori
|
7
|
+
decidim_scope_id: Omfattning
|
8
|
+
description: Beskrivning
|
9
|
+
proposal_ids: Relaterade förslag
|
10
|
+
title: Titel
|
11
|
+
decidim:
|
12
|
+
budgets:
|
13
|
+
actions:
|
14
|
+
attachments: bilagor
|
15
|
+
confirm_destroy: Är du säker på att du vill radera detta projekt?
|
16
|
+
destroy: Radera
|
17
|
+
edit: Redigera
|
18
|
+
new: Ny
|
19
|
+
preview: Förhandsvisning
|
20
|
+
title: Handlingar
|
21
|
+
admin:
|
22
|
+
models:
|
23
|
+
project:
|
24
|
+
name: Projekt
|
25
|
+
projects:
|
26
|
+
create:
|
27
|
+
invalid: Det här har uppstått ett problem
|
28
|
+
success: Projekt skapades med framgång
|
29
|
+
destroy:
|
30
|
+
success: Projektet förstördes framgångsrikt
|
31
|
+
edit:
|
32
|
+
title: Redigera projektet
|
33
|
+
update: Uppdatering
|
34
|
+
index:
|
35
|
+
finished_orders: Avslutade röster
|
36
|
+
pending_orders: Avventer röster
|
37
|
+
title: projekt
|
38
|
+
new:
|
39
|
+
create: Skapa
|
40
|
+
title: Nytt resultat
|
41
|
+
update:
|
42
|
+
invalid: Det har varit ett problem att uppdatera projektet
|
43
|
+
success: Projektet har blivit uppdaterat
|
44
|
+
models:
|
45
|
+
project:
|
46
|
+
fields:
|
47
|
+
title: Titel
|
48
|
+
projects:
|
49
|
+
budget_confirm:
|
50
|
+
are_you_sure: Håller du med? När du har bekräftat din röst kan du inte ändra den.
|
51
|
+
cancel: Annullera
|
52
|
+
confirm: Bekräfta
|
53
|
+
description: Det här är de projekt du valt att vara en del av budgeten.
|
54
|
+
title: Bekräfta omröstning
|
55
|
+
budget_excess:
|
56
|
+
close: Stänga
|
57
|
+
description: Detta projekt överstiger den maximala budgeten och kan inte läggas till. Om du vill kan du ta bort ett projekt som du redan har valt för att lägga till eller göra din röst med dina önskemål.
|
58
|
+
ok: ok
|
59
|
+
title: Maximal budget överskridits
|
60
|
+
budget_summary:
|
61
|
+
are_you_sure: Är du säker på att du vill avbryta din röst?
|
62
|
+
assigned: 'Tilldelat:'
|
63
|
+
cancel_order: ta bort din röst och börja om
|
64
|
+
checked_out:
|
65
|
+
description: Du har redan röstat för budgeten. Om du har ändrat dig kan du %{cancel_link}.
|
66
|
+
title: Budgetröstning slutförd
|
67
|
+
description: Vilka projekt tycker du att vi borde avsätta budget för? Tilldela minst %{minimum_budget} till de projekt du vill ha och rösta med dina preferenser för att definiera budgeten.
|
68
|
+
title: Du bestämmer budgeten
|
69
|
+
count:
|
70
|
+
projects_count:
|
71
|
+
one: 1 projekt
|
72
|
+
other: "%{count} projekt"
|
73
|
+
filters:
|
74
|
+
category: Kategori
|
75
|
+
category_prompt: Välj en kategori
|
76
|
+
search: Sök
|
77
|
+
filters_small_view:
|
78
|
+
close_modal: Stäng modal
|
79
|
+
filter: Filtrera
|
80
|
+
filter_by: Filtrera efter
|
81
|
+
unfold: Veckla ut
|
82
|
+
order_progress:
|
83
|
+
vote: Rösta
|
84
|
+
order_selected_projects:
|
85
|
+
remove: Avlägsna
|
86
|
+
selected_projects:
|
87
|
+
one: projekt valt
|
88
|
+
other: utvalda projekt
|
89
|
+
view: Se
|
90
|
+
project:
|
91
|
+
add: Lägg till
|
92
|
+
count:
|
93
|
+
one: 1 stöd
|
94
|
+
other: "%{count} stöder"
|
95
|
+
remove: Avlägsna
|
96
|
+
project_budget_button:
|
97
|
+
add: Lägg till
|
98
|
+
added: Lagt till
|
99
|
+
show:
|
100
|
+
budget: Budget
|
101
|
+
view_all_projects: Visa alla projekt
|
102
|
+
features:
|
103
|
+
budgets:
|
104
|
+
actions:
|
105
|
+
vote: Rösta
|
106
|
+
name: budgetar
|
107
|
+
settings:
|
108
|
+
global:
|
109
|
+
announcement: Meddelande
|
110
|
+
comments_enabled: Kommentarer aktiverade
|
111
|
+
total_budget: Total budget
|
112
|
+
vote_threshold_percent: Rösta tröskel procent
|
113
|
+
step:
|
114
|
+
announcement: Meddelande
|
115
|
+
comments_blocked: Kommentarer blockerad
|
116
|
+
show_votes: Visa röster
|
117
|
+
votes_enabled: Röster aktiverade
|
118
|
+
orders:
|
119
|
+
checkout:
|
120
|
+
error: Ett fel uppstod när du behandlade din röst
|
121
|
+
success: Din röst har godkänts framgångsrikt
|
122
|
+
destroy:
|
123
|
+
error: Ett fel uppstod när du avbröt din röst
|
124
|
+
success: Din röst har avbrutits framgångsrikt
|
125
|
+
resource_links:
|
126
|
+
included_proposals:
|
127
|
+
project_proposals: 'Förslag som ingår i detta projekt:'
|
128
|
+
index:
|
129
|
+
confirmed_orders_count: Röster räknas
|
130
|
+
total_budget: Total budget
|
data/config/locales/uk.yml
CHANGED
@@ -19,7 +19,7 @@ Decidim.register_feature(:budgets) do |feature|
|
|
19
19
|
resource.template = "decidim/budgets/projects/linked_projects"
|
20
20
|
end
|
21
21
|
|
22
|
-
feature.register_stat :projects_count, primary: true, priority: Decidim::StatsRegistry::
|
22
|
+
feature.register_stat :projects_count, primary: true, priority: Decidim::StatsRegistry::LOW_PRIORITY do |features, start_at, end_at|
|
23
23
|
Decidim::Budgets::FilteredProjects.for(features, start_at, end_at).count
|
24
24
|
end
|
25
25
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-budgets
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.9.0
|
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-
|
13
|
+
date: 2018-02-05 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: decidim-comments
|
@@ -18,99 +18,99 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - '='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.
|
21
|
+
version: 0.9.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
requirements:
|
26
26
|
- - '='
|
27
27
|
- !ruby/object:Gem::Version
|
28
|
-
version: 0.
|
28
|
+
version: 0.9.0
|
29
29
|
- !ruby/object:Gem::Dependency
|
30
30
|
name: decidim-core
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
32
32
|
requirements:
|
33
33
|
- - '='
|
34
34
|
- !ruby/object:Gem::Version
|
35
|
-
version: 0.
|
35
|
+
version: 0.9.0
|
36
36
|
type: :runtime
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
40
|
- - '='
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 0.
|
42
|
+
version: 0.9.0
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: kaminari
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
47
|
- - "~>"
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: 1.0
|
49
|
+
version: '1.0'
|
50
50
|
type: :runtime
|
51
51
|
prerelease: false
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
53
53
|
requirements:
|
54
54
|
- - "~>"
|
55
55
|
- !ruby/object:Gem::Version
|
56
|
-
version: 1.0
|
56
|
+
version: '1.0'
|
57
57
|
- !ruby/object:Gem::Dependency
|
58
58
|
name: searchlight
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
60
60
|
requirements:
|
61
61
|
- - "~>"
|
62
62
|
- !ruby/object:Gem::Version
|
63
|
-
version: 4.1
|
63
|
+
version: '4.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: 4.1
|
70
|
+
version: '4.1'
|
71
71
|
- !ruby/object:Gem::Dependency
|
72
72
|
name: decidim-admin
|
73
73
|
requirement: !ruby/object:Gem::Requirement
|
74
74
|
requirements:
|
75
75
|
- - '='
|
76
76
|
- !ruby/object:Gem::Version
|
77
|
-
version: 0.
|
77
|
+
version: 0.9.0
|
78
78
|
type: :development
|
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.
|
84
|
+
version: 0.9.0
|
85
85
|
- !ruby/object:Gem::Dependency
|
86
86
|
name: decidim-dev
|
87
87
|
requirement: !ruby/object:Gem::Requirement
|
88
88
|
requirements:
|
89
89
|
- - '='
|
90
90
|
- !ruby/object:Gem::Version
|
91
|
-
version: 0.
|
91
|
+
version: 0.9.0
|
92
92
|
type: :development
|
93
93
|
prerelease: false
|
94
94
|
version_requirements: !ruby/object:Gem::Requirement
|
95
95
|
requirements:
|
96
96
|
- - '='
|
97
97
|
- !ruby/object:Gem::Version
|
98
|
-
version: 0.
|
98
|
+
version: 0.9.0
|
99
99
|
- !ruby/object:Gem::Dependency
|
100
100
|
name: decidim-proposals
|
101
101
|
requirement: !ruby/object:Gem::Requirement
|
102
102
|
requirements:
|
103
103
|
- - '='
|
104
104
|
- !ruby/object:Gem::Version
|
105
|
-
version: 0.
|
105
|
+
version: 0.9.0
|
106
106
|
type: :development
|
107
107
|
prerelease: false
|
108
108
|
version_requirements: !ruby/object:Gem::Requirement
|
109
109
|
requirements:
|
110
110
|
- - '='
|
111
111
|
- !ruby/object:Gem::Version
|
112
|
-
version: 0.
|
113
|
-
description: A budgets component for decidim's participatory
|
112
|
+
version: 0.9.0
|
113
|
+
description: A budgets component for decidim's participatory spaces.
|
114
114
|
email:
|
115
115
|
- josepjaume@gmail.com
|
116
116
|
- mrc2407@gmail.com
|
@@ -179,11 +179,14 @@ files:
|
|
179
179
|
- config/locales/eu.yml
|
180
180
|
- config/locales/fi.yml
|
181
181
|
- config/locales/fr.yml
|
182
|
+
- config/locales/gl.yml
|
182
183
|
- config/locales/it.yml
|
183
184
|
- config/locales/nl.yml
|
184
185
|
- config/locales/pl.yml
|
186
|
+
- config/locales/pt-BR.yml
|
185
187
|
- config/locales/pt.yml
|
186
188
|
- config/locales/ru.yml
|
189
|
+
- config/locales/sv.yml
|
187
190
|
- config/locales/uk.yml
|
188
191
|
- db/migrate/20170127114122_create_projects.rb
|
189
192
|
- db/migrate/20170130095615_create_orders.rb
|
@@ -213,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
213
216
|
requirements:
|
214
217
|
- - ">="
|
215
218
|
- !ruby/object:Gem::Version
|
216
|
-
version: 2.3
|
219
|
+
version: '2.3'
|
217
220
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
218
221
|
requirements:
|
219
222
|
- - ">="
|
@@ -221,8 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
221
224
|
version: '0'
|
222
225
|
requirements: []
|
223
226
|
rubyforge_project:
|
224
|
-
rubygems_version: 2.
|
227
|
+
rubygems_version: 2.7.3
|
225
228
|
signing_key:
|
226
229
|
specification_version: 4
|
227
|
-
summary:
|
230
|
+
summary: Decidim budgets module
|
228
231
|
test_files: []
|