decidim-accountability 0.18.0 → 0.18.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/services/decidim/accountability/diff_renderer.rb +2 -69
  3. data/config/locales/de.yml +3 -0
  4. data/config/locales/fr.yml +16 -16
  5. data/config/locales/it.yml +1 -1
  6. data/config/locales/no.yml +5 -0
  7. data/lib/decidim/accountability/version.rb +1 -1
  8. metadata +22 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ec65eebf74952fad67ae19dd90d482eaea5292e340c2105ceadce040bab759ca
4
- data.tar.gz: f5f3e1b7ecd4c62d17bbec2b321c18826afbc95f7e3f3ccaff61f7df9ad51d4a
3
+ metadata.gz: edc52619e4fa6c53efd44902f73fcf0352744e4cefb4ff5f4fd5f0a60fb3abcb
4
+ data.tar.gz: 33d1253c2bf3efcd48dd8e4508012141be244d624dce540b3d883b222022823a
5
5
  SHA512:
6
- metadata.gz: 728776d0e2834f8aee9e3e10fbfa2e37aceefa41c9e92bd7d8003bde99a49747ceeea5be6c3f4f2c431e54b50ad44e7d307cef5bd798a2110fab2dc202479db1
7
- data.tar.gz: 1f15a22e74fc4539e9b3b735d3555b2363b912228406453cc102ff3d5441deebe433504cf3cd25b99ff7a20da0e114e31770ff0c4e9274d0546d45f66b1faa86
6
+ metadata.gz: db6cbbaa5841bfdc04a817e88f16b3272057e11c6cba7d617c36deb277ed8771a91e9a0e924018cd2172c2d738f8d394503a38c8c62b1b89f134ad6c8337b93e
7
+ data.tar.gz: caca7cc3c3cc133123a5d7f651c5bdbe5d619bb55ec5245c99a95c20292eb69879ff78308a2c03d3036998cf43b8e3914f12505e442c50ebf53cf757ab9fdc74
data/app/services/decidim/accountability/diff_renderer.rb CHANGED
@@ -2,34 +2,10 @@
2
2
 
3
3
  module Decidim
4
4
  module Accountability
5
- class DiffRenderer
6
- def initialize(version)
7
- @version = version
8
- end
9
-
10
- # Renders the diff of the given changeset. Takes into account translatable fields.
11
- #
12
- # Returns a Hash, where keys are the fields that have changed and values are an
13
- # array, the first element being the previous value and the last being the new one.
14
- def diff
15
- version.changeset.inject({}) do |diff, (attribute, values)|
16
- attribute = attribute.to_sym
17
- type = attribute_types[attribute]
18
-
19
- if type.blank?
20
- diff
21
- else
22
- parse_changeset(attribute, values, type, diff)
23
- end
24
- end
25
- end
26
-
5
+ class DiffRenderer < BaseDiffRenderer
27
6
  private
28
7
 
29
- attr_reader :version
30
-
31
- # Lists which attributes will be diffable and how
32
- # they should be rendered.
8
+ # Lists which attributes will be diffable and how they should be rendered.
33
9
  def attribute_types
34
10
  {
35
11
  start_date: :date,
@@ -40,49 +16,6 @@ module Decidim
40
16
  progress: :percentage
41
17
  }
42
18
  end
43
-
44
- def parse_i18n_changeset(attribute, values, type, diff)
45
- values.last.each_key do |locale, _value|
46
- first_value = values.first.try(:[], locale)
47
- last_value = values.last.try(:[], locale)
48
- next if first_value == last_value
49
-
50
- attribute_locale = "#{attribute}_#{locale}".to_sym
51
- diff.update(
52
- attribute_locale => {
53
- type: type,
54
- label: generate_i18n_label(attribute, locale),
55
- old_value: first_value,
56
- new_value: last_value
57
- }
58
- )
59
- end
60
- diff
61
- end
62
-
63
- def parse_changeset(attribute, values, type, diff)
64
- return parse_i18n_changeset(attribute, values, type, diff) if [:i18n, :i18n_html].include?(type)
65
-
66
- diff.update(
67
- attribute => {
68
- type: type,
69
- label: I18n.t(attribute, scope: "activemodel.attributes.result"),
70
- old_value: values[0],
71
- new_value: values[1]
72
- }
73
- )
74
- end
75
-
76
- def generate_i18n_label(attribute, locale)
77
- label = I18n.t(attribute, scope: "activemodel.attributes.result")
78
- locale_name = if I18n.available_locales.include?(locale.to_sym)
79
- I18n.t("locale.name", locale: locale)
80
- else
81
- locale
82
- end
83
-
84
- "#{label} (#{locale_name})"
85
- end
86
19
  end
