decidim-proposals 0.0.5 → 0.0.6

data/config/locales/en.yml

@@ -8,6 +8,8 @@ en:
         scope_id: Scope
         title: Title
         user_group_id: Create proposal as
+      proposal_answer:
+        answer: Answer
   decidim:
     features:
       proposals:
@@ -18,9 +20,9 @@ en:
         settings:
           global:
             comments_enabled: Comments enabled
+            geocoding_enabled: Geocoding enabled
             official_proposals_enabled: Official proposals enabled
             proposal_answering_enabled: Proposal answering enabled
-            scoped_proposals_enabled: Scoped proposals enabled
             vote_limit: Vote limit
           step:
             comments_blocked: Comments blocked
@@ -52,7 +54,6 @@ en:
             success: Proposal successfully created
           form:
             select_a_category: Select a category
-            select_a_scope: Select a scope
           index:
             title: Proposals
           new:
@@ -95,10 +96,11 @@ en:
         filters_small_view:
           close_modal: Close modal
           filter: Filter
-          filter_for: Filter by
+          filter_by: Filter by
           unfold: Unfold
         index:
           new_proposal: New proposal
+          view_proposal: View proposal
         linked_proposals:
           proposal_votes:
             one: <span class="card--list__data__number">1</span>vote
@@ -106,7 +108,6 @@ en:
         new:
           back: Back
           select_a_category: Please select a category
-          select_a_scope: Please select a scope
           send: Send
           title: New proposal
         orders:
@@ -119,6 +120,7 @@ en:
         show:
           proposal_accepted_reason: 'This proposal has been accepted because:'
           proposal_rejected_reason: 'This proposal has been rejected because:'
+          report: Report
         vote_button:
           already_voted: Already voted
           no_votes_remaining: No votes remaining
@@ -137,6 +139,7 @@ en:
             votes: Votes
     resource_links:
       included_proposals:
-        results: 'Proposal appearing in these results:'
+        proposal_projects: 'Proposal appearing in these projects:'
+        proposal_results: 'Proposal appearing in these results:'
       proposals_from_meeting:
-        meetings: Related meetings
+        proposal_meetings: Related meetings

data/config/locales/es.yml

@@ -7,19 +7,21 @@ es:
         scope_id: Ámbito
         title: Título
         user_group_id: Crear propuesta como
+      proposal_answer:
+        answer: Respuesta
   decidim:
     features:
       proposals:
         actions:
           create: Crear propuestas
-          vote: Votar
+          vote: Dar apoyo
         name: Propuestas
         settings:
           global:
             comments_enabled: Comentarios habilitados
+            geocoding_enabled: Geocodificación habilitada
             official_proposals_enabled: Propuestas oficiales habilitadas
             proposal_answering_enabled: Respuesta oficial a propuestas habilitadas
-            scoped_proposals_enabled: Propuestas con ámbito
             vote_limit: Límite de votos
           step:
             comments_blocked: Comentarios bloqueados
@@ -51,7 +53,6 @@ es:
             success: Propuesta creada correctamente
           form:
             select_a_category: Seleccione una categoría
-            select_a_scope: Seleccione un ámbito
           index:
             title: Propuestas
           new:
@@ -94,10 +95,11 @@ es:
         filters_small_view:
           close_modal: Cerrar ventana
           filter: Filtrar
-          filter_for: Filtrar por
+          filter_by: Filtrar por
           unfold: Desplegar
         index:
           new_proposal: Nueva propuesta
+          view_proposal: Ver propuesta
         linked_proposals:
           proposal_votes:
             one: <span class="card--list__data__number">1</span>vote
@@ -105,7 +107,6 @@ es:
         new:
           back: Atrás
           select_a_category: Por favor, seleccione una categoría
-          select_a_scope: Por favor, seleccione un ámbito
           send: Enviar
           title: Nueva propuesta
         orders:
@@ -118,23 +119,25 @@ es:
         show:
           proposal_accepted_reason: 'Esta propuesta ha sido aceptada porque:'
           proposal_rejected_reason: 'Esta propuesta ha sido rechazada porque:'
+          report: Denunciar
         vote_button:
           already_voted: Ya votado
           no_votes_remaining: No hay votos restantes
-          vote: Votar
+          vote: Dar apoyo
           votes_blocked: Votación desactivada
         votes_count:
           count:
-            one: VOTAR
-            other: VOTOS
+            one: APOYO
+            other: APOYOS
         votes_limit:
           vote_limit:
-            description: En lugar de votación tantas propuestas como desee, sólo se puede votar hasta %{limit} propuestas.
+            description: En lugar de dar apoyo tantas propuestas como se desee, sólo se puede dar apoyo hasta %{limit} propuestas.
             left: Restante
             title: Tiene %{limit} votos a distribuir
             votes: Votos
     resource_links:
       included_proposals:
-        results: 'Propuesta formulada en estos resultados:'
+        proposal_projects: 'Propuesta formulada en estos proyectos:'
+        proposal_results: 'Propuesta formulada en estos resultados:'
       proposals_from_meeting:
-        meetings: Encuentros relacionados
+        proposal_meetings: Encuentros relacionados

data/config/locales/eu.yml

@@ -2,4 +2,122 @@ eu:
   activemodel:
     attributes:
       proposal:
-        category_id: Kategoria
+        body: Testu-gorputza
+        category_id: Kategoria
+        scope_id: Esparrua
+        title: Izenburua
+        user_group_id: 'Sortu proposamen bat honako hau gisa:'
+  decidim:
+    features:
+      proposals:
+        actions:
+          create: Sortu proposamenak
+          vote: Bozkatu
+        name: Proposamenak
+        settings:
+          step:
+            creation_enabled: Gaitu proposamenen sorrera
+            votes_blocked: Bozketa blokeatuta
+            votes_enabled: Boto gaituak
+    proposals:
+      actions:
+        answer: Erantzuna
+        new: Proposamen berria
+        title: Ekintzak
+      admin:
+        models:
+          proposal:
+            name: Proposamena
+        proposal_answers:
+          edit:
+            accepted: Onartuta
+            answer_proposal: Erantzuna proposamenari
+            rejected: Uko eginda
+        proposals:
+          answer:
+            invalid: Arazo bat izan da proposamen honi erantzutean.
+            success: Proposamenari ongi erantzun zaio
+          create:
+            invalid: Arazo bat izan da proposamen hau sortzean.
+            success: Proposamena zuzen sortu da.
+          form:
+            select_a_category: Aukeratu kategoria bat
+          index:
+            title: Proposamenak
+          new:
+            create: Sortu proposamena
+            title: Proposamen berria
+      answers:
+        accepted: Onartuta
+        not_answered: Erantzun gabe
+        rejected: Uko eginda
+      create:
+        error: Erroreak gertatu dira proposamena gordetzean.
+        success: Proposamena zuzen sortu da.
+      models:
+        proposal:
+          fields:
+            category: Kategoria
+            official_proposal: Proposamen ofiziala
+            scope: Esparrua
+            state: Egoera
+            title: Izenburua
+      proposals:
+        count:
+          proposals_count:
+            one: Proposamen bat
+            other: "%{count} proposamen"
+        filters:
+          accepted: Onartuta
+          activity: Jarduera
+          all: Guztiak
+          category: Kategoria
+          citizenship: Herritarrak
+          official: Ofiziala
+          origin: Jatorria
+          rejected: Ezetsiak
+          related_to: Honekin lotuta
+          scopes: Esparruak
+          search: Bilatu
+          state: Egoera
+          voted: Bozkatuta
+        filters_small_view:
+          close_modal: Itxi leihoa
+          filter: Iragazi
+          filter_by: 'Iragazi honen arabera:'
+          unfold: Zabaldu
+        index:
+          new_proposal: Proposamen berria
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>boto
+            other: <span class="card--list__data__number">%{count}</span>boto
+        new:
+          back: Atzera
+          select_a_category: Mesedez, aukeratu kategoria bat
+          send: Bidali
+          title: Proposamen berria
+        orders:
+          label: 'Antolatu proposamenak honen arabera:'
+          most_voted: Bozkatuena
+          random: Ausazkoa
+          recent: Berri-berria
+        proposal:
+          view_proposal: Proposamena ikusi
+        show:
+          proposal_rejected_reason: 'Proposamen hau baztertu da honako arrazoi hauengatik:'
+        vote_button:
+          already_voted: Bozkatuta duzu
+          no_votes_remaining: Ez da gelditzen botorik
+          vote: Bozkatu
+          votes_blocked: Bozketa desaktibatu da
+        votes_count:
+          count:
+            one: BOTOA EMAN
+            other: ZENBAT BOTO
+        votes_limit:
+          vote_limit:
+            description: Nahi beste proposamen bozkatu ordez, gehienez ere %{limit} proposamen bozka ditzakezu.
+            left: Gainerakoa
+            title: Gehienez, %{limit} boto dituzu banatzeko
+            votes: Zenbat boto

data/config/locales/fi.yml

@@ -0,0 +1,143 @@
+fi:
+  activemodel:
+    attributes:
+      proposal:
+        body: Runko
+        category_id: Kategoria
+        scope_id: Konteksti
+        title: Otsikko
+        user_group_id: Luo ehdotus käyttäjänä
+      proposal_answer:
+        answer: Vastaa
+  decidim:
+    features:
+      proposals:
+        actions:
+          create: Luo ehdotuksia
+          vote: Äänestä
+        name: Ehdotukset
+        settings:
+          global:
+            comments_enabled: Kommentointi sallittu
+            geocoding_enabled: Geokoodaus päällä
+            official_proposals_enabled: Viralliset ehdotukset sallittu
+            proposal_answering_enabled: Ehdotuksiin vastaaminen sallittu
+            vote_limit: Äänestysrajoite
+          step:
+            comments_blocked: Kommentointi estetty
+            creation_enabled: Ehdotusten luonti sallittu
+            proposal_answering_enabled: Ehdotuksiin vastaaminen sallittu
+            votes_blocked: Äänestys estetty
+            votes_enabled: Äänestys sallittu
+    proposals:
+      actions:
+        answer: Vastaa
+        new: Uusi ehdotus
+        title: Toiminnot
+      admin:
+        models:
+          proposal:
+            name: Ehdotus
+        proposal_answers:
+          edit:
+            accepted: Hyväksytty
+            answer_proposal: Vastaa ehdotukseen
+            rejected: Hylätty
+            title: 'Vastaa ehdotukseen: %{title}'
+        proposals:
+          answer:
+            invalid: Ehdotukseen vastaamisessa esiintyi virhe
+            success: Ehdotukseen vastattu onnistuneesti
+          create:
+            invalid: Ehdotuksen luonnissa tapahtui virhe
+            success: Ehdotus luotu onnistuneesti
+          form:
+            select_a_category: Valitse kategoria
+          index:
+            title: Ehdotukset
+          new:
+            create: Luo ehdotus
+            title: Uusi ehdotus
+      answers:
+        accepted: Hyväksytty
+        not_answered: Vastaamaton
+        rejected: Hylätty
+      create:
+        error: Ehdotuksen tallennuksessa tapahtui virhe.
+        success: Ehdotus luotu onnistuneesti.
+      models:
+        proposal:
+          fields:
+            category: Kategoria
+            official_proposal: Virallinen ehdotus
+            scope: Konteksti
+            state: Tila
+            title: Otsikko
+      proposals:
+        count:
+          proposals_count:
+            one: 1 ehdotus
+            other: "%{count} ehdotusta"
+        filters:
+          accepted: Hyväksytty
+          activity: Aktiivisuus
+          all: Kaikki
+          category: Kategoria
+          citizenship: Kansalaisuus
+          official: Virallinen
+          origin: Alkuperä
+          rejected: Hylätty
+          related_to: Liittyy aiheeseen
+          scopes: Kontekstit
+          search: Haku
+          state: Tila
+          voted: Äänestetty
+        filters_small_view:
+          close_modal: Sulje ikkuna
+          filter: Suodata
+          filter_by: Suodata
+          unfold: Avaa
+        index:
+          new_proposal: Uusi ehdotus
+          view_proposal: Näytä ehdotus
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>ääni
+            other: <span class="card--list__data__number">%{count}</span>ääntä
+        new:
+          back: Takaisin
+          select_a_category: Valitse kategoria
+          send: Lähetä
+          title: Uusi ehdotus
+        orders:
+          label: 'Järjestä ehdotukset:'
+          most_voted: Eniten ääniä saaneet
+          random: Satunnainen
+          recent: Viimeisimmät
+        proposal:
+          view_proposal: Näytä ehdotus
+        show:
+          proposal_accepted_reason: 'Tämä ehdotus on hyväksytty, koska:'
+          proposal_rejected_reason: 'Tämä ehdotus on hylätty, koska:'
+          report: Ilmoita
+        vote_button:
+          already_voted: Jo äänestetty
+          no_votes_remaining: Ei ääniä jäljellä
+          vote: Äänestä
+          votes_blocked: Äänestys estetty
+        votes_count:
+          count:
+            one: ÄÄNI
+            other: ÄÄNTÄ
+        votes_limit:
+          vote_limit:
+            description: Voit maksimissaan äänestää %{limit} ehdotusta sen sijaan, että voisit äänestää kuinka montaa haluat.
+            left: Jäljellä
+            title: Sinulla on %{limit} ääntä käytettävänäsi
+            votes: Äänet
+    resource_links:
+      included_proposals:
+        proposal_projects: 'Ehdotus esiintyy näissä projekteissa:'
+        proposal_results: 'Ehdotus esiintyy näissä tuloksissa:'
+      proposals_from_meeting:
+        proposal_meetings: Liittyvät tapaamiset

data/db/migrate/20170215113152_create_proposal_reports.rb

@@ -0,0 +1,14 @@
+class CreateProposalReports < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_proposals_proposal_reports do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_proposal_result_proposal" }
+      t.references :decidim_user, null: false, index: { name: "decidim_proposals_proposal_result_user" }
+      t.string :reason, null: false
+      t.text :details
+
+      t.timestamps
+    end
+
+    add_index :decidim_proposals_proposal_reports, [:decidim_proposal_id, :decidim_user_id], unique: true, name: "decidim_proposals_proposal_report_proposal_user_unique"
+  end
+end

data/db/migrate/20170215131720_add_report_count_to_proposals.rb

@@ -0,0 +1,5 @@
+class AddReportCountToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :report_count, :integer, default: 0
+  end
+end

data/db/migrate/20170215132030_add_reference_to_proposals.rb

@@ -0,0 +1,7 @@
+class AddReferenceToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :reference, :string
+    Decidim::Proposals::Proposal.find_each(&:save)
+    change_column_null :decidim_proposals_proposals, :reference, false
+  end
+end

data/db/migrate/20170220152416_add_hidden_at_to_proposals.rb

@@ -0,0 +1,5 @@
+class AddHiddenAtToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :hidden_at, :datetime
+  end
+end

data/db/migrate/20170228105156_add_geolocalization_fields_to_proposals.rb

@@ -0,0 +1,7 @@
+class AddGeolocalizationFieldsToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :address, :text
+    add_column :decidim_proposals_proposals, :latitude, :float
+    add_column :decidim_proposals_proposals, :longitude, :float
+  end
+end

data/db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb

@@ -0,0 +1,26 @@
+class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
+  class Decidim::Proposals::ProposalReport < ApplicationRecord
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+    belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal"
+  end
+
+  def change
+    Decidim::Proposals::ProposalReport.all.each do |proposal_report|
+      moderation = Decidim::Moderation.find_or_create_by!({
+        reportable: proposal_report.proposal,
+        participatory_process: proposal_report.proposal.feature.participatory_process
+      })
+      Decidim::Report.create!({
+        moderation: moderation,
+        user: proposal_report.user,
+        reason: proposal_report.reason,
+        details: proposal_report.details
+      })
+      moderation.update_attributes!(report_count: moderation.report_count + 1)
+    end
+
+    drop_table :decidim_proposals_proposal_reports
+    remove_column :decidim_proposals_proposals, :report_count
+    remove_column :decidim_proposals_proposals, :hidden_at
+  end
+end

data/lib/decidim/proposals/feature.rb

@@ -19,8 +19,8 @@ Decidim.register_feature(:proposals) do |feature|
     settings.attribute :vote_limit, type: :integer, default: 0
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
-    settings.attribute :scoped_proposals_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :geocoding_enabled, type: :boolean, default: false
   end
 
   feature.settings(:step) do |settings|
@@ -53,7 +53,8 @@ Decidim.register_feature(:proposals) do |feature|
         }
       )
       categories = feature.participatory_process.categories
-      scopes = feature.organization.scopes
+      # So that we have some with global scope
+      scopes = feature.organization.scopes + [nil]
 
       20.times do |n|
         proposal = Decidim::Proposals::Proposal.create!(
@@ -77,7 +78,7 @@ Decidim.register_feature(:proposals) do |feature|
         end
 
         rand(3).times do |m|
-          email = "vote-author-#{process.id}-#{n}-#{m}@decidim.org"
+          email = "vote-author-#{process.id}-#{n}-#{m}@example.org"
           name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
 
           author = Decidim::User.create!(email: email,

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

@@ -50,6 +50,14 @@ FactoryGirl.define do
         }
       end
     end
+
+    trait :with_geocoding_enabled do
+      settings do
+        {
+          geocoding_enabled: true
+        }
+      end
+    end
   end
 
   factory :proposal, class: Decidim::Proposals::Proposal do