decidim 0.5.1 → 0.6.0

data/decidim-results/config/locales/fi.yml

@@ -13,19 +13,21 @@ fi:
         name: Tulokset
         settings:
           global:
+            announcement: Ilmoitus
             comments_enabled: Kommentointi sallittu
           step:
+            announcement: Ilmoitus
             comments_blocked: Kommentointi estetty
     resource_links:
       included_proposals:
         result_proposals: Projektit, jotka sisältyvät tähän tulokseen
-      meetings_through_proposals:
-        result_meetings: Liittyvät tapaamiset
     results:
       actions:
         confirm_destroy: Oletko varma, että haluat poistaa tämän tuloksen?
         destroy: Poista
         edit: Muokkaa
+        new: Uusi
+        preview: Esikatsele
         title: Toiminnot
       admin:
         models:
@@ -39,9 +41,11 @@ fi:
             success: Tulos poistettu onnistuneesti
           edit:
             title: Muokkaa tulosta
+            update: Päivitä
           index:
             title: Tulokset
           new:
+            create: Luo
             title: Uusi tulos
           update:
             invalid: Tuloksen päivityksessä tapahtui virhe
@@ -57,6 +61,8 @@ fi:
             other: "%{count} tulosta"
         filters:
           category: Kategoria
+          category_prompt: Valitse kategoria
+          scope_prompt: Valitse konteksti
           scopes: Konteksti
           search: Haku
         filters_small_view:

data/decidim-results/config/locales/fr.yml

@@ -13,14 +13,14 @@ fr:
         name: Résultats
         settings:
           global:
+            announcement: Annonce
             comments_enabled: Commentaires activés
           step:
+            announcement: Annonce
             comments_blocked: Commentaires bloqués
     resource_links:
       included_proposals:
         result_proposals: Propositions incluses dans ce résultat
-      meetings_through_proposals:
-        result_meetings: Rencontres connexes
     results:
       actions:
         confirm_destroy: Êtes-vous sûr de vouloir supprimer ce résultat?
@@ -62,7 +62,8 @@ fr:
         filters:
           category: Catégorie
           category_prompt: Sélectionner une catégorie
-          scopes: Zones d'application
+          scope_prompt: Sélectionnez une portée
+          scopes: Zone d'application
           search: Rechercher
         filters_small_view:
           close_modal: Fermer la fenêtre de dialogue
@@ -74,6 +75,6 @@ fr:
             attendees: Participants
             comments: Commentaires
             contributions: Contributions
-            meetings: Rencontre
+            meetings: Réunions
             proposals: Propositions
             votes: Soutiens

data/decidim-results/config/locales/it.yml

@@ -13,14 +13,14 @@ it:
         name: Risultati
         settings:
           global:
+            announcement: Annuncio
             comments_enabled: Commenti abilitati
           step:
+            announcement: Annuncio
             comments_blocked: Commenti bloccati
     resource_links:
       included_proposals:
         result_proposals: Proposte incluse in questo risultato
-      meetings_through_proposals:
-        result_meetings: Meetin correlati
     results:
       actions:
         confirm_destroy: Sei sicuro di voler cancellare questo risultato?
@@ -62,6 +62,7 @@ it:
         filters:
           category: Categoria
           category_prompt: Scegli una categoria
+          scope_prompt: Selezionare un ambito
           scopes: Visibilità
           search: Cerca
         filters_small_view:
@@ -74,5 +75,6 @@ it:
             attendees: Partecipanti
             comments: Commenti
             contributions: Contributi
+            meetings: Riunioni
             proposals: Proposte
             votes: Voti

data/decidim-results/config/locales/nl.yml

@@ -2,4 +2,79 @@ nl:
   activemodel:
     attributes:
       result:
+        decidim_category_id: Categorie
+        decidim_scope_id: Reikwijdte
+        description: Beschrijving
+        proposal_ids: Inbegrepen voorstellen
         title: Titel
+  decidim:
+    features:
+      results:
+        name: Resultaten
+        settings:
+          global:
+            announcement: Aankondiging
+            comments_enabled: Reacties ingeschakeld
+          step:
+            announcement: Aankondiging
+            comments_blocked: Reacties geblokkeerd
+    resource_links:
+      included_proposals:
+        result_proposals: Voorstellen opgenomen in dit resultaat
+    results:
+      actions:
+        confirm_destroy: Weet u zeker dat u dit resultaat wilt verwijderen?
+        destroy: Verwijderen
+        edit: Bewerk
+        new: nieuwe
+        preview: Voorbeeld
+        title: Acties
+      admin:
+        models:
+          result:
+            name: Resultaat
+        results:
+          create:
+            invalid: Er is een probleem opgetreden bij het maken van dit resultaat
+            success: Resultaat met succes gemaakt
+          destroy:
+            success: Resultaat met succes verwijderd
+          edit:
+            title: Bewerk resultaat
+            update: Bijwerken
+          index:
+            title: Resultaten
+          new:
+            create: Creëren
+            title: Nieuw resultaat
+          update:
+            invalid: Er is een probleem opgetreden bij het bijwerken van dit resultaat
+            success: Resultaat met succes bijgewerkt
+      models:
+        result:
+          fields:
+            title: Titel
+      results:
+        count:
+          results_count:
+            one: 1 resultaat
+            other: "%{count} resultaten"
+        filters:
+          category: Categorie
+          category_prompt: Kies een categorie
+          scope_prompt: Selecteer een bereik
+          scopes: Scopes
+          search: Zoeken
+        filters_small_view:
+          close_modal: Dicht modaal
+          filter: Filter
+          filter_by: Filteren op
+          unfold: Ontvouwen
+        show:
+          stats:
+            attendees: Deelnemers
+            comments: Reacties
+            contributions: Bijdragen
+            meetings: Vergaderingen
+            proposals: Voorstellen
+            votes: Ondersteunt

data/decidim-results/config/locales/pl.yml

@@ -1,5 +1,81 @@
 pl:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Kategoria
+        decidim_scope_id: Zakres
+        description: Opis
+        proposal_ids: Zawarte propozycje
+        title: Tytuł
   decidim:
+    features:
+      results:
+        name: wyniki
+        settings:
+          global:
+            announcement: Ogłoszenie
+            comments_enabled: Komentarze włączone
+          step:
+            announcement: Ogłoszenie
+            comments_blocked: Komentarze zablokowane
+    resource_links:
+      included_proposals:
+        result_proposals: Propozycje zawarte w tym wyniku
     results:
       actions:
+        confirm_destroy: Czy na pewno chcesz usunąć ten wynik?
+        destroy: Kasować
+        edit: Edytuj
         new: Nowy
+        preview: Podgląd
+        title: Działania
+      admin:
+        models:
+          result:
+            name: Wynik
+        results:
+          create:
+            invalid: Podczas tworzenia tego wyniku wystąpił problem
+            success: Wynik został pomyślnie utworzony
+          destroy:
+            success: Wynik został pomyślnie usunięty
+          edit:
+            title: Edytuj wynik
+            update: Aktualizuj
+          index:
+            title: Wyniki
+          new:
+            create: Utwórz
+            title: Nowy wynik
+          update:
+            invalid: Podczas aktualizowania tego wyniku wystąpił problem
+            success: Wynik został zaktualizowany
+      models:
+        result:
+          fields:
+            title: Tytuł
+      results:
+        count:
+          results_count:
+            one: 1 wynik
+            few: "%{count} wyniki"
+            other: "%{count} wyników"
+        filters:
+          category: Kategoria
+          category_prompt: Wybierz kategorię
+          scope_prompt: Wybierz zakres
+          scopes: Zakresy
+          search: Szukaj
+        filters_small_view:
+          close_modal: Zamknij modal
+          filter: Filtruj
+          filter_by: Filtruj według
+          unfold: Rozwiń
+        show:
+          stats:
+            attendees: Uczestnicy i uczestniczki
+            comments: Komentarze
+            contributions: Wkład
+            meetings: Spotkania
+            proposals: Propozycje
+            votes: Wsparcie

data/decidim-results/config/locales/uk.yml

@@ -0,0 +1,82 @@
+uk:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Розділ
+        decidim_scope_id: Обсяг
+        description: Опис
+        proposal_ids: Включені пропозиції
+        title: Назва
+  decidim:
+    features:
+      results:
+        name: Підсумки
+        settings:
+          global:
+            announcement: Оголошення
+            comments_enabled: Коментарі ввімкнено
+          step:
+            announcement: Оголошення
+            comments_blocked: Коментарі заблоковано
+    resource_links:
+      included_proposals:
+        result_proposals: Пропозиції, включені до цих підсумків
+    results:
+      actions:
+        confirm_destroy: Ви дійсно бажаєте видалити ці підсумки?
+        destroy: Видалити
+        edit: Редагувати
+        new: Нові
+        preview: Попередній перегляд
+        title: Дії
+      admin:
+        models:
+          result:
+            name: Підсумки
+        results:
+          create:
+            invalid: При створенні цих підсумків сталася помилка
+            success: Підсумки успішно створено
+          destroy:
+            success: Підсумки успішно видалено
+          edit:
+            title: Редагувати підсумки
+            update: Оновити
+          index:
+            title: Підсумки
+          new:
+            create: Створити
+            title: Нові підсумки
+          update:
+            invalid: При оновленні цих підсумків сталася помилка
+            success: Підсумки успішно оновлено
+      models:
+        result:
+          fields:
+            title: Назва
+      results:
+        count:
+          results_count:
+            one: 1 підсумок
+            few: "%{count} підсумки"
+            many: "%{count} підсумків"
+            other: "%{count} підсумків"
+        filters:
+          category: Розділ
+          category_prompt: Оберіть розділ
+          scope_prompt: Оберіть обсяг
+          scopes: Обсяги
+          search: Шукати
+        filters_small_view:
+          close_modal: Закрити віконце
+          filter: Відібрати
+          filter_by: 'Відібрати за ознакою:'
+          unfold: Розгорнути
+        show:
+          stats:
+            attendees: Учасники
+            comments: Коментарі
+            contributions: Внесені пропозиції
+            meetings: Зустрічі
+            proposals: Пропозиції
+            votes: Підтримує

data/decidim-results/decidim-results.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-admin", Decidim.version
+  s.add_development_dependency "decidim-participatory_processes", Decidim.version
   s.add_development_dependency "decidim-comments", Decidim.version
   s.add_development_dependency "decidim-proposals", Decidim.version
   s.add_development_dependency "decidim-meetings", Decidim.version

data/decidim-results/lib/decidim/results/feature.rb

@@ -35,19 +35,19 @@ Decidim.register_feature(:results) do |feature|
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
-  feature.seeds do |process|
+  feature.seeds do |participatory_space|
     feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(process.organization.available_locales, :results).i18n_name,
+      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :results).i18n_name,
       manifest_name: :results,
       published_at: Time.current,
-      participatory_process: process
+      participatory_space: participatory_space
     )
 
     3.times do
       result = Decidim::Results::Result.create!(
         feature: feature,
-        scope: process.organization.scopes.sample,
-        category: process.categories.sample,
+        scope: participatory_space.organization.scopes.sample,
+        category: participatory_space.categories.sample,
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)

data/decidim-results/lib/decidim/results/test/factories.rb

@@ -5,9 +5,9 @@ require "decidim/dev"
 
 FactoryGirl.define do
   factory :result_feature, parent: :feature do
-    name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :results).i18n_name }
+    name { Decidim::Features::Namer.new(participatory_space.organization.available_locales, :results).i18n_name }
     manifest_name :results
-    participatory_process { create(:participatory_process, :with_steps) }
+    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
   end
 
   factory :result, class: Decidim::Results::Result do

data/decidim-results/spec/commands/create_result_spec.rb

@@ -5,11 +5,11 @@ require "spec_helper"
 describe Decidim::Results::Admin::CreateResult do
   let(:organization) { create :organization, available_locales: [:en] }
   let(:participatory_process) { create :participatory_process, organization: organization }
-  let(:current_feature) { create :feature, manifest_name: "results", participatory_process: participatory_process }
+  let(:current_feature) { create :feature, manifest_name: "results", participatory_space: participatory_process }
   let(:scope) { create :scope, organization: organization }
-  let(:category) { create :category, participatory_process: participatory_process }
+  let(:category) { create :category, participatory_space: participatory_process }
   let(:meeting_feature) do
-    create(:feature, manifest_name: "meetings", participatory_process: participatory_process)
+    create(:feature, manifest_name: "meetings", participatory_space: participatory_process)
   end
   let(:meeting) do
     create(
@@ -18,7 +18,7 @@ describe Decidim::Results::Admin::CreateResult do
     )
   end
   let(:proposal_feature) do
-    create(:feature, manifest_name: "proposals", participatory_process: participatory_process)
+    create(:feature, manifest_name: "proposals", participatory_space: participatory_process)
   end
   let(:proposals) do
     create_list(

data/decidim-results/spec/commands/update_result_spec.rb

@@ -6,10 +6,10 @@ describe Decidim::Results::Admin::UpdateResult do
   let(:result) { create :result }
   let(:organization) { result.feature.organization }
   let(:scope) { create :scope, organization: organization }
-  let(:category) { create :category, participatory_process: result.feature.participatory_process }
-  let(:participatory_process) { result.feature.participatory_process }
+  let(:category) { create :category, participatory_space: result.feature.participatory_space }
+  let(:participatory_process) { result.feature.participatory_space }
   let(:meeting_feature) do
-    create(:feature, manifest_name: :meetings, participatory_process: participatory_process)
+    create(:feature, manifest_name: :meetings, participatory_space: participatory_process)
   end
   let(:meeting) do
     create(
@@ -18,7 +18,7 @@ describe Decidim::Results::Admin::UpdateResult do
     )
   end
   let(:proposal_feature) do
-    create(:feature, manifest_name: :proposals, participatory_process: participatory_process)
+    create(:feature, manifest_name: :proposals, participatory_space: participatory_process)
   end
   let(:proposals) do
     create_list(