decidim-proposals 0.26.2 → 0.27.0.rc2

data/config/locales/lv.yml

@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -36,10 +37,6 @@ lv:
           valuator_role_id: Vērtētāja vārds
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Nederīgs dokumenta tips. Pieņemtie formāti ir: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -485,7 +482,6 @@ lv:
           all: Visi
         filter_origin_values:
           all: Visi
-          citizens: Pilsoņi
           meetings: Sanāksmes
           official: Oficiālā
           user_groups: Grupas
@@ -654,7 +650,6 @@ lv:
             one: "%{count} priekšlikums"
             other: "%{count} priekšlikumi"
         edit:
-          add_documents: Dokumenti
           attachment_legend: "(Pēc izvēles) Pievienojiet pielikumu"
           back: Atpakaļ
           select_a_category: Lūdzu, izvēlieties kategoriju

data/config/locales/nl.yml

@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ nl:
           valuator_role_id: Naam beoordelaar
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Ongeldig documenttype. Aanvaarde formaten zijn: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -557,9 +554,9 @@ nl:
           all: Alle
         filter_origin_values:
           all: Alle
-          citizens: Burgers
           meetings: vergaderingen
           official: Officieel
+          participants: Deelnemers
           user_groups: Groepen
         filter_scope_values:
           all: Alle
@@ -732,12 +729,8 @@ nl:
           description: De coördinaten worden bijgewerkt bij het klikken op de 'preview' knop. Het adres verandert echter niet.
           instructions: Je kunt het punt op de kaart verplaatsen.
         edit:
-          add_documents: Documenten
-          add_images: Bestand
           attachment_legend: "(Optioneel) Voeg een bijlage toe"
           back: Terug
-          delete_document: Document verwijderen
-          delete_image: Afbeelding verwijderen
           gallery_legend: "(Optioneel) Voeg een afbeelding toe aan het voorstel"
           select_a_category: Selecteer een categorie
           send: Verzenden

data/config/locales/no.yml

@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -39,10 +40,6 @@
         keep_authors: Behold originale forfattere
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Ugyldig dokumenttype. Godkjente formater er: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -537,7 +534,6 @@
           all: Alle
         filter_origin_values:
           all: Alle
-          citizens: Borgere
           meetings: Møter
           official: Offisiell
           user_groups: Grupper
@@ -701,7 +697,6 @@
             one: "%{count} forslag"
             other: "%{count} forslag"
         edit:
-          add_documents: Dokumenter
           attachment_legend: "(Valgfritt) Legg til et vedlegg"
           back: Tilbake
           select_a_category: Velg en kategori

data/config/locales/pl.yml

@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -41,10 +42,6 @@ pl:
           valuator_role_id: Imię weryfikatora
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Nieprawidłowy typ dokumentu. Akceptowane formaty to: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -536,7 +533,6 @@ pl:
           all: Wszystko
         filter_origin_values:
           all: Wszystko
-          citizens: Obywatele
           meetings: Spotkania
           official: Urzędnik
           user_groups: Grupy użytkowników
@@ -714,12 +710,8 @@ pl:
             many: "%{count} propozycji"
             other: "%{count} propozycji"
         edit:
-          add_documents: Dokumenty
-          add_images: Plik
           attachment_legend: "(Opcjonalnie) Dodaj załącznik"
           back: Wróć
-          delete_document: Usuń dokument
-          delete_image: Usuń obraz
           gallery_legend: "(Opcjonalnie) Dodaj obraz do karty propozycji"
           select_a_category: Wybierz kategorię
           send: Wyślij

data/config/locales/pt-BR.yml

@@ -1,3 +1,4 @@
+---
 pt-BR:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ pt-BR:
           valuator_role_id: Nome do Avaliador
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Formatos aceitos são: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -527,7 +524,6 @@ pt-BR:
           all: Todos
         filter_origin_values:
           all: Todos
-          citizens: Cidadãos
           meetings: Reuniões
           official: Oficial
           user_groups: Grupos de usuários