87
20
  end
88
21
  end
data/config/locales/de.yml CHANGED
@@ -216,6 +216,9 @@ de:
216
216
  participatory_process_groups:
217
217
  highlighted_results:
218
218
  results: Ergebnisse
219
+ participatory_spaces:
220
+ highlighted_results:
221
+ see_all: Alle anzeigen (%{count})
219
222
  resource_links:
220
223
  included_projects:
221
224
  result_project: Projekte in diesem Ergebnis enthalten
data/config/locales/fr.yml CHANGED
@@ -2,7 +2,7 @@ fr:
2
2
  activemodel:
3
3
  attributes:
4
4
  result:
5
- decidim_accountability_status_id: Statut
5
+ decidim_accountability_status_id: Progression
6
6
  decidim_category_id: Catégorie
7
7
  decidim_scope_id: Périmètre d'application
8
8
  description: Description
@@ -37,7 +37,7 @@ fr:
37
37
  edit: Modifier
38
38
  new: Nouveau %{name}
39
39
  preview: Aperçu
40
- timeline_entries: Évolution du projet
40
+ timeline_entries: Évolution de la réalisation
41
41
  title: Actions
42
42
  admin:
43
43
  exports:
@@ -46,7 +46,7 @@ fr:
46
46
  result:
47
47
  name: Réalisation
48
48
  status:
49
- name: Statut
49
+ name: Progression
50
50
  timeline_entry:
51
51
  name: Élément de chronologie
52
52
  results:
@@ -74,7 +74,7 @@ fr:
74
74
  success: Réalisation mise à jour avec succès
75
75
  shared:
76
76
  subnav:
77
- statuses: Statuts
77
+ statuses: Progrès
78
78
  statuses:
79
79
  create:
80
80
  invalid: Un problème est survenu lors de la création de ce statut
@@ -94,21 +94,21 @@ fr:
94
94
  success: Statut mis à jour avec succès
95
95
  timeline_entries:
96
96
  create:
97
- invalid: Un problème est survenu lors de la création de cette entrée
98
- success: Entrée créée avec succès
97
+ invalid: Un problème est survenu lors de la création de cette élément de chronologie
98
+ success: Élément de chronologie créé avec succès
99
99
  destroy:
100
- success: Entrée supprimée avec succès
100
+ success: Élément de chronologie supprimé avec succès
101
101
  edit:
102
- title: Modifier l'entrée
103
- update: Mise à jour de l'entrée
102
+ title: Modifier l'élément de chronologie
103
+ update: Mise à jour de l'élément de chronologie
104
104
  index:
105
- title: Entrées de la chronologie du projet
105
+ title: Étapes-clés de la réalisation
106
106
  new:
107
- create: Créer une entrée
108
- title: Nouvelle entrée
107
+ create: Créer un élément de chronologie
108
+ title: Nouvel élément de chronologie
109
109
  update:
110
- invalid: Un problème est survenu lors de la mise à jour de cette entrée
111
- success: Entrée mise à jour avec succès
110
+ invalid: Un problème est survenu lors de la mise à jour de cet élément de chronologie
111
+ success: Élément de chronologie mis à jour avec succès
112
112
  admin_log:
113
113
  result:
114
114
  create: "%{user_name} a créé la réalisation %{resource_name} dans %{space_name}"
@@ -118,7 +118,7 @@ fr:
118
118
  parent_presenter:
119
119
  not_found: 'Le parent n''a pas été trouvé dans la base de données (ID: %{id})'
120
120
  last_activity:
121
- new_result_at_html: "<span>Nouveau résultat à %{link}</span>"
121
+ new_result_at_html: "<span>Nouvelle réalisation %{link}</span>"
122
122
  models:
123
123
  result:
124
124
  fields:
@@ -153,7 +153,7 @@ fr:
153
153
  nav_breadcrumb:
154
154
  global: Exécution globale
155
155
  search:
156
- search: Rechercher des actions
156
+ search: Rechercher des réalisations
157
157
  show:
158
158
  stats:
159
159
  attendees: Participants
data/config/locales/it.yml CHANGED
@@ -10,7 +10,7 @@ it:
10
10
  progress: Progresso
11
11
  project_ids: Progetti inclusi
12
12
  proposals: Proposte incluse
13
- start_date: Date di inizio
13
+ start_date: Data di inizio
14
14
  title: Nome
15
15
  updated_at: Aggiornato a
16
16
  status:
data/config/locales/no.yml ADDED
@@ -0,0 +1,5 @@
1
+ "no":
2
+ activemodel:
3
+ attributes:
4
+ result:
5
+ decidim_accountability_status_id: Status
data/lib/decidim/accountability/version.rb CHANGED
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds decidim-accountability version.
5
5
  module Accountability
6
6
  def self.version
7
- "0.18.0"
7
+ "0.18.1"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-accountability
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.0
4
+ version: 0.18.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: 2019-07-03 00:00:00.000000000 Z
13
+ date: 2019-10-21 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.18.0
21
+ version: 0.18.1
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.18.0
28
+ version: 0.18.1
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.18.0
35
+ version: 0.18.1
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.18.0
42
+ version: 0.18.1
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: kaminari
45
45
  requirement: !ruby/object:Gem::Requirement
@@ -74,98 +74,98 @@ dependencies:
74
74
  requirements:
75
75
  - - '='
76
76
  - !ruby/object:Gem::Version
77
- version: 0.18.0
77
+ version: 0.18.1
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.18.0
84
+ version: 0.18.1
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: decidim-assemblies
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
89
  - - '='
90
90
  - !ruby/object:Gem::Version
91
- version: 0.18.0
91
+ version: 0.18.1
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.18.0
98
+ version: 0.18.1
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: decidim-comments
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - '='
104
104
  - !ruby/object:Gem::Version
105
- version: 0.18.0
105
+ version: 0.18.1
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.18.0
112
+ version: 0.18.1
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: decidim-dev
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
117
  - - '='
118
118
  - !ruby/object:Gem::Version
119
- version: 0.18.0
119
+ version: 0.18.1
120
120
  type: :development
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
124
  - - '='
125
125
  - !ruby/object:Gem::Version
126
- version: 0.18.0
126
+ version: 0.18.1
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: decidim-meetings
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
131
  - - '='
132
132
  - !ruby/object:Gem::Version
133
- version: 0.18.0
133
+ version: 0.18.1
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
138
  - - '='
139
139
  - !ruby/object:Gem::Version
140
- version: 0.18.0
140
+ version: 0.18.1
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: decidim-participatory_processes
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
145
  - - '='
146
146
  - !ruby/object:Gem::Version
147
- version: 0.18.0
147
+ version: 0.18.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.18.0
154
+ version: 0.18.1
155
155
  - !ruby/object:Gem::Dependency
156
156
  name: decidim-proposals
157
157
  requirement: !ruby/object:Gem::Requirement
158
158
  requirements:
159
159
  - - '='
160
160
  - !ruby/object:Gem::Version
161
- version: 0.18.0
161
+ version: 0.18.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.18.0
168
+ version: 0.18.1
169
169
  description: An accountability component for decidim's participatory spaces.
170
170
  email:
171
171
  - josepjaume@gmail.com
@@ -287,6 +287,7 @@ files:
287
287
  - config/locales/id-ID.yml
288
288
  - config/locales/it.yml
289
289
  - config/locales/nl.yml
290
+ - config/locales/no.yml
290
291
  - config/locales/pl.yml
291
292
  - config/locales/pt-BR.yml
292
293
  - config/locales/pt.yml
@@ -332,8 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
332
333
  - !ruby/object:Gem::Version
333
334
  version: '0'
334
335
  requirements: []
335
- rubyforge_project:
336
- rubygems_version: 2.7.6
336
+ rubygems_version: 3.0.3
337
337
  signing_key:
338
338
  specification_version: 4
339
339
  summary: Decidim accountability module