decidim-sortitions 0.26.7 → 0.26.8
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/sortitions/admin/sortitions/confirm_destroy.html.erb +1 -0
- data/app/views/decidim/sortitions/admin/sortitions/edit.html.erb +1 -0
- data/app/views/decidim/sortitions/admin/sortitions/index.html.erb +1 -0
- data/app/views/decidim/sortitions/admin/sortitions/new.html.erb +1 -0
- data/app/views/decidim/sortitions/admin/sortitions/show.html.erb +1 -0
- data/config/environment.rb +0 -0
- data/config/locales/el.yml +5 -0
- data/config/locales/es.yml +1 -1
- data/config/locales/eu.yml +66 -66
- data/db/migrate/20181017110803_make_sortitions_authors_polymorphic.rb +20 -9
- data/lib/decidim/sortitions/version.rb +1 -1
- metadata +13 -12
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dc3fd4441364e7bfc790c432acc26c04fa48c8907ccd79d58bd7b7e49a1c3825
|
|
4
|
+
data.tar.gz: 51d2d9f10f4390adf96a38e00365fdb0e8ca8c13496dc59e23b9870e14e76a13
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ca75ef7ce3a9abcdb8001218f1eef2bff9c952f5726fddd8db0384350a41967f538cac4ae2599c2a8b9ed170654a38c9593f38d8a709d84b1bf3e286f4b2c91b
|
|
7
|
+
data.tar.gz: 8b2d26bcdda33076b63eee5d6f91466129b94aeb07b2572d7375f1204e6dc15f4fb9f442045ee43d0dac35087c466036e8c2ab142937a6de2c5fee5ea4ea7a1f
|
|
File without changes
|
data/config/locales/el.yml
CHANGED
|
@@ -19,10 +19,13 @@ el:
|
|
|
19
19
|
decidim:
|
|
20
20
|
components:
|
|
21
21
|
sortitions:
|
|
22
|
+
actions:
|
|
23
|
+
comment: Σχόλιο
|
|
22
24
|
name: Κληρώσεις
|
|
23
25
|
settings:
|
|
24
26
|
global:
|
|
25
27
|
comments_enabled: Τα σχόλια ενεργοποιήθηκαν
|
|
28
|
+
comments_max_length: Μέγιστο μέγεθος σχολίων (Αφήστε το 0 για την προκαθορισμένη τιμή)
|
|
26
29
|
events:
|
|
27
30
|
sortitions:
|
|
28
31
|
sortition_created:
|
|
@@ -143,3 +146,5 @@ el:
|
|
|
143
146
|
count:
|
|
144
147
|
one: 1 κλήρωση
|
|
145
148
|
other: "%{count} κληρώσεις"
|
|
149
|
+
statistics:
|
|
150
|
+
sortitions_count: Κληρώσεις
|
data/config/locales/es.yml
CHANGED
|
@@ -71,7 +71,7 @@ es:
|
|
|
71
71
|
update: Actualizar
|
|
72
72
|
form:
|
|
73
73
|
all_categories: Todas las categorias
|
|
74
|
-
select_proposal_component:
|
|
74
|
+
select_proposal_component: Selecciona el conjunto de propuestas
|
|
75
75
|
title: Nuevo sorteo para propuestas
|
|
76
76
|
index:
|
|
77
77
|
title: Sorteos
|
data/config/locales/eu.yml
CHANGED
|
@@ -2,20 +2,20 @@ eu:
|
|
|
2
2
|
activemodel:
|
|
3
3
|
attributes:
|
|
4
4
|
sortition:
|
|
5
|
-
additional_info:
|
|
6
|
-
decidim_category_id:
|
|
7
|
-
decidim_proposals_component_id:
|
|
8
|
-
dice:
|
|
9
|
-
target_items:
|
|
5
|
+
additional_info: Zozketari buruzko informazioa
|
|
6
|
+
decidim_category_id: Zozketatu nahi duzun proposamen taldearen kategoriak
|
|
7
|
+
decidim_proposals_component_id: Proposamen taldea
|
|
8
|
+
dice: Dadoen emaitza. Bota 6 aldeko dado bat edo bilatu beste eraren bat 1etik 6ra bitarteko ausazko zenbaki bat sortzeko eta sartu hemen zenbaki hori hainbat lekukoren aurrean. Horrek emaitzen ausazkotasunaren kalitatea eta bermea lagunduko ditu
|
|
9
|
+
target_items: Aukeratu nahi duzun proposamen kopurua (adierazitako proposamen taldetik zozketaren bidez aukeratu nahi duzun proposamen kopurua ezarri)
|
|
10
10
|
title: Izenburua
|
|
11
11
|
witnesses: Lekukoak
|
|
12
12
|
models:
|
|
13
|
-
decidim/sortitions/create_sortition_event:
|
|
13
|
+
decidim/sortitions/create_sortition_event: Zozketa
|
|
14
14
|
activerecord:
|
|
15
15
|
models:
|
|
16
16
|
decidim/sortitions/sortition:
|
|
17
|
-
one:
|
|
18
|
-
other:
|
|
17
|
+
one: Zozketa
|
|
18
|
+
other: Zozketak
|
|
19
19
|
decidim:
|
|
20
20
|
components:
|
|
21
21
|
sortitions:
|
|
@@ -25,126 +25,126 @@ eu:
|
|
|
25
25
|
settings:
|
|
26
26
|
global:
|
|
27
27
|
comments_enabled: Iruzkinak gaituta
|
|
28
|
-
comments_max_length: Iruzkinen gehieneko luzera (utzi 0
|
|
28
|
+
comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsitako konfigurazioari eusteko)
|
|
29
29
|
events:
|
|
30
30
|
sortitions:
|
|
31
31
|
sortition_created:
|
|
32
|
-
email_intro: '"%{resource_title}"
|
|
33
|
-
email_outro:
|
|
34
|
-
email_subject:
|
|
35
|
-
notification_title: <a href="%{resource_path}">%{resource_title}</a>
|
|
32
|
+
email_intro: '"%{resource_title}" zozketa jarraitzen ari zaren "%{participatory_space_title}" espazioan gehitu da.'
|
|
33
|
+
email_outro: Jakinarazpen hau jaso duzu "%{participatory_space_title}" jarraitzen ari zarelako. Aurreko estekan sartu jarraitzeari uzteko.
|
|
34
|
+
email_subject: Zozketa berria gehitu da %{participatory_space_title} espaziora
|
|
35
|
+
notification_title: <a href="%{resource_path}">%{resource_title}</a> zozketa %{participatory_space_title} espaziora gehitu da
|
|
36
36
|
sortitions:
|
|
37
37
|
admin:
|
|
38
38
|
actions:
|
|
39
|
-
destroy:
|
|
39
|
+
destroy: Zozketa bertan behera utzi
|
|
40
40
|
edit: Editatu
|
|
41
|
-
new:
|
|
42
|
-
show:
|
|
41
|
+
new: Zozketa berria
|
|
42
|
+
show: Zozketaren xehetasunak
|
|
43
43
|
models:
|
|
44
44
|
sortition:
|
|
45
45
|
fields:
|
|
46
46
|
category: Kategoria
|
|
47
47
|
created_at: Sortze data
|
|
48
|
-
decidim_proposals_component:
|
|
49
|
-
dice:
|
|
48
|
+
decidim_proposals_component: Proposamenen osagaia
|
|
49
|
+
dice: Dadoa
|
|
50
50
|
reference: Erreferentzia
|
|
51
|
-
request_timestamp:
|
|
52
|
-
seed:
|
|
51
|
+
request_timestamp: Zozketa-denbora
|
|
52
|
+
seed: Hazia
|
|
53
53
|
target_items: Aukeratutako elementuak
|
|
54
54
|
title: Izenburua
|
|
55
55
|
name:
|
|
56
|
-
one:
|
|
57
|
-
other:
|
|
56
|
+
one: Zozketa
|
|
57
|
+
other: Zozketak
|
|
58
58
|
sortitions:
|
|
59
59
|
confirm_destroy:
|
|
60
|
-
confirm_destroy: Ziur al zaude hau
|
|
61
|
-
destroy:
|
|
62
|
-
title:
|
|
60
|
+
confirm_destroy: Ziur al zaude zozketa hau bertan behera utzi nahi duzula?
|
|
61
|
+
destroy: Zozketa bertan behera utzi
|
|
62
|
+
title: Zozketa bertan behera utzi
|
|
63
63
|
create:
|
|
64
|
-
error:
|
|
65
|
-
success:
|
|
64
|
+
error: Arazo bat gertatu da zozketa berri bat sortzean.
|
|
65
|
+
success: Zozketa ondo sortu da
|
|
66
66
|
destroy:
|
|
67
|
-
error:
|
|
68
|
-
success:
|
|
67
|
+
error: Zozketa ezin da bertan behera utzi.
|
|
68
|
+
success: Zozketa bertan behera utzi da
|
|
69
69
|
edit:
|
|
70
|
-
title: Eguneratu
|
|
71
|
-
update:
|
|
70
|
+
title: Eguneratu zozketari buruzko informazioa
|
|
71
|
+
update: Eguneratu
|
|
72
72
|
form:
|
|
73
73
|
all_categories: Kategoria guztiak
|
|
74
74
|
select_proposal_component: Aukeratu proposamenen multzoa
|
|
75
|
-
title:
|
|
75
|
+
title: Proposamenen zozketa berria
|
|
76
76
|
index:
|
|
77
|
-
title:
|
|
77
|
+
title: Zozketak
|
|
78
78
|
new:
|
|
79
|
-
confirm:
|
|
79
|
+
confirm: Botoia sakatzean plataformak egun eta ordua (segundu gutxi batzuk gora behera) eta dadoak botatzean ateratako zenbakia gorde egingo ditu ausazko hautaketa bat egiteko. Botoia sakatu ondoren ez dago atzera egiterik eta zozketaren emaitzak zein txantiloi honetan sartutako datuak argitaratu eta ezin izango dira aldatu. Beraz, mesedez, arretaz jarraitu
|
|
80
80
|
create: Sortu
|
|
81
|
-
title:
|
|
81
|
+
title: Zozketa berria
|
|
82
82
|
show:
|
|
83
|
-
selected_proposals:
|
|
83
|
+
selected_proposals: Zozketatzeko aukeratutako proposamenak
|
|
84
84
|
update:
|
|
85
|
-
error:
|
|
86
|
-
success:
|
|
85
|
+
error: Arazo bat sortu da zozketa eguneratzean.
|
|
86
|
+
success: Zozketa zuzen eguneratu da
|
|
87
87
|
admin_log:
|
|
88
88
|
sortition:
|
|
89
|
-
create: "%{user_name} %{resource_name}
|
|
90
|
-
delete: "%{user_name} %{resource_name}
|
|
91
|
-
update: "%{user_name} %{resource_name}
|
|
89
|
+
create: "%{user_name} k %{resource_name} zozketa sortu du %{space_name} espazioan"
|
|
90
|
+
delete: "%{user_name} k %{resource_name} zozketa bertan behera utzi du %{space_name} espazioan"
|
|
91
|
+
update: "%{user_name} k %{resource_name} zozketa eguneratu du %{space_name} espazioan"
|
|
92
92
|
sortitions:
|
|
93
93
|
count:
|
|
94
94
|
proposals_count:
|
|
95
|
-
one: 1
|
|
95
|
+
one: proposamen 1
|
|
96
96
|
other: "%{count} proposamen"
|
|
97
97
|
filters:
|
|
98
98
|
active: Aktiboak
|
|
99
|
-
all:
|
|
99
|
+
all: Guztiak
|
|
100
100
|
cancelled: Bertan behera
|
|
101
101
|
category: Kategoria
|
|
102
102
|
category_prompt: Aukeratu kategoria bat
|
|
103
103
|
search: Bilatu
|
|
104
|
-
state:
|
|
104
|
+
state: Egoera
|
|
105
105
|
filters_small_view:
|
|
106
|
-
close_modal:
|
|
107
|
-
filter:
|
|
108
|
-
filter_by:
|
|
106
|
+
close_modal: Modala itxi
|
|
107
|
+
filter: Filtroa
|
|
108
|
+
filter_by: Honen arabera iragazi
|
|
109
109
|
unfold: Zabaldu
|
|
110
110
|
linked_sortitions:
|
|
111
111
|
selected_proposals: Aukeratutako proposamenak
|
|
112
112
|
orders:
|
|
113
|
-
label: '
|
|
114
|
-
random:
|
|
115
|
-
recent:
|
|
113
|
+
label: 'Zozketak honen arabera ordenatu:'
|
|
114
|
+
random: Ausaz
|
|
115
|
+
recent: Berrienak
|
|
116
116
|
results_count:
|
|
117
117
|
count:
|
|
118
118
|
one: hautatutako proposamena
|
|
119
119
|
other: hautatutako proposamenak
|
|
120
120
|
show:
|
|
121
|
-
algorithm:
|
|
122
|
-
any_category: kategoria
|
|
121
|
+
algorithm: Zozketaren algoritmoaren kodea
|
|
122
|
+
any_category: kategoria guztienak
|
|
123
123
|
back: Itzuli zerrendara
|
|
124
|
-
cancelled:
|
|
125
|
-
candidate_proposal_ids:
|
|
126
|
-
candidate_proposals_info: '
|
|
124
|
+
cancelled: Bertan behera utzitako zozketak
|
|
125
|
+
candidate_proposal_ids: Zozketako proposamenen hurrenkera eta IDak
|
|
126
|
+
candidate_proposals_info: 'Zozketa (%{category_label}) proposamenen artean egin da, honako IDekin (letra lodiz hautatutako proposamenak) '
|
|
127
127
|
category: '%{category} kategoriatik'
|
|
128
|
-
dice_result: "(1)
|
|
129
|
-
introduction: 'Orrialde honek %{reference}
|
|
128
|
+
dice_result: "(1) Dadoen emaitza"
|
|
129
|
+
introduction: 'Orrialde honek %{reference} zozketaren emaitzak ditu. Zozketa honen bidez, %{target_items} emaitza kopurua ausaz eta banaketa probabilistiko berdinarekin aukeratu dira proposamen multzotik. Orri honek, emaitzak ezezik, berme guztiak izateko behar den informazioa ere jaso du. Zozketa honen kalitateak bi gako ditu. Alde batetik, dadoa hainbat lekukoren aurrean bota dela. Bestetik, zozketaren une zehatzean sortu den algoritmoak eman duen ausazko hautaketa. Sailkapenerako hazi-denbora hain da zehatza (segunduak) gizakiak ezin baitu hori kontrolatu. Honi esker, bidezko emaitza bermatzen duen sarrera bikoitz "kontrolaezina" sortzen da. '
|
|
130
130
|
mathematical_result: Emaitza (1) x (2)
|
|
131
|
-
proposals_selected_by_sortition:
|
|
132
|
-
sortition_reproducibility_details:
|
|
131
|
+
proposals_selected_by_sortition: Zozketa bidez aukeratutako proposamenak
|
|
132
|
+
sortition_reproducibility_details: Zozketaren errepikagarritasunaren xehetasunak
|
|
133
133
|
time_seed: "(2) Denbora hazia"
|
|
134
134
|
witnesses: Lekukoak
|
|
135
135
|
sortition:
|
|
136
|
-
random_seed:
|
|
136
|
+
random_seed: Ausazkotasun hazia
|
|
137
137
|
selected_proposals:
|
|
138
138
|
one: Aukeratutako 1 proposamena
|
|
139
|
-
other:
|
|
140
|
-
view:
|
|
139
|
+
other: aukeratutako proposamenak
|
|
140
|
+
view: Ikusi
|
|
141
141
|
sortition_author:
|
|
142
|
-
deleted:
|
|
142
|
+
deleted: Ezabatutako parte-hartailea
|
|
143
143
|
sortition_cancel_author:
|
|
144
|
-
deleted:
|
|
144
|
+
deleted: Ezabatutako parte-hartzailea
|
|
145
145
|
sortitions_count:
|
|
146
146
|
count:
|
|
147
|
-
one: 1
|
|
148
|
-
other: "%{count}
|
|
147
|
+
one: Zozketa 1
|
|
148
|
+
other: "%{count} zozketa"
|
|
149
149
|
statistics:
|
|
150
150
|
sortitions_count: Zozketak
|
|
@@ -1,18 +1,29 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
class MakeSortitionsAuthorsPolymorphic < ActiveRecord::Migration[5.2]
|
|
4
|
+
class User < ApplicationRecord
|
|
5
|
+
self.table_name = :decidim_users
|
|
6
|
+
self.inheritance_column = nil # disable the default inheritance
|
|
7
|
+
|
|
8
|
+
default_scope { where(type: "Decidim::User") }
|
|
9
|
+
end
|
|
10
|
+
|
|
11
|
+
class Sortition < ApplicationRecord
|
|
12
|
+
include Decidim::HasComponent
|
|
13
|
+
|
|
14
|
+
self.table_name = :decidim_sortitions_sortitions
|
|
15
|
+
end
|
|
16
|
+
|
|
4
17
|
def change
|
|
5
18
|
add_column :decidim_sortitions_sortitions, :decidim_author_type, :string
|
|
6
19
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
author
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
sortition.author = author
|
|
15
|
-
sortition.save!
|
|
20
|
+
Sortition.find_each do |sortition|
|
|
21
|
+
author = User.find_by(id: sortition.decidim_author_id) if sortition.decidim_author_id.present?
|
|
22
|
+
author ||= sortition.organization
|
|
23
|
+
sortition.update!(
|
|
24
|
+
decidim_author_type: author.is_a?(User) ? author.type : "Decidim::Organization",
|
|
25
|
+
decidim_author_id: author.id
|
|
26
|
+
)
|
|
16
27
|
end
|
|
17
28
|
|
|
18
29
|
add_index :decidim_sortitions_sortitions,
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: decidim-sortitions
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.26.
|
|
4
|
+
version: 0.26.8
|
|
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: 2023-
|
|
11
|
+
date: 2023-07-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: decidim-admin
|
|
@@ -16,70 +16,70 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 0.26.
|
|
19
|
+
version: 0.26.8
|
|
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.8
|
|
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.8
|
|
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.8
|
|
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.8
|
|
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.8
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: decidim-proposals
|
|
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.8
|
|
62
62
|
type: :runtime
|
|
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.8
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: decidim-dev
|
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
|
72
72
|
requirements:
|
|
73
73
|
- - '='
|
|
74
74
|
- !ruby/object:Gem::Version
|
|
75
|
-
version: 0.26.
|
|
75
|
+
version: 0.26.8
|
|
76
76
|
type: :development
|
|
77
77
|
prerelease: false
|
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
|
79
79
|
requirements:
|
|
80
80
|
- - '='
|
|
81
81
|
- !ruby/object:Gem::Version
|
|
82
|
-
version: 0.26.
|
|
82
|
+
version: 0.26.8
|
|
83
83
|
description: This module makes possible to select amont a set of proposal by sortition
|
|
84
84
|
email:
|
|
85
85
|
- jsperezg@gmail.com
|
|
@@ -145,6 +145,7 @@ files:
|
|
|
145
145
|
- app/views/decidim/sortitions/sortitions/index.js.erb
|
|
146
146
|
- app/views/decidim/sortitions/sortitions/show.html.erb
|
|
147
147
|
- config/assets.rb
|
|
148
|
+
- config/environment.rb
|
|
148
149
|
- config/locales/am-ET.yml
|
|
149
150
|
- config/locales/ar-SA.yml
|
|
150
151
|
- config/locales/ar.yml
|