decidim-assemblies 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b96b835e40a2de3abf31a4546ad1946f5d4bdbac7d3597c7f6266a2c78ae603
-  data.tar.gz: d3cd9222743cb4c209bbb6958ffdf40f550726327affac75bd6a13a4459daf6a
+  metadata.gz: 7c0f24943af63649276875cef491e3886e5e018e16a770e50ef601a8bb6a37c9
+  data.tar.gz: c236863c629a10f674a7a89f1933c709184305e5f3d41d3281f902182f50194d
 SHA512:
-  metadata.gz: 204847a5a65f267495c17afdfd4789904e8ce9b8dace58dac6727e069f3cce9fa39bd3a7a0892b62036d12a174bbb85a60cec24a35627a38363c3d2e4827721c
-  data.tar.gz: d9ada0895c3a6d06799e59b9f1e4abc97aec4baefdc3a999c89ef6dfdf64d8d7f7f8988c14220046eed2d887d85c1054e7478704d5a91efc214d97a6d758eddc
+  metadata.gz: 4916c1abd79855781ea8fa6ea5827e9116b3627057845439c77fed5de121692332b5952b45db5ba96af194c1b29a882dc8494ef629ede6da84c8c361fa10ef88
+  data.tar.gz: 5e8312841a18b16513c2939e7f985624851dacd71cfb38ee79a4e24decf906626d9fa0366289f05a3b015a373dd512bf6907c0f3f53f34b37f1874ddb0aebdf5

data/app/forms/decidim/assemblies/admin/assembly_form.rb

@@ -12,66 +12,74 @@ module Decidim
         ASSEMBLY_TYPES = %w(government executive consultative_advisory participatory working_group commission others).freeze
         CREATED_BY = %w(city_council public others).freeze
 
-        translatable_attribute :title, String
-        translatable_attribute :subtitle, String
+        mimic :assembly
+
+        translatable_attribute :assembly_type_other, String
+        translatable_attribute :composition, String
+        translatable_attribute :closing_date_reason, String
+        translatable_attribute :created_by_other, String
         translatable_attribute :description, String
-        translatable_attribute :short_description, String
-        translatable_attribute :meta_scope, String
         translatable_attribute :developer_group, String
+        translatable_attribute :internal_organisation, String
         translatable_attribute :local_area, String
-        translatable_attribute :target, String
+        translatable_attribute :meta_scope, String
         translatable_attribute :participatory_scope, String
         translatable_attribute :participatory_structure, String
         translatable_attribute :purpose_of_action, String
-        translatable_attribute :composition, String
-        translatable_attribute :assembly_type_other, String
-        translatable_attribute :created_by_other, String
-        translatable_attribute :closing_date_reason, String
-        translatable_attribute :internal_organisation, String
+        translatable_attribute :short_description, String
         translatable_attribute :special_features, String
+        translatable_attribute :subtitle, String
+        translatable_attribute :target, String
+        translatable_attribute :title, String
 
-        mimic :assembly
-
-        attribute :slug, String
-        attribute :hashtag, String
-        attribute :promoted, Boolean
-        attribute :scopes_enabled, Boolean
-        attribute :scope_id, Integer
-        attribute :hero_image
-        attribute :remove_hero_image
-        attribute :banner_image
-        attribute :remove_banner_image
-        attribute :show_statistics, Boolean
-        attribute :area_id, Integer
-        attribute :parent_id, Integer
-        attribute :participatory_processes_ids, Array[Integer]
-        attribute :private_space, Boolean
         attribute :assembly_type, String
-        attribute :creation_date, Decidim::Attributes::TimeWithZone
         attribute :created_by, String
-        attribute :duration, Decidim::Attributes::TimeWithZone
-        attribute :included_at, Decidim::Attributes::TimeWithZone
-        attribute :closing_date, Decidim::Attributes::TimeWithZone
-        attribute :is_transparent, Boolean
-        attribute :twitter_handler, String
         attribute :facebook_handler, String
+        attribute :github_handler, String
+        attribute :hashtag, String
         attribute :instagram_handler, String
+        attribute :slug, String
+        attribute :twitter_handler, String
         attribute :youtube_handler, String
-        attribute :github_handler, String
 
-        validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
-        validates :title, :subtitle, :description, :short_description, translatable_presence: true
-        validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
+        attribute :area_id, Integer
+        attribute :parent_id, Integer
+        attribute :participatory_processes_ids, Array[Integer]
+        attribute :scope_id, Integer
+
+        attribute :is_transparent, Boolean
+        attribute :promoted, Boolean
+        attribute :private_space, Boolean
+        attribute :show_statistics, Boolean
+        attribute :scopes_enabled, Boolean
+
+        attribute :closing_date, Decidim::Attributes::LocalizedDate
+        attribute :creation_date, Decidim::Attributes::LocalizedDate
+        attribute :duration, Decidim::Attributes::LocalizedDate
+        attribute :included_at, Decidim::Attributes::LocalizedDate
+
+        attribute :banner_image
+        attribute :hero_image
+        attribute :remove_banner_image
+        attribute :remove_hero_image
+
         validates :area, presence: true, if: proc { |object| object.area_id.present? }
         validates :parent, presence: true, if: ->(form) { form.parent_id.present? }
+        validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
+        validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
+
+        validate :slug_uniqueness
 
         validates :assembly_type_other, translatable_presence: true, if: ->(form) { form.assembly_type == "others" }
         validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
+        validates :title, :subtitle, :description, :short_description, translatable_presence: true
 
-        validate :slug_uniqueness
-
-        validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :banner_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :banner_image,
+                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+                  file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :hero_image,
+                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+                  file_content_type: { allow: ["image/jpeg", "image/png"] }
 
         def map_model(model)
           self.scope_id = model.decidim_scope_id
@@ -95,32 +103,40 @@ module Decidim
         end
 
         def created_by_for_select
-          CREATED_BY.map do |by|
+          CREATED_BY.map do |creator|
             [
-              I18n.t("created_by.#{by}", scope: "decidim.assemblies"),
-              by
+              I18n.t("created_by.#{creator}", scope: "decidim.assemblies"),
+              creator
             ]
           end
         end
 
         def parent
-          @parent ||= OrganizationAssemblies.new(current_organization).query.find_by(id: parent_id)
+          @parent ||= organization_assemblies.find_by(id: parent_id)
         end
 
         def processes_for_select
-          @processes_for_select ||= Decidim.find_participatory_space_manifest(:participatory_processes)
-                                           .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |process|
-            [
-              translated_attribute(process.title),
-              process.id
-            ]
-          end
+          @processes_for_select ||= organization_participatory_processes
+                                    &.map { |pp| [translated_attribute(pp.title), pp.id] }
+                                    &.sort_by { |arr| arr[0] }
         end
 
         private
 
+        def organization_participatory_processes
+          Decidim.find_participatory_space_manifest(:participatory_processes)
+                 .participatory_spaces.call(current_organization)
+        end
+
+        def organization_assemblies
+          OrganizationAssemblies.new(current_organization).query
+        end
+
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.where(slug: slug).where.not(id: context[:assembly_id]).any?
+          return unless organization_assemblies
+                        .where(slug: slug)
+                        .where.not(id: context[:assembly_id])
+                        .any?
 
           errors.add(:slug, :taken)
         end

data/config/locales/eo-UY.yml

@@ -0,0 +1 @@
+eo:

data/config/locales/hu.yml

@@ -263,7 +263,7 @@ hu:
         consultative_advisory: Konzultatív / tanácsadó
         executive: Végrehajtó
         government: Kormány
-        help: 'Előadás:'
+        help: 'Mutat:'
         others: Egyéb
         participatory: Részvételi
         working_group: Munkacsoport

data/config/locales/it.yml

@@ -39,7 +39,7 @@ it:
         promoted: Promosso
         published_at: Pubblicato a
         purpose_of_action: Scopo dell'azione
-        scope_id: Scopi
+        scope_id: Obiettivi
         scopes_enabled: Scopi abilitati
         short_description: Breve descrizione
         show_statistics: Mostra statistiche
@@ -48,7 +48,7 @@ it:
         subtitle: Sottotitolo
         target: Chi partecipa
         title: Titolo
-        twitter: cinguettio
+        twitter: Twitter
         youtube: Youtube
       assembly_member:
         birthday: Compleanno
@@ -303,7 +303,7 @@ it:
         read_less: Leggi di meno
         read_more: Leggi di più
         related_participatory_processes: Processi partecipativi correlati
-        scope: Objetivos
+        scope: Obiettivi
         social_networks: Social networks
         target: Chi partecipa
       statistics:

data/config/locales/sv.yml

@@ -36,7 +36,7 @@ sv:
         participatory_scope: Vad bestäms
         participatory_structure: Hur bestäms det
         private_space: Privat utrymme
-        promoted: Främjad
+        promoted: Uppmärksammad
         published_at: Publicerad på
         purpose_of_action: Syfte med åtgärden
         scope_id: Omfattning
@@ -66,8 +66,8 @@ sv:
   activerecord:
     models:
       decidim/assembly:
-        one: Möte
-        other: Möten
+        one: Sammankomst
+        other: Sammankomster
       decidim/assembly_member:
         one: Församlingsmedlem
         other: Församlingsmedlemmar
@@ -364,7 +364,7 @@ sv:
           more_info: Mer information
           take_part: Delta
       assembly_navigation:
-        assembly_member_menu_item: medlemmar
+        assembly_member_menu_item: Medlemmar
         assembly_menu_item: Mötet
       assembly_widgets:
         show:

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.17.1"
+      "0.17.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.17.2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.17.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.17.2
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -188,6 +188,7 @@ files:
 - config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/eo-UY.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml