decidim-proposals 0.27.6 → 0.27.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/helpers/decidim/proposals/application_helper.rb +1 -1
- data/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb +1 -5
- data/app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb +1 -3
- data/app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb +1 -1
- data/app/views/decidim/proposals/versions/show.html.erb +1 -1
- data/config/locales/ar.yml +1 -2
- data/config/locales/bg.yml +594 -1
- data/config/locales/ca.yml +8 -8
- data/config/locales/cs.yml +0 -1
- data/config/locales/de.yml +15 -15
- data/config/locales/el.yml +0 -1
- data/config/locales/es-MX.yml +2 -2
- data/config/locales/es-PY.yml +1 -1
- data/config/locales/es.yml +4 -4
- data/config/locales/eu.yml +1 -1
- data/config/locales/fr-CA.yml +1 -1
- data/config/locales/fr.yml +1 -1
- data/config/locales/ga-IE.yml +6 -0
- data/config/locales/gl.yml +1 -2
- data/config/locales/hu.yml +1 -2
- data/config/locales/id-ID.yml +0 -1
- data/config/locales/is-IS.yml +0 -2
- data/config/locales/it.yml +1 -2
- data/config/locales/lt.yml +0 -1
- data/config/locales/lv.yml +0 -1
- data/config/locales/nl.yml +1 -2
- data/config/locales/no.yml +0 -1
- data/config/locales/pl.yml +62 -1
- data/config/locales/pt-BR.yml +0 -1
- data/config/locales/pt.yml +0 -1
- data/config/locales/ru.yml +1 -2
- data/config/locales/sk.yml +0 -1
- data/config/locales/sv.yml +0 -1
- data/config/locales/tr-TR.yml +2 -2
- data/config/locales/uk.yml +1 -2
- data/config/locales/zh-CN.yml +0 -1
- data/config/locales/zh-TW.yml +0 -1
- data/lib/decidim/proposals/proposal_serializer.rb +51 -0
- data/lib/decidim/proposals/test/factories.rb +13 -1
- data/lib/decidim/proposals/version.rb +1 -1
- metadata +24 -25
- data/app/presenters/decidim/proposals/log/resource_presenter.rb +0 -22
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 793c3bc94bfb77da8e8b7309910a4e73650987a76d3d9511d07d351ee67e237d
|
|
4
|
+
data.tar.gz: e0458f251e81be8dd8092a5f95046542ae02a1d4a1e1f34c47f5897dfb4a3278
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8c8813e890f91878fb9eeac3a46418e3cb7b6b3ef30e29fee5cb295a373889dca234f96458b5df8d6928f205866965fe488aef3871ca208b5cd3ce5ab8a56676
|
|
7
|
+
data.tar.gz: a71510e56467849b915b3cba907fb23210bf145ce6043eb877ca9b811ffd39bf83da038a56fbcf40e4462d54f1e04de0313838beaa1e1f994e164c16d7565692
|
|
@@ -151,7 +151,7 @@ module Decidim
|
|
|
151
151
|
end
|
|
152
152
|
|
|
153
153
|
def show_voting_rules?
|
|
154
|
-
return false
|
|
154
|
+
return false if !votes_enabled? || current_settings.votes_blocked?
|
|
155
155
|
|
|
156
156
|
return true if vote_limit_enabled?
|
|
157
157
|
return true if threshold_per_proposal_enabled?
|
|
@@ -15,13 +15,9 @@ module Decidim
|
|
|
15
15
|
class ProposalPresenter < Decidim::Log::BasePresenter
|
|
16
16
|
private
|
|
17
17
|
|
|
18
|
-
def resource_presenter
|
|
19
|
-
@resource_presenter ||= Decidim::Proposals::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
|
|
20
|
-
end
|
|
21
|
-
|
|
22
18
|
def diff_fields_mapping
|
|
23
19
|
{
|
|
24
|
-
title:
|
|
20
|
+
title: :i18n,
|
|
25
21
|
body: "Decidim::Proposals::AdminLog::ValueTypes::ProposalTitleBodyPresenter",
|
|
26
22
|
state: "Decidim::Proposals::AdminLog::ValueTypes::ProposalStatePresenter",
|
|
27
23
|
answered_at: :date,
|
data/app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb
CHANGED
|
@@ -5,12 +5,10 @@ module Decidim
|
|
|
5
5
|
module AdminLog
|
|
6
6
|
module ValueTypes
|
|
7
7
|
class ProposalTitleBodyPresenter < Decidim::Log::ValueTypes::DefaultPresenter
|
|
8
|
-
include Decidim::TranslatableAttributes
|
|
9
|
-
|
|
10
8
|
def present
|
|
11
9
|
return unless value
|
|
12
10
|
|
|
13
|
-
translated_value =
|
|
11
|
+
translated_value = h.decidim_escape_translated(value)
|
|
14
12
|
return if translated_value.blank?
|
|
15
13
|
|
|
16
14
|
renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_value)
|
|
@@ -10,7 +10,7 @@ end
|
|
|
10
10
|
<%= cell(
|
|
11
11
|
"decidim/version",
|
|
12
12
|
current_version,
|
|
13
|
-
index: params[:id],
|
|
13
|
+
index: params[:id].to_i,
|
|
14
14
|
versioned_resource: versioned_resource,
|
|
15
15
|
versions_path: proc { url_for(action: :index) },
|
|
16
16
|
i18n_scope: "decidim.proposals.versions.#{item_name.to_s.pluralize}"
|
data/config/locales/ar.yml
CHANGED
|
@@ -191,7 +191,6 @@ ar:
|
|
|
191
191
|
proposal_wizard_step_1_help_text: اقتراح الاقتراح "إنشاء" نص مساعدة الخطوة
|
|
192
192
|
proposal_wizard_step_2_help_text: اقتراح الاقتراح "قارن" نص خطوة المساعدة
|
|
193
193
|
proposal_wizard_step_3_help_text: نص اقتراح "إكمال" تعليمات نص المعالج
|
|
194
|
-
proposal_wizard_step_4_help_text: اقتراح الاقتراح "نشر" نص تعليمات الخطوة
|
|
195
194
|
resources_permissions_enabled: يمكن تعيين أذونات الإجراءات لكل اقتراح
|
|
196
195
|
scope_id: نطاق
|
|
197
196
|
scopes_enabled: النطاقات مفعلة
|
|
@@ -989,7 +988,7 @@ ar:
|
|
|
989
988
|
step_1: إنشاء اقتراحك
|
|
990
989
|
step_2: قارن
|
|
991
990
|
step_3: إكمال
|
|
992
|
-
step_4:
|
|
991
|
+
step_4: نشر اقتراحك
|
|
993
992
|
step_of: الخطوة %{current_step_num} من %{total_steps}
|
|
994
993
|
title: خطوات إنشاء الاقتراحات
|
|
995
994
|
proposals_picker:
|