@@ -702,12 +698,8 @@ pt-BR:
           description: As coordenadas serão atualizadas quando clicar no botão 'visualizar'. No entanto, o endereço não muda.
           instructions: Você pode mover o ponto no mapa.
         edit:
-          add_documents: Documentos
-          add_images: Arquivo
           attachment_legend: "(Opcional) Adicione um anexo"
           back: Voltar
-          delete_document: Apagar Documento
-          delete_image: Excluir Imagem
           gallery_legend: "(Opcional) Adicione uma imagem à carta da proposta"
           select_a_category: Selecione uma categoria
           send: Enviar

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ pt:
           valuator_role_id: Nome do avaliador
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Os formatos aceites são: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -561,7 +558,6 @@ pt:
           all: Todos
         filter_origin_values:
           all: Todos
-          citizens: Cidadãos
           meetings: Reuniões
           official: Oficial
           user_groups: Grupos
@@ -736,12 +732,8 @@ pt:
           description: As coordenadas serão actualizadas quando clicar no botão ‘pré-visualização’. No entanto, o endereço não será alterado.
           instructions: Pode mover o ponto no mapa.
         edit:
-          add_documents: Documentos
-          add_images: Ficheiro
           attachment_legend: "(Opcional) Adicione um anexo"
           back: Voltar
-          delete_document: Apagar Documento
-          delete_image: Apagar Imagem
           gallery_legend: "(Opcional) Adicionar uma imagem ao cartão da proposta"
           select_a_category: Por favor selecione uma categoria
           send: Enviar

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ ro:
           valuator_role_id: Numele evaluatorului
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Tip de document invalid. Formatele acceptate sunt: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -587,9 +584,9 @@ ro:
           all: Toate
         filter_origin_values:
           all: Toate
-          citizens: Cetățeni
           meetings: Întâlniri
           official: Oficial
+          participants: Participanți
           user_groups: Grupuri
         filter_scope_values:
           all: Toate
@@ -765,12 +762,8 @@ ro:
           description: Coordonatele vor fi actualizate când apeși pe butonul 'previzualizează'. Cu toate acestea, adresa nu se schimbă.
           instructions: Poți muta punctul de pe hartă.
         edit:
-          add_documents: Documente
-          add_images: Fişier
           attachment_legend: "(Opțional) Adaugă un atașament"
           back: Înapoi
-          delete_document: Șterge documentul
-          delete_image: Șterge imaginea
           gallery_legend: "(Opțional) Adaugă o imagine la cardul de propunere"
           select_a_category: Te rugăm selectează o categorie
           send: Trimite

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -222,7 +223,6 @@ ru:
         withdrawn: Отозван
       application_helper:
         filter_origin_values:
-          citizens: Граждане
           official: Служебные
         filter_state_values:
           not_answered: Без ответов

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -39,10 +40,6 @@ sk:
           valuator_role_id: Meno hodnotiteľa
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Neplatný typ dokumentu. Prijateľné formáty sú: %{valid_mime_types} '
         proposal:
           attributes:
             add_documents:
@@ -489,7 +486,6 @@ sk:
           all: Všetko
         filter_origin_values:
           all: Všetko
-          citizens: Občania
           meetings: Stretnutie
           official: Oficiálne
           user_groups: Skupiny užívateľov
@@ -662,7 +658,6 @@ sk:
             many: "%{count} návrhov"
             other: "%{count} návrhov"
         edit:
-          add_documents: Dokumenty
           attachment_legend: "(Voliteľné) Pridanie prílohy"
           back: Zadná
           select_a_category: Vyberte kategóriu

data/config/locales/sl.yml

@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:

data/config/locales/sr-CS.yml

@@ -1,3 +1,4 @@
+---
 sr:
   activemodel:
     attributes:
@@ -109,8 +110,6 @@ sr:
             valuator: Procenjivač
             valuators: Procenjivači
       proposals:
-        edit:
-          add_documents: Dokumenti
         show:
           back_to_list: Nazad na listu
           estimated_cost: Procenjen trošak

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -42,10 +43,6 @@ sv:
           valuator_role_id: Värderarens namn
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Ogiltig dokumenttyp. Godkända format är: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -465,7 +462,7 @@ sv:
             title: Uppdatera förslag
             update: Uppdatera
           form:
-            attachment_legend: "(Valfritt) Lägg till en bilaga"
+            attachment_legend: "(Frivilligt) Lägg till en bilaga"
             created_in_meeting: Detta förslag kommer från ett möte
             delete_attachment: Ta bort bilaga
             select_a_category: Välj en kategori
@@ -580,9 +577,9 @@ sv:
           all: Alla
         filter_origin_values:
           all: Alla
-          citizens: Medborgare
           meetings: Möten
           official: Officiella
+          participants: Deltagare
           user_groups: Grupper
         filter_scope_values:
           all: Alla
@@ -623,7 +620,7 @@ sv:
           error: Det gick inte att skapa det gemensamma utkastet
           success: Det gemensamma utkastet har skapats.
         edit:
-          attachment_legend: "(Valfritt) Lägg till en bilaga"
+          attachment_legend: "(Frivilligt) Lägg till en bilaga"
           back: Tillbaka
           select_a_category: Välj en kategori
           send: Skicka
@@ -645,6 +642,7 @@ sv:
           filter_by: Filtrera efter
           unfold: Veckla ut
         new:
+          add_file: Lägg till fil
           send: Fortsätt
         new_collaborative_draft_button:
           new_collaborative_draft: Nytt gemensamt utkast
@@ -755,12 +753,10 @@ sv:
           description: Koordinaterna uppdateras när du klickar på knappen 'Förhandsgranska'. Adressen ändras dock inte.
           instructions: Nu kan du flytta markören på kartan.
         edit:
-          add_documents: Dokument
-          add_images: Bild
-          attachment_legend: "(Valfritt) Lägg till en bilaga"
+          add_documents: Lägga till dokument
+          attachment_legend: "(Frivilligt) Lägg till en bilaga"
           back: Tillbaka
-          delete_document: Radera dokument
-          delete_image: Radera bild
+          edit_documents: Ändra dokument
           gallery_legend: "(Frivilligt) Lägg till en bild"
           select_a_category: Välj en kategori
           send: Skicka

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -41,10 +42,6 @@ tr:
           valuator_role_id: Bilirkişi adı
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: 'Geçersiz doküman tipi. Kabul edilen formatlar: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -519,7 +516,6 @@ tr:
           all: Tümü
         filter_origin_values:
           all: Tümü
-          citizens: Vatandaşlar
           meetings: Toplantılar
           official: Resmi
           user_groups: Gruplar
@@ -690,12 +686,8 @@ tr:
             one: "%{count} teklif"
             other: "%{count} teklif"
         edit:
-          add_documents: Dokümanlar
-          add_images: Dosya
           attachment_legend: "(İsteğe bağlı) Bir ek ekleyin"
           back: Geri
-          delete_document: Doküman Sil
-          delete_image: Resmi sil
           gallery_legend: "(İsteğe bağlı) Teklif kartına bir resim ekleyin"
           select_a_category: Lütfen bir kategori seçin
           send: Gönder

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -222,7 +223,6 @@ uk:
         withdrawn: Відкликана
       application_helper:
         filter_origin_values:
-          citizens: Громадяни
           official: Службове
         filter_state_values:
           not_answered: Без відповідей

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -38,10 +39,6 @@ zh-CN:
           valuator_role_id: 值名称
     errors:
       models:
-        participatory_text:
-          attributes:
-            document:
-              invalid_document_type: '无效的文档类型。接受的格式为： %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -499,7 +496,6 @@ zh-CN:
           all: 所有的
         filter_origin_values:
           all: 所有的
-          citizens: Citizens
           meetings: 会议
           official: 官方的
           user_groups: 群組
@@ -664,12 +660,8 @@ zh-CN:
           proposals_count:
             other: "%{count} 个提议"
         edit:
-          add_documents: www.un.org/webcast
-          add_images: 文件
           attachment_legend: "(可选) 添加附件"
           back: 后退
-          delete_document: 删除文档
-          delete_image: 删除图像
           gallery_legend: "(可选) 添加图像到提案卡"
           select_a_category: 请选择一个类别
           send: 发送

data/db/migrate/20180529110230_move_authorships_to_coauthorships.rb

@@ -4,6 +4,7 @@ class MoveAuthorshipsToCoauthorships < ActiveRecord::Migration[5.1]
   class Proposal < ApplicationRecord
     self.table_name = :decidim_proposals_proposals
   end
+
   class Coauthorship < ApplicationRecord
     self.table_name = :decidim_coauthorships
   end

data/lib/decidim/proposals/component.rb

@@ -266,26 +266,31 @@ Decidim.register_component(:proposals) do |component|
         visibility: "all"
       ) do
         proposal = Decidim::Proposals::Proposal.new(params)
-        proposal.add_coauthor(participatory_space.organization)
+        meeting_component = participatory_space.components.find_by(manifest_name: "meetings")
+
+        coauthor = case n
+                   when 0
+                     Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
+                   when 1
+                     Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
+                   when 2
+                     Decidim::Meetings::Meeting.where(component: meeting_component).order(Arel.sql("RANDOM()")).first
+                   else
+                     participatory_space.organization
+                   end
+        proposal.add_coauthor(coauthor)
         proposal.save!
         proposal
       end
 
-      if n.positive?
-        Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample(n).each do |author|
-          user_group = [true, false].sample ? Decidim::UserGroups::ManageableUserGroups.for(author).verified.sample : nil
-          proposal.add_coauthor(author, user_group: user_group)
-        end
-      end
-
       if proposal.state.nil?
         email = "amendment-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-amend#{n}@example.org"
         name = "#{Faker::Name.name} #{participatory_space.id} #{n} amend#{n}"
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -350,8 +355,8 @@ Decidim.register_component(:proposals) do |component|
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -372,8 +377,8 @@ Decidim.register_component(:proposals) do |component|
 
           author = Decidim::User.find_or_initialize_by(email: email)
           author.update!(
-            password: "decidim123456",
-            password_confirmation: "decidim123456",
+            password: "decidim123456789",
+            password_confirmation: "decidim123456789",
             name: name,
             nickname: Faker::Twitter.unique.screen_name,
             organization: component.organization,

data/lib/decidim/proposals/import/proposal_answer_creator.rb

@@ -40,26 +40,28 @@ module Decidim
         private
 
         def resource
-          @resource ||= begin
-            proposal = Decidim::Proposals::Proposal.find_by(id: id)
-            return nil unless proposal
-            return nil if proposal.emendation?
-
-            if proposal.component != component
-              proposal.errors.add(:component, :invalid)
-              return proposal
-            end
-
-            proposal.answer = answer
-            proposal.answered_at = Time.current
-            if POSSIBLE_ANSWER_STATES.include?(state)
-              proposal.state = state
-              proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
-            else
-              proposal.errors.add(:state, :invalid)
-            end
-            proposal
+          @resource ||= fetch_resource
+        end
+
+        def fetch_resource
+          proposal = Decidim::Proposals::Proposal.find_by(id: id)
+          return nil unless proposal
+          return nil if proposal.emendation?
+
+          if proposal.component != component
+            proposal.errors.add(:component, :invalid)
+            return proposal
+          end
+
+          proposal.answer = answer
+          proposal.answered_at = Time.current
+          if POSSIBLE_ANSWER_STATES.include?(state)
+            proposal.state = state
+            proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
+          else
+            proposal.errors.add(:state, :invalid)
           end
+          proposal
         end
 
         def id

data/lib/decidim/proposals/test/factories.rb

@@ -305,7 +305,7 @@ FactoryBot.define do
       published_at { nil }
     end
 
-    trait :citizen_author do
+    trait :participant_author do
       after :build do |proposal|
         proposal.coauthorships.clear
         user = build(:user, organization: proposal.component.participatory_space.organization)

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.26.2"
+      "0.27.0.rc2"
     end
   end
 end