decidim-accountability 0.10.1 → 0.11.0.pre1

data/config/locales/nl.yml

@@ -2,7 +2,7 @@ nl:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: staat
+        decidim_accountability_status_id: Status
         decidim_category_id: Categorie
         decidim_scope_id: Scope
         description: Beschrijving
@@ -10,9 +10,9 @@ nl:
         progress: Vooruitgang
         project_ids: Opgenomen projecten
         proposals: Inbegrepen voorstellen
-        start_date: Begin datum
+        start_date: Startdatum
         title: Titel
-        updated_at: Bijgewerkt om
+        updated_at: Bijgewerkt op
       status:
         description: Beschrijving
         key: sleutel
@@ -58,9 +58,9 @@ nl:
             create: Maak resultaat
             title: Nieuw resultaat
           proposals:
-            close: Dichtbij
+            close: Sluit
             current_selection: Huidige selectie
-            select: kiezen
+            select: Selecteer
           update:
             invalid: Er is een probleem opgetreden bij het bijwerken van dit resultaat
             success: Resultaat met succes bijgewerkt
@@ -103,14 +103,18 @@ nl:
             success: Item succesvol bijgewerkt
       admin_log:
         result:
-          create: "%{user_name} gemaakt resultaat %{resource_name} in %{space_name}"
+          create: "%{user_name} heeft het resultaat %{resource_name} gemaakt in %{space_name}"
+          delete: "%{user_name} verwijderde het resultaat %{resource_name} in %{space_name}"
           update: "%{user_name} bijgewerkt resultaat %{resource_name} in %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Het bovenliggende element is niet gevonden in de database (ID: %{id})'
       models:
         result:
           fields:
             end_date: Einddatum
             progress: Vooruitgang
-            start_date: Begin datum
+            start_date: Startdatum
             status: Status
             title: Titel
         status:
@@ -148,7 +152,7 @@ nl:
             contributions: Bijdrage
             last_edited_by: Laatst bewerkt door
             last_updated_at: Laatst bijgewerkt om
-            meetings: Vergaderingen
+            meetings: Events
             number_of_versions: versies
             proposals: Voorstellen
             show_all_versions: Toon alle versies
@@ -167,16 +171,9 @@ nl:
           changes_at_title: Veranderingen bij "%{title}"
         version:
           version_index: Versie %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'Het voorstel "%{proposal_title}" is in een resultaat opgenomen. Je kunt het vanaf deze pagina bekijken:'
-          email_outro: Je hebt deze melding ontvangen omdat je "%{proposal_title}" volgt. Je kunt stoppen met het ontvangen van meldingen na de vorige link.
-          email_subject: Een update voor %{proposal_title}
-          notification_title: Het voorstel <a href="%{proposal_path}">%{proposal_title}</a> is opgenomen in het <a href="%{resource_path}">%{resource_title}</a> resultaat.
-    features:
+    components:
       accountability:
-        name: Verantwoording
+        name: Verantwoordelijkheid
         settings:
           global:
             categories_label: Naam voor "Categorieën"
@@ -184,10 +181,17 @@ nl:
             display_progress_enabled: Geef de voortgang weer
             heading_leaf_level_results: Naam voor "Projecten"
             heading_parent_level_results: Naam voor "Resultaten"
-            intro: Intro
+            intro: Inleiding
             subcategories_label: Naam voor 'Subcategorieën'
           step:
             comments_blocked: Reacties geblokkeerd
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'Het voorstel "%{proposal_title}" is in een resultaat opgenomen. Je kan het vanaf deze pagina bekijken:'
+          email_outro: Je hebt deze melding ontvangen omdat je "%{proposal_title}" volgt. Je kan de meldingen deactiveren door te klikken op de vorige link.
+          email_subject: Een update voor %{proposal_title}
+          notification_title: Het voorstel <a href="%{proposal_path}">%{proposal_title}</a> is opgenomen in het <a href="%{resource_path}">%{resource_title}</a> resultaat.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/pl.yml

@@ -2,7 +2,7 @@ pl:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: status
+        decidim_accountability_status_id: Status
         decidim_category_id: Kategoria
         decidim_scope_id: Zakres
         description: Opis
@@ -104,7 +104,11 @@ pl:
       admin_log:
         result:
           create: "%{user_name} utworzony wynik %{resource_name} w %{space_name}"
+          delete: "%{user_name} usunął %{resource_name} wynik w %{space_name}"
           update: "%{user_name} zaktualizowany wynik %{resource_name} w %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Nie znaleziono elementu nadrzędnego w bazie danych (ID: %{id})'
       models:
         result:
           fields:
@@ -163,14 +167,7 @@ pl:
           changes_at_title: Zmiany w "%{title}"
         version:
           version_index: Wersja %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'Wniosek "%{proposal_title}" został uwzględniony w wyniku. Możesz go zobaczyć na tej stronie:'
-          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz "%{proposal_title}". Możesz przestać otrzymywać powiadomienia po poprzednim linku.
-          email_subject: Aktualizacja do %{proposal_title}
-          notification_title: Wniosek <a href="%{proposal_path}">%{proposal_title}</a> został uwzględniony w wyniku <a href="%{resource_path}">%{resource_title}</a>.
-    features:
+    components:
       accountability:
         name: Odpowiedzialność
         settings:
@@ -184,6 +181,13 @@ pl:
             subcategories_label: Nazwa dla "podkategorii"
           step:
             comments_blocked: Komentarze zablokowane
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'Wniosek "%{proposal_title}" został uwzględniony w wyniku. Możesz go zobaczyć na tej stronie:'
+          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz "%{proposal_title}". Możesz przestać otrzymywać powiadomienia po poprzednim linku.
+          email_subject: Aktualizacja do %{proposal_title}
+          notification_title: Wniosek <a href="%{proposal_path}">%{proposal_title}</a> został uwzględniony w wyniku <a href="%{resource_path}">%{resource_title}</a>.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/pt-BR.yml

@@ -2,7 +2,7 @@ pt-BR:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: status
+        decidim_accountability_status_id: Status
         decidim_category_id: Categoria
         decidim_scope_id: Âmbito
         description: Descrição
@@ -104,7 +104,11 @@ pt-BR:
       admin_log:
         result:
           create: "%{user_name} resultado criado %{resource_name} em %{space_name}"
+          delete: "%{user_name} eliminou o resultado %{resource_name} em %{space_name}"
           update: "%{user_name} resultado atualizado %{resource_name} em %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'O pai não foi encontrado no banco de dados (ID: %{id})'
       models:
         result:
           fields:
@@ -167,14 +171,7 @@ pt-BR:
           changes_at_title: Alterações em "%{title}"
         version:
           version_index: Versão %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'A proposta "%{proposal_title}" foi incluída em um resultado. Você pode vê-lo a partir desta página:'
-          email_outro: Você recebeu esta notificação porque está seguindo "%{proposal_title}". Você pode parar de receber notificações após o link anterior.
-          email_subject: Uma atualização para %{proposal_title}
-          notification_title: A proposta <a href="%{proposal_path}">%{proposal_title}</a> foi incluída no resultado <a href="%{resource_path}">%{resource_title}</a>.
-    features:
+    components:
       accountability:
         name: Prestação de contas
         settings:
@@ -188,6 +185,13 @@ pt-BR:
             subcategories_label: Nome para "Subcategorias"
           step:
             comments_blocked: Comentários bloqueados
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'A proposta "%{proposal_title}" foi incluída em um resultado. Você pode vê-lo a partir desta página:'
+          email_outro: Você recebeu esta notificação porque está seguindo "%{proposal_title}". Você pode parar de receber notificações após o link anterior.
+          email_subject: Uma atualização para %{proposal_title}
+          notification_title: A proposta <a href="%{proposal_path}">%{proposal_title}</a> foi incluída no resultado <a href="%{resource_path}">%{resource_title}</a>.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/pt.yml

@@ -2,7 +2,7 @@ pt:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: status
+        decidim_accountability_status_id: Status
         decidim_category_id: Categoria
         decidim_scope_id: Âmbito
         description: Descrição
@@ -104,7 +104,11 @@ pt:
       admin_log:
         result:
           create: "%{user_name} resultado criado %{resource_name} em %{space_name}"
+          delete: "%{user_name} eliminou o resultado %{resource_name} em %{space_name}"
           update: "%{user_name} resultado atualizado %{resource_name} em %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'O pai não foi encontrado no banco de dados (ID: %{id})'
       models:
         result:
           fields:
@@ -167,14 +171,7 @@ pt:
           changes_at_title: Alterações em "%{title}"
         version:
           version_index: Versão %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'A proposta "%{proposal_title}" foi incluída em um resultado. Você pode vê-lo a partir desta página:'
-          email_outro: Você recebeu esta notificação porque está seguindo "%{proposal_title}". Você pode parar de receber notificações após o link anterior.
-          email_subject: Uma atualização para %{proposal_title}
-          notification_title: A proposta <a href="%{proposal_path}">%{proposal_title}</a> foi incluída no resultado <a href="%{resource_path}">%{resource_title}</a>.
-    features:
+    components:
       accountability:
         name: Prestação de contas
         settings:
@@ -188,6 +185,13 @@ pt:
             subcategories_label: Nome para "Subcategorias"
           step:
             comments_blocked: Comentários bloqueados
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'A proposta "%{proposal_title}" foi incluída em um resultado. Você pode vê-lo a partir desta página:'
+          email_outro: Você recebeu esta notificação porque está seguindo "%{proposal_title}". Você pode parar de receber notificações após o link anterior.
+          email_subject: Uma atualização para %{proposal_title}
+          notification_title: A proposta <a href="%{proposal_path}">%{proposal_title}</a> foi incluída no resultado <a href="%{resource_path}">%{resource_title}</a>.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/ru.yml

@@ -2,7 +2,6 @@ ru:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: состояние
         decidim_category_id: Категория
         decidim_scope_id: Охват
         description: Описание

data/config/locales/sv.yml

@@ -2,7 +2,7 @@ sv:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: status
+        decidim_accountability_status_id: Status
         decidim_category_id: Kategori
         decidim_scope_id: Omfattning
         description: Beskrivning
@@ -104,7 +104,11 @@ sv:
       admin_log:
         result:
           create: "%{user_name} skapat resultat %{resource_name} i %{space_name}"
+          delete: "%{user_name} raderade resultatet %{resource_name} i %{space_name}"
           update: "%{user_name} uppdaterat resultat %{resource_name} i %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Föräldern hittades inte i databasen (ID: %{id})'
       models:
         result:
           fields:
@@ -167,14 +171,7 @@ sv:
           changes_at_title: Ändringar vid "%{title}"
         version:
           version_index: Version %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'Förslaget "%{proposal_title}" har inkluderats i ett resultat. Du kan se den från den här sidan:'
-          email_outro: Du har fått den här meddelandet eftersom du följer "%{proposal_title}". Du kan sluta ta emot meddelanden efter föregående länk.
-          email_subject: En uppdatering till %{proposal_title}
-          notification_title: Förslaget <a href="%{proposal_path}">%{proposal_title}</a> har inkluderats i <a href="%{resource_path}">%{resource_title}</a> resultat.
-    features:
+    components:
       accountability:
         name: Ansvarighet
         settings:
@@ -188,6 +185,13 @@ sv:
             subcategories_label: Namn på "Underkategorier"
           step:
             comments_blocked: Kommentarer blockerade
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'Förslaget "%{proposal_title}" har inkluderats i ett resultat. Du kan se den från den här sidan:'
+          email_outro: Du har fått den här meddelandet eftersom du följer "%{proposal_title}". Du kan sluta ta emot meddelanden efter föregående länk.
+          email_subject: En uppdatering till %{proposal_title}
+          notification_title: Förslaget <a href="%{proposal_path}">%{proposal_title}</a> har inkluderats i <a href="%{resource_path}">%{resource_title}</a> resultat.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/uk.yml

@@ -2,7 +2,6 @@ uk:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: стан
         decidim_category_id: Розділ
         decidim_scope_id: Терен
         description: Опис

data/db/migrate/20180305133145_rename_features_to_components_at_accountability.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class RenameFeaturesToComponentsAtAccountability < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :decidim_accountability_statuses, :decidim_feature_id, :decidim_component_id
+    rename_column :decidim_accountability_results, :decidim_feature_id, :decidim_component_id
+
+    if index_name_exists?(:decidim_accountability_results, "index_decidim_accountability_results_on_decidim_feature_id")
+      rename_index :decidim_accountability_results, "index_decidim_accountability_results_on_decidim_feature_id", "index_decidim_accountability_results_on_decidim_component_id"
+    end
+
+    if index_name_exists?(:decidim_accountability_statuses, "index_decidim_accountability_statuses_on_decidim_feature_id")
+      rename_index :decidim_accountability_statuses, "index_decidim_accountability_statuses_on_decidim_feature_id", "index_decidim_accountability_statuses_on_decidim_component_id"
+    end
+  end
+end

data/lib/decidim/accountability.rb

@@ -3,7 +3,7 @@
 require "decidim/accountability/admin"
 require "decidim/accountability/engine"
 require "decidim/accountability/admin_engine"
-require "decidim/accountability/feature"
+require "decidim/accountability/component"
 
 module Decidim
   # Base module for this engine.

data/lib/decidim/accountability/{feature.rb → component.rb}

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/features/namer"
+require_dependency "decidim/components/namer"
 
-Decidim.register_feature(:accountability) do |feature|
-  feature.engine = Decidim::Accountability::Engine
-  feature.admin_engine = Decidim::Accountability::AdminEngine
-  feature.icon = "decidim/accountability/icon.svg"
-  feature.stylesheet = "decidim/accountability/accountability"
+Decidim.register_component(:accountability) do |component|
+  component.engine = Decidim::Accountability::Engine
+  component.admin_engine = Decidim::Accountability::AdminEngine
+  component.icon = "decidim/accountability/icon.svg"
+  component.stylesheet = "decidim/accountability/accountability"
 
-  feature.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this feature" if Decidim::Accountability::Result.where(feature: instance).any?
+  component.on(:before_destroy) do |instance|
+    raise StandardError, "Can't remove this component" if Decidim::Accountability::Result.where(component: instance).any?
   end
 
-  feature.register_resource do |resource|
+  component.register_resource do |resource|
     resource.model_class_name = "Decidim::Accountability::Result"
     resource.template = "decidim/accountability/results/linked_results"
   end
 
-  feature.settings(:global) do |settings|
+  component.settings(:global) do |settings|
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :intro, type: :text, translated: true, editor: true
     settings.attribute :categories_label, type: :string, translated: true, editor: true
@@ -27,32 +27,32 @@ Decidim.register_feature(:accountability) do |feature|
     settings.attribute :display_progress_enabled, type: :boolean, default: true
   end
 
-  feature.register_stat :results_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |features, _start_at, _end_at|
-    Decidim::Accountability::Result.where(feature: features).count
+  component.register_stat :results_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, _start_at, _end_at|
+    Decidim::Accountability::Result.where(component: components).count
   end
 
-  feature.settings(:step) do |settings|
+  component.settings(:step) do |settings|
     settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
-  feature.exports :results do |exports|
-    exports.collection do |feature_instance|
+  component.exports :results do |exports|
+    exports.collection do |component_instance|
       Decidim::Accountability::Result
-        .where(feature: feature_instance)
-        .includes(:category, feature: { participatory_space: :organization })
+        .where(component: component_instance)
+        .includes(:category, component: { participatory_space: :organization })
     end
 
     exports.serializer Decidim::Accountability::ResultSerializer
   end
 
-  feature.seeds do |participatory_space|
-    admin_user = Decidim::User.where(
+  component.seeds do |participatory_space|
+    admin_user = Decidim::User.find_by(
       organization: participatory_space.organization,
       email: "admin@example.org"
-    ).first
+    )
 
-    feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :accountability).i18n_name,
+    component = Decidim::Component.create!(
+      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :accountability).i18n_name,
       manifest_name: :accountability,
       published_at: Time.current,
       participatory_space: participatory_space,
@@ -67,7 +67,7 @@ Decidim.register_feature(:accountability) do |feature|
 
     5.times do |i|
       Decidim::Accountability::Status.create!(
-        feature: feature,
+        component: component,
         name: Decidim::Faker::Localized.word,
         key: "status_#{i}"
       )
@@ -92,7 +92,7 @@ Decidim.register_feature(:accountability) do |feature|
         result = Decidim.traceability.create!(
           Decidim::Accountability::Result,
           admin_user,
-          feature: feature,
+          component: component,
           scope: participatory_space.organization.scopes.sample,
           category: category,
           title: Decidim::Faker::Localized.sentence(2),
@@ -107,7 +107,7 @@ Decidim.register_feature(:accountability) do |feature|
           child_result = Decidim.traceability.create!(
             Decidim::Accountability::Result,
             admin_user,
-            feature: feature,
+            component: component,
             parent: result,
             start_date: Time.zone.today,
             end_date: Time.zone.today + 10,