decidim-debates 0.28.4 → 0.29.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (19) hide show
  1. checksums.yaml +4 -4
  2. data/app/commands/decidim/debates/admin/close_debate.rb +6 -41
  3. data/app/commands/decidim/debates/admin/create_debate.rb +16 -42
  4. data/app/commands/decidim/debates/admin/update_debate.rb +7 -35
  5. data/app/commands/decidim/debates/create_debate.rb +28 -43
  6. data/app/commands/decidim/debates/update_debate.rb +12 -42
  7. data/app/controllers/decidim/debates/debates_controller.rb +1 -1
  8. data/app/events/decidim/debates/create_debate_event.rb +1 -1
  9. data/app/forms/decidim/debates/admin/debate_form.rb +1 -1
  10. data/app/models/decidim/debates/debate.rb +1 -1
  11. data/app/views/decidim/debates/admin/debates/_form.html.erb +2 -2
  12. data/app/views/decidim/debates/admin/debates/index.html.erb +1 -1
  13. data/app/views/decidim/debates/debates/show.html.erb +1 -1
  14. data/config/locales/fi.yml +2 -2
  15. data/config/locales/pt-BR.yml +0 -7
  16. data/config/locales/sv.yml +35 -53
  17. data/decidim-debates.gemspec +1 -1
  18. data/lib/decidim/debates/version.rb +1 -1
  19. metadata +14 -14
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1014bf47f7c5fb46be72dc303423ed78b71269a90b1becd446480add824ea898
4
- data.tar.gz: 4f9a0e04546f6cee8832d9f537bb5322702702a9d9fbb2f87ce57db35d0f1565
3
+ metadata.gz: 9c682db594758ac0c952f730441f2045d97cc3a554f8a0697fcc3df4aa093f9f
4
+ data.tar.gz: a65c9d155fe1f94b1f0bde4e1911f08ec05a37e9bb7da4ef903a6e0fcb67045c
5
5
  SHA512:
6
- metadata.gz: a6a7bb68aaf5b9d718c8d9751d52c8b3eae3c9c0f2667aa75d503e7b6ce6e01f50be2148de11b6d66e3a19d12bf84f61bd4c7503fde30f9a1667ed8d0e131db8
7
- data.tar.gz: 69e51cd50365233ba60704567fa2cf4597b2fc229cc74a01623c0b9bc583ecaafc694fd90d5fee79bb83d8bef8fe2b84e5e90f32925925932e0d8636c95da859
6
+ metadata.gz: cc001f2b6a6ca4f3176db1f6f3ae2d71976945659ae5e13e09dcde996858f54c350f755d0adddf618a16e0f3b781040f5072deb387377e6699626c4ab4c2f571
7
+ data.tar.gz: 6ae0b994eb7f795b329e6c91cf2423a90c8e12e6548d61bb7d3a0656c12d0a93923eeec9bdc22eaf0b94993867e5942035419c43e9faf089718e26f94fb8dda3
data/app/commands/decidim/debates/admin/close_debate.rb CHANGED
@@ -4,49 +4,14 @@ module Decidim
4
4
  module Debates
5
5
  module Admin
6
6
  # A command with all the business logic when an admin closes a debate.
7
- class CloseDebate < Decidim::Command
8
- # Public: Initializes the command.
9
- #
10
- # form - A form object with the params.
11
- def initialize(form)
12
- @form = form
13
- end
14
-
15
- # Executes the command. Broadcasts these events:
16
- #
17
- # - :ok when everything is valid, together with the debate.
18
- # - :invalid if the form was not valid and we could not proceed.
19
- #
20
- # Returns nothing.
21
- def call
22
- return broadcast(:invalid) if form.invalid?
23
-
24
- close_debate
25
- broadcast(:ok, debate)
26
- end
27
-
7
+ class CloseDebate < Decidim::Debates::CloseDebate
28
8
  private
29
9
 
30
- attr_reader :form
31
-
32
- def close_debate
33
- @debate = Decidim.traceability.perform_action!(
34
- :close,
35
- form.debate,
36
- form.current_user
37
- ) do
38
- form.debate.update!(
39
- conclusions: form.conclusions,
40
- closed_at: form.closed_at
41
- )
42
- end
43
-
44
- Decidim::EventsManager.publish(
45
- event: "decidim.events.debates.debate_closed",
46
- event_class: Decidim::Debates::CloseDebateEvent,
47
- resource: debate,
48
- followers: debate.followers
49
- )
10
+ def attributes
11
+ {
12
+ conclusions: form.conclusions,
13
+ closed_at: form.closed_at
14
+ }
50
15
  end
51
16
  end
52
17
  end
data/app/commands/decidim/debates/admin/create_debate.rb CHANGED
@@ -5,59 +5,33 @@ module Decidim
5
5
  module Admin
6
6
  # This command is executed when the user creates a Debate from the admin
7
7
  # panel.
8
- class CreateDebate < Decidim::Command
9
- def initialize(form)
10
- @form = form
11
- end
12
-
13
- # Creates the debate if valid.
14
- #
15
- # Broadcasts :ok if successful, :invalid otherwise.
16
- def call
17
- return broadcast(:invalid) if form.invalid?
8
+ class CreateDebate < Decidim::Commands::CreateResource
9
+ fetch_form_attributes :category, :component, :information_updates, :instructions, :scope, :start_time, :end_time, :comments_enabled
18
10
 
19
- transaction do
20
- create_debate
21
- send_notification_to_space_followers
22
- end
23
- broadcast(:ok)
24
- end
11
+ protected
25
12
 
26
- private
13
+ def resource_class = Decidim::Debates::Debate
27
14
 
28
- attr_reader :debate, :form
15
+ def extra_params = { visibility: "all" }
29
16
 
30
- def create_debate
17
+ def attributes
31
18
  parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
32
19
  parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
33
- params = {
34
- category: form.category,
35
- title: parsed_title,
36
- description: parsed_description,
37
- information_updates: form.information_updates,
38
- instructions: form.instructions,
39
- end_time: (form.end_time if form.finite),
40
- start_time: (form.start_time if form.finite),
41
- scope: form.scope,
42
- component: form.current_component,
43
- author: form.current_organization,
44
- comments_enabled: form.comments_enabled
45
- }
46
-
47
- @debate = Decidim.traceability.create!(
48
- Debate,
49
- form.current_user,
50
- params,
51
- visibility: "all"
52
- )
20
+ super.merge({
21
+ author: form.current_organization,
22
+ title: parsed_title,
23
+ description: parsed_description,
24
+ end_time: (form.end_time if form.finite),
25
+ start_time: (form.start_time if form.finite)
26
+ })
53
27
  end
54
28
 
55
- def send_notification_to_space_followers
29
+ def run_after_hooks
56
30
  Decidim::EventsManager.publish(
57
31
  event: "decidim.events.debates.debate_created",
58
32
  event_class: Decidim::Debates::CreateDebateEvent,
59
- resource: debate,
60
- followers: form.current_component.participatory_space.followers,
33
+ resource:,
34
+ followers: form.component.participatory_space.followers,
61
35
  extra: {
62
36
  type: "participatory_space"
63
37
  }
data/app/commands/decidim/debates/admin/update_debate.rb CHANGED
@@ -5,47 +5,19 @@ module Decidim
5
5
  module Admin
6
6
  # This command is executed when the user changes a Debate from the admin
7
7
  # panel.
8
- class UpdateDebate < Decidim::Command
9
- # Initializes a UpdateDebate Command.
10
- #
11
- # form - The form from which to get the data.
12
- # debate - The current instance of the page to be updated.
13
- def initialize(form, debate)
14
- @form = form
15
- @debate = debate
16
- end
17
-
18
- # Updates the debate if valid.
19
- #
20
- # Broadcasts :ok if successful, :invalid otherwise.
21
- def call
22
- return broadcast(:invalid) if form.invalid?
23
-
24
- update_debate
25
- broadcast(:ok)
26
- end
8
+ class UpdateDebate < Decidim::Commands::UpdateResource
9
+ fetch_form_attributes :category, :information_updates, :instructions, :scope, :start_time, :end_time, :comments_enabled
27
10
 
28
11
  private
29
12
 
30
- attr_reader :debate, :form
31
-
32
- def update_debate
13
+ def attributes
33
14
  parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
34
15
  parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
35
16
 
36
- Decidim.traceability.update!(
37
- debate,
38
- form.current_user,
39
- category: form.category,
40
- title: parsed_title,
41
- description: parsed_description,
42
- information_updates: form.information_updates,
43
- instructions: form.instructions,
44
- end_time: form.end_time,
45
- start_time: form.start_time,
46
- scope: form.scope,
47
- comments_enabled: form.comments_enabled
48
- )
17
+ super.merge({
18
+ title: parsed_title,
19
+ description: parsed_description
20
+ })
49
21
  end
50
22
  end
51
23
  end
data/app/commands/decidim/debates/create_debate.rb CHANGED
@@ -4,33 +4,30 @@ module Decidim
4
4
  module Debates
5
5
  # This command is executed when the user creates a Debate from the public
6
6
  # views.
7
- class CreateDebate < Decidim::Command
8
- def initialize(form)
9
- @form = form
10
- end
7
+ class CreateDebate < Decidim::Commands::CreateResource
8
+ fetch_form_attributes :category, :scope
9
+
10
+ private
11
11
 
12
- # Creates the debate if valid.
13
- #
14
- # Broadcasts :ok if successful, :invalid otherwise.
15
- def call
16
- return broadcast(:invalid) if form.invalid?
12
+ def resource_class = Decidim::Debates::Debate
17
13
 
14
+ def extra_params = { visibility: "public-only" }
15
+
16
+ def create_resource
18
17
  with_events(with_transaction: true) do
19
- create_debate
18
+ super
20
19
  end
20
+ end
21
+
22
+ def run_after_hooks
21
23
  send_notification_to_author_followers
22
24
  send_notification_to_space_followers
23
25
  follow_debate
24
- broadcast(:ok, debate)
25
26
  end
26
27
 
27
- private
28
-
29
- attr_reader :debate, :form
30
-
31
28
  def event_arguments
32
29
  {
33
- resource: debate,
30
+ resource:,
34
31
  extra: {
35
32
  event_author: form.current_user,
36
33
  locale:
@@ -38,37 +35,25 @@ module Decidim
38
35
  }
39
36
  end
40
37
 
41
- def create_debate
38
+ def attributes
42
39
  parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
43
40
  parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
44
- params = {
45
- author: form.current_user,
46
- decidim_user_group_id: form.user_group_id,
47
- category: form.category,
48
- title: {
49
- I18n.locale => parsed_title
50
- },
51
- description: {
52
- I18n.locale => parsed_description
53
- },
54
- scope: form.scope,
55
- component: form.current_component
56
- }
57
41
 
58
- @debate = Decidim.traceability.create!(
59
- Debate,
60
- form.current_user,
61
- params,
62
- visibility: "public-only"
63
- )
42
+ super.merge({
43
+ author: form.current_user,
44
+ decidim_user_group_id: form.user_group_id,
45
+ title: { I18n.locale => parsed_title },
46
+ description: { I18n.locale => parsed_description },
47
+ component: form.current_component
48
+ })
64
49
  end
65
50
 
66
51
  def send_notification_to_author_followers
67
52
  Decidim::EventsManager.publish(
68
53
  event: "decidim.events.debates.debate_created",
69
54
  event_class: Decidim::Debates::CreateDebateEvent,
70
- resource: debate,
71
- followers: debate.author.followers,
55
+ resource:,
56
+ followers: resource.author.followers,
72
57
  extra: {
73
58
  type: "user"
74
59
  }
@@ -79,8 +64,8 @@ module Decidim
79
64
  Decidim::EventsManager.publish(
80
65
  event: "decidim.events.debates.debate_created",
81
66
  event_class: Decidim::Debates::CreateDebateEvent,
82
- resource: debate,
83
- followers: debate.participatory_space.followers,
67
+ resource:,
68
+ followers: resource.participatory_space.followers,
84
69
  extra: {
85
70
  type: "participatory_space"
86
71
  }
@@ -89,9 +74,9 @@ module Decidim
89
74
 
90
75
  def follow_debate
91
76
  follow_form = Decidim::FollowForm
92
- .from_params(followable_gid: debate.to_signed_global_id.to_s)
93
- .with_context(current_user: debate.author)
94
- Decidim::CreateFollow.call(follow_form, debate.author)
77
+ .from_params(followable_gid: resource.to_signed_global_id.to_s)
78
+ .with_context(current_user: resource.author)
79
+ Decidim::CreateFollow.call(follow_form)
95
80
  end
96
81
  end
97
82
  end
data/app/commands/decidim/debates/update_debate.rb CHANGED
@@ -3,38 +3,20 @@
3
3
  module Decidim
4
4
  module Debates
5
5
  # A command with all the business logic when a user updates a debate.
6
- class UpdateDebate < Decidim::Command
7
- # Public: Initializes the command.
8
- #
9
- # form - A form object with the params.
10
- def initialize(form)
11
- @form = form
12
- end
6
+ class UpdateDebate < Decidim::Commands::UpdateResource
7
+ fetch_form_attributes :category, :scope
13
8
 
14
- # Executes the command. Broadcasts these events:
15
- #
16
- # - :ok when everything is valid, together with the debate.
17
- # - :invalid if the form was not valid and we could not proceed.
18
- #
19
- # Returns nothing.
20
- def call
21
- return broadcast(:invalid) if form.invalid?
22
- return broadcast(:invalid) unless form.debate.editable_by?(form.current_user)
9
+ private
23
10
 
11
+ def update_resource
24
12
  with_events(with_transaction: true) do
25
- update_debate
13
+ super
26
14
  end
27
-
28
- broadcast(:ok, @debate)
29
15
  end
30
16
 
31
- private
32
-
33
- attr_reader :form
34
-
35
17
  def event_arguments
36
18
  {
37
- resource: @debate,
19
+ resource:,
38
20
  extra: {
39
21
  event_author: form.current_user,
40
22
  locale:
@@ -42,28 +24,16 @@ module Decidim
42
24
  }
43
25
  end
44
26
 
45
- def update_debate
46
- @debate = Decidim.traceability.update!(
47
- @form.debate,
48
- @form.current_user,
49
- attributes,
50
- visibility: "public-only"
51
- )
52
- end
27
+ def extra_params = { visibility: "public-only" }
53
28
 
54
29
  def attributes
55
30
  parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
56
31
  parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
57
- {
58
- category: form.category,
59
- title: {
60
- I18n.locale => parsed_title
61
- },
62
- description: {
63
- I18n.locale => parsed_description
64
- },
65
- scope: form.scope
66
- }
32
+
33
+ super.merge({
34
+ title: { I18n.locale => parsed_title },
35
+ description: { I18n.locale => parsed_description }
36
+ })
67
37
  end
68
38
  end
69
39
  end
data/app/controllers/decidim/debates/debates_controller.rb CHANGED
@@ -54,7 +54,7 @@ module Decidim
54
54
 
55
55
  @form = form(DebateForm).from_params(params)
56
56
 
57
- UpdateDebate.call(@form) do
57
+ UpdateDebate.call(@form, debate) do
58
58
  on(:ok) do |debate|
59
59
  flash[:notice] = I18n.t("debates.update.success", scope: "decidim.debates")
60
60
  redirect_to Decidim::ResourceLocatorPresenter.new(debate).path
data/app/events/decidim/debates/create_debate_event.rb CHANGED
@@ -7,7 +7,7 @@ module Decidim
7
7
  #
8
8
  # "user" - The event is being sent to the followers of the debate
9
9
  # author
10
- # "participatory_space" - The event is being sento to the followers
10
+ # "participatory_space" - The event is being sent to the followers
11
11
  # of the event's participatory space.
12
12
  class CreateDebateEvent < Decidim::Events::SimpleEvent
13
13
  include Decidim::Events::AuthorEvent
data/app/forms/decidim/debates/admin/debate_form.rb CHANGED
@@ -43,7 +43,7 @@ module Decidim
43
43
  @category ||= current_component.categories.find_by(id: decidim_category_id)
44
44
  end
45
45
 
46
- # Finds the Scope from the given decidim_scope_id, uses the compoenent scope if missing.
46
+ # Finds the Scope from the given decidim_scope_id, uses the component scope if missing.
47
47
  #
48
48
  # Returns a Decidim::Scope
49
49
  def scope
data/app/models/decidim/debates/debate.rb CHANGED
@@ -86,7 +86,7 @@ module Decidim
86
86
 
87
87
  # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
88
88
  def reported_searchable_content_extras
89
- [normalized_author.name]
89
+ [author_name]
90
90
  end
91
91
 
92
92
  # Public: Calculates whether the current debate is an AMA-styled one or not.
data/app/views/decidim/debates/admin/debates/_form.html.erb CHANGED
@@ -1,11 +1,11 @@
1
1
  <div class="form__wrapper">
2
2
  <div class="card pt-4">
3
3
  <div class="card-section debate-fields">
4
- <div class="row column hashtags__container">
4
+ <div class="row column">
5
5
  <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
6
6
  </div>
7
7
 
8
- <div class="row column hashtags__container">
8
+ <div class="row column">
9
9
  <%= form.translated :editor, :description, hashtaggable: true, aria: { label: :description } %>
10
10
  </div>
11
11
 
data/app/views/decidim/debates/admin/debates/index.html.erb CHANGED
@@ -16,7 +16,7 @@
16
16
  <th><%= t("models.debate.fields.start_time", scope: "decidim.debates") %></th>
17
17
  <th><%= t("models.debate.fields.end_time", scope: "decidim.debates") %></th>
18
18
  <%= th_resource_scope_label %>
19
- <th class="actions"><%= t("actions.title", scope: "decidim.debates") %></th>
19
+ <th><%= t("actions.title", scope: "decidim.debates") %></th>
20
20
  </tr>
21
21
  </thead>
22
22
  <tbody>
data/app/views/decidim/debates/debates/show.html.erb CHANGED
@@ -30,7 +30,7 @@ edit_link(
30
30
  <div class="layout-author">
31
31
  <%= cell "decidim/author", debate_presenter.author, skip_profile_link: true %>
32
32
  <% if debate.closed? %>
33
- <span class="success label proposal-status">
33
+ <span class="success label">
34
34
  <%= t("debate_closed", scope: "decidim.debates.debates.show") %>
35
35
  </span>
36
36
  <% end %>
data/config/locales/fi.yml CHANGED
@@ -183,12 +183,12 @@ fi:
183
183
  email_subject: Uusi keskustelu "%{resource_title}" käyttäjältä %{author_nickname}
184
184
  notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> loi keskustelun <a href="%{resource_path}">%{resource_title}</a>.
185
185
  creation_disabled:
186
- email_intro: 'Keskustelujen luominen ei ole enää käytössä kohteessa %{participatory_space_title}. Voit silti osallistua avattuihin keskusteluihin sivulta:'
186
+ email_intro: 'Keskustelujen luominen ei ole enää käytössä kohteessa %{participatory_space_title}. Voit silti osallistua avattuihin keskusteluihin tältä sivulta:'
187
187
  email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta %{participatory_space_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
188
188
  email_subject: Keskustelujen luominen on poistettu käytöstä kohteessa %{participatory_space_title}
189
189
  notification_title: Keskustelujen luominen on nyt poistettu käytöstä kohteessa <a href="%{participatory_space_url}">%{participatory_space_title}</a>
190
190
  creation_enabled:
191
- email_intro: 'Nyt voit aloittaa uusia keskusteluja kohteessa %{participatory_space_title}! Aloita osallistuminen sivulta:'
191
+ email_intro: 'Nyt voit aloittaa uusia keskusteluja kohteessa %{participatory_space_title}! Aloita osallistuminen tällä sivulla:'
192
192
  email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{participatory_space_title}. Voit lopettaa ilmoitusten vastaanottamisen edellä esitetyn linkin kautta.
193
193
  email_subject: Keskusteluja nyt käyettävissä kohdassa %{participatory_space_title}
194
194
  notification_title: Nyt voit aloittaa <a href="%{resource_path}">uusia keskusteluja</a> osallistumistilassa <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
data/config/locales/pt-BR.yml CHANGED
@@ -168,13 +168,6 @@ pt-BR:
168
168
  events:
169
169
  debates:
170
170
  create_debate_event:
171
- space_followers:
172
- email_intro: |-
173
- Oi,
174
- Um novo debate "%{resource_title}" foi criado no espaço participativo %{participatory_space_title} , confira e contribua:
175
- email_outro: Você recebeu esta notificação porque está seguindo o espaço participativo %{participatory_space_title}. Você pode parar de receber notificações após o link anterior.
176
- email_subject: Novo debate "%{resource_title}" em %{participatory_space_title}
177
- notification_title: O <a href="%{resource_path}">%{resource_title}</a> debate foi criado em <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
178
171
  user_followers:
179
172
  email_intro: |-
180
173
  Olá,
data/config/locales/sv.yml CHANGED
@@ -4,22 +4,21 @@ sv:
4
4
  attributes:
5
5
  debate:
6
6
  category_id: Kategori
7
- closed_at: Avslutades
7
+ closed_at: Stängt kl
8
8
  conclusions: Slutsatser
9
9
  decidim_category_id: Kategori
10
10
  description: Beskrivning
11
11
  end_time: Slutar vid
12
- information_updates: Uppdatering av uppgifter
13
- instructions: Instruktioner för att delta
14
- scope_id: Indelning
15
- start_time: Startdatum
12
+ information_updates: Informationsuppdateringar
13
+ instructions: Deltagaranvisningar
14
+ scope_id: Omfång
15
+ start_time: Börjar vid
16
16
  title: Titel
17
17
  user_group_id: Skapa debatt som
18
18
  models:
19
- decidim/debates/close_debate_event: Debatten avslutades
19
+ decidim/debates/close_debate_event: Debatt stängd
20
20
  decidim/debates/create_debate_event: Debatt
21
21
  decidim/debates/creation_disabled_event: Debatter avaktiverade
22
- decidim/debates/creation_enabled_event: Skapande av debatter aktiverat
23
22
  activerecord:
24
23
  models:
25
24
  decidim/debates/debate:
@@ -31,34 +30,32 @@ sv:
31
30
  actions:
32
31
  comment: Kommentera
33
32
  create: Skapa
34
- endorse: Gilla
33
+ endorse: Instäm
35
34
  name: Debatter
36
35
  settings:
37
36
  global:
38
37
  announcement: Meddelande
39
- comments_enabled: Aktivera kommentarer
40
- comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
41
- scope_id: Indelning
42
- scopes_enabled: Aktivera indelningar
38
+ comments_enabled: Kommentarer aktiverade
39
+ comments_max_length: Maximal längd för kommentarer (Lämna 0 för standardvärde)
40
+ scope_id: Omfång
41
+ scopes_enabled: Omfång aktiverade
43
42
  step:
44
43
  announcement: Meddelande
45
- comments_blocked: Stäng av kommentarer
46
- creation_enabled: Deltagarna kan skapa debatter
47
- endorsements_blocked: Blockera gilla-markeringar
48
- endorsements_enabled: Aktivera gilla-markeringar
44
+ comments_blocked: Kommentarer blockerade
45
+ endorsements_blocked: Instämmanden är blockerade
46
+ endorsements_enabled: Instämmanden aktiverade
49
47
  debates:
50
48
  actions:
51
49
  close: Stäng
52
50
  confirm_destroy: Är du säker?
53
51
  destroy: Radera
54
52
  edit: Redigera
55
- new: Ny debatt
56
53
  title: Åtgärder
57
54
  admin:
58
55
  debate_closes:
59
56
  edit:
60
57
  close: Stäng
61
- title: Avsluta debatt
58
+ title: Stäng debatt
62
59
  debates:
63
60
  create:
64
61
  invalid: Det gick inte att skapa debatten.
@@ -70,8 +67,8 @@ sv:
70
67
  update: Uppdatera debatt
71
68
  form:
72
69
  debate_type: Typ av debatt
73
- finite: Tidsbegränsad (med start- och sluttid)
74
- open: Öppen (utan start- eller sluttid)
70
+ finite: Tidsbegränsad (med start- och sluttider)
71
+ open: Oendlig (inga start- eller slutdatum)
75
72
  index:
76
73
  title: Debatter
77
74
  new:
@@ -84,19 +81,19 @@ sv:
84
81
  comments: Kommentarer
85
82
  admin_log:
86
83
  debate:
87
- close: "%{user_name} avslutade debatten %{resource_name} i %{space_name}"
84
+ close: "%{user_name} stängde debatten %{resource_name} i utrymmet %{space_name}"
88
85
  create: "%{user_name} skapade debatten %{resource_name} på platsen %{space_name}"
89
86
  update: "%{user_name} uppdaterade debatten %{resource_name} på platsen %{space_name}"
90
87
  debate_m:
91
88
  commented_time_ago: Kommenterade för %{time} sedan
92
89
  debates:
93
90
  close:
94
- invalid: Det gick inte att avsluta debatten.
95
- success: Debatten har avslutats.
91
+ invalid: Det gick inte att stänga debatten.
92
+ success: Debatten har stängts.
96
93
  close_debate_modal:
97
- cancel: Avbryt
98
- description: Vad är slutsatsen eller sammanfattningen av debatten?
99
- send: Avsluta debatt
94
+ cancel: Avbryta
95
+ description: Vad är sammanfattningen för denna debatt?
96
+ send: Stäng debatt
100
97
  count:
101
98
  debates_count:
102
99
  one: "%{count} debatt"
@@ -104,9 +101,6 @@ sv:
104
101
  create:
105
102
  invalid: Det gick inte att skapa debatten.
106
103
  success: Debatten har skapats.
107
- debates:
108
- empty: Det finns inga debatter ännu.
109
- empty_filters: Det finns inga debatter med de här kriterierna.
110
104
  edit:
111
105
  back: Tillbaka
112
106
  save: Spara ändringar
@@ -124,7 +118,7 @@ sv:
124
118
  search: Sök
125
119
  state: Status
126
120
  state_values:
127
- closed: Avslutade
121
+ closed: Stängda
128
122
  open: Öppna
129
123
  user_group: Grupper
130
124
  form:
@@ -142,20 +136,17 @@ sv:
142
136
  recent: Senaste
143
137
  updated: Senast uppdaterade
144
138
  show:
145
- close_debate: Avsluta debatt
146
- debate_closed: Avslutade
147
- debate_conclusions_are: 'Debatten avslutades %{date} med följande slutsatser:'
139
+ close_debate: Stäng debatt
140
+ debate_closed: Stängd
141
+ debate_conclusions_are: 'Debatten stängdes den %{date} med dessa slutsatser:'
148
142
  edit_conclusions: Redigera slutsatser
149
143
  edit_debate: Redigera debatt
150
144
  groups_count: Grupper
151
- open: Öppen debatt
145
+ open: Öppna debatt
152
146
  participants_count: Deltagare
153
147
  update:
154
148
  invalid: Det gick inte att uppdatera debatten.
155
149
  success: Debatten har uppdaterats.
156
- last_activity:
157
- debate_updated: 'Debatten uppdaterad:'
158
- new_debate: 'Ny debatt:'
159
150
  models:
160
151
  debate:
161
152
  fields:
@@ -168,13 +159,6 @@ sv:
168
159
  events:
169
160
  debates:
170
161
  create_debate_event:
171
- space_followers:
172
- email_intro: |-
173
- Hej,
174
- En ny debatt, "%{resource_title}", har skapats i %{participatory_space_title}, ta en titt och bidra:
175
- email_outro: Du har fått detta meddelande eftersom du följer %{participatory_space_title}. Du kan sluta att ta emot meddelanden via föregående länk.
176
- email_subject: Ny debatt "%{resource_title}" i %{participatory_space_title}
177
- notification_title: Debatten <a href="%{resource_path}">%{resource_title}</a> skapades i <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
178
162
  user_followers:
179
163
  email_intro: |-
180
164
  Hej,
@@ -191,18 +175,17 @@ sv:
191
175
  email_intro: 'Nu kan du starta nya debatter i %{participatory_space_title}! Börja att delta på den här sidan:'
192
176
  email_outro: Du har fått det här meddelandet eftersom du följer %{participatory_space_title}. Du kan sluta att ta emot meddelanden via föregående länk.
193
177
  email_subject: Debatter är nu tillgängliga i %{participatory_space_title}
194
- notification_title: Du kan nu starta <a href="%{resource_path}">nya debatter</a> i <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
195
178
  debate_closed:
196
179
  affected_user:
197
- email_intro: 'Debatten "%{resource_title}" avslutades. Du kan läsa slutsatserna på debattsidan:'
198
- email_outro: Du har fått det här meddelandet eftersom du följer debatten "%{resource_title}". Du kan sluta följa den på föregående länk.
199
- email_subject: Debatten "%{resource_title}" avslutades
180
+ email_intro: 'Debatten "%{resource_title}" stängdes. Du kan läsa slutsatserna från dess sida:'
181
+ email_outro: Du har fått det här meddelandet eftersom du följer debatten "%{resource_title}". Du kan sluta följa det på föregående länk.
182
+ email_subject: Debatten "%{resource_title}" stängdes
200
183
  notification_title: Debatten <a href="%{resource_path}">%{resource_title}</a> stängdes.
201
184
  follower:
202
- email_intro: 'Debatten "%{resource_title}" avslutades. Du kan läsa slutsatserna på debattsidan:'
203
- email_outro: Du har fått det här meddelandet eftersom du följer debatten "%{resource_title}". Du kan sluta följa den med föregående länk.
204
- email_subject: Debatten "%{resource_title}" avslutades
205
- notification_title: Debatten <a href="%{resource_path}">%{resource_title}</a> avslutades.
185
+ email_intro: 'Debatten "%{resource_title}" stängdes. Du kan läsa slutsatserna från dess sida:'
186
+ email_outro: Du har fått det här meddelandet eftersom du följer debatten "%{resource_title}". Du kan sluta följa det på föregående länk.
187
+ email_subject: Debatten "%{resource_title}" stängdes
188
+ notification_title: Debatten <a href="%{resource_path}">%{resource_title}</a> stängdes.
206
189
  gamification:
207
190
  badges:
208
191
  commented_debates:
@@ -214,7 +197,6 @@ sv:
214
197
  name: Debatter
215
198
  next_level_in: Delta i %{score} till debatter för att nå nästa nivå!
216
199
  unearned_another: Deltagaren har inte deltagit i någon debatt än.
217
- unearned_own: Du har inte deltagit i någon debatt än.
218
200
  metrics:
219
201
  debates:
220
202
  description: Antal skapade debatter
data/decidim-debates.gemspec CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
18
18
  "homepage_uri" => "https://decidim.org",
19
19
  "source_code_uri" => "https://github.com/decidim/decidim"
20
20
  }
21
- s.required_ruby_version = "~> 3.1.0"
21
+ s.required_ruby_version = "~> 3.2.0"
22
22
 
23
23
  s.name = "decidim-debates"
24
24
  s.summary = "Decidim debates module"
data/lib/decidim/debates/version.rb CHANGED
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds the decidim-debates version.
5
5
  module Debates
6
6
  def self.version
7
- "0.28.4"
7
+ "0.29.0.rc1"
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-debates
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.28.4
4
+ version: 0.29.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2024-10-02 00:00:00.000000000 Z
14
+ date: 2024-07-16 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: decidim-comments
@@ -19,56 +19,56 @@ dependencies:
19
19
  requirements:
20
20
  - - '='
21
21
  - !ruby/object:Gem::Version
22
- version: 0.28.4
22
+ version: 0.29.0.rc1
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 0.28.4
29
+ version: 0.29.0.rc1
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: decidim-core
32
32
  requirement: !ruby/object:Gem::Requirement
33
33
  requirements:
34
34
  - - '='
35
35
  - !ruby/object:Gem::Version
36
- version: 0.28.4
36
+ version: 0.29.0.rc1
37
37
  type: :runtime
38
38
  prerelease: false
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
41
  - - '='
42
42
  - !ruby/object:Gem::Version
43
- version: 0.28.4
43
+ version: 0.29.0.rc1
44
44
  - !ruby/object:Gem::Dependency
45
45
  name: decidim-admin
46
46
  requirement: !ruby/object:Gem::Requirement
47
47
  requirements:
48
48
  - - '='
49
49
  - !ruby/object:Gem::Version
50
- version: 0.28.4
50
+ version: 0.29.0.rc1
51
51
  type: :development
52
52
  prerelease: false
53
53
  version_requirements: !ruby/object:Gem::Requirement
54
54
  requirements:
55
55
  - - '='
56
56
  - !ruby/object:Gem::Version
57
- version: 0.28.4
57
+ version: 0.29.0.rc1
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: decidim-dev
60
60
  requirement: !ruby/object:Gem::Requirement
61
61
  requirements:
62
62
  - - '='
63
63
  - !ruby/object:Gem::Version
64
- version: 0.28.4
64
+ version: 0.29.0.rc1
65
65
  type: :development
66
66
  prerelease: false
67
67
  version_requirements: !ruby/object:Gem::Requirement
68
68
  requirements:
69
69
  - - '='
70
70
  - !ruby/object:Gem::Version
71
- version: 0.28.4
71
+ version: 0.29.0.rc1
72
72
  description: A debates component for decidim's participatory spaces.
73
73
  email:
74
74
  - josepjaume@gmail.com
@@ -279,14 +279,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
279
279
  requirements:
280
280
  - - "~>"
281
281
  - !ruby/object:Gem::Version
282
- version: 3.1.0
282
+ version: 3.2.0
283
283
  required_rubygems_version: !ruby/object:Gem::Requirement
284
284
  requirements:
285
- - - ">="
285
+ - - ">"
286
286
  - !ruby/object:Gem::Version
287
- version: '0'
287
+ version: 1.3.1
288
288
  requirements: []
289
- rubygems_version: 3.3.7
289
+ rubygems_version: 3.4.10
290
290
  signing_key:
291
291
  specification_version: 4
292
292
  summary: Decidim debates module