decidim 0.5.1 → 0.6.0

data/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -16,14 +16,14 @@
       <%= form.number_field :budget %>
     </div>
 
-    <% if current_participatory_process.has_subscopes? %>
+    <% if current_participatory_space.has_subscopes? %>
       <div class="row column" >
-        <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
+        <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
       </div>
     <% end %>
 
     <div class="row column" >
-      <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>
+      <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
     </div>
 
     <div class="row column">

data/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb

@@ -12,7 +12,7 @@
     </div>
   </div>
 
-  <% if current_participatory_process.has_subscopes? %>
+  <% if current_participatory_space.has_subscopes? %>
     <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(include_root: true) %>
   <% end %>
 

data/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb

@@ -30,6 +30,7 @@
         <div id="project-<%= project.id %>-budget-button">
           <%= render partial: 'project_budget_button', locals: { project: project } %>
         </div>
+        <%= render partial: "decidim/shared/follow_button", locals: { followable: project } %>
       </div>
     </div>
     <%= feature_reference(project) %>

data/decidim-budgets/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -108,10 +109,12 @@ ca:
         name: Pressupostos
         settings:
           global:
+            announcement: Avís
             comments_enabled: Comentaris habilitats
             total_budget: Pressupost total
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
           step:
+            announcement: Avís
             comments_blocked: Comentaris bloquejats
             show_votes: Mostra vots
             votes_enabled: Suports habilitats

data/decidim-budgets/config/locales/en.yml

@@ -48,17 +48,14 @@ en:
             title: Title
       projects:
         budget_confirm:
-          are_you_sure: Do you agree? Once you have confirmed your vote, you can not
-            change it.
+          are_you_sure: Do you agree? Once you have confirmed your vote, you can not change it.
           cancel: Cancel
           confirm: Confirm
           description: These are the projects you have chosen to be part of the budget.
           title: Confirm vote
         budget_excess:
           close: Close
-          description: This project exceeds the maximum budget and can not be added.
-            If you want, you can delete a project you have already selected to add,
-            or make your vote with your preferences.
+          description: This project exceeds the maximum budget and can not be added. If you want, you can delete a project you have already selected to add, or make your vote with your preferences.
           ok: OK
           title: Maximum budget exceeded
         budget_summary:
@@ -66,12 +63,9 @@ en:
           assigned: 'Assigned:'
           cancel_order: delete your vote and start over
           checked_out:
-            description: You've already voted for the budget. If you've changed your
-              mind, you can %{cancel_link}.
+            description: You've already voted for the budget. If you've changed your mind, you can %{cancel_link}.
             title: Budget vote completed
-          description: What projects do you think we should allocate budget for? Assign
-            at least %{minimum_budget} to the projects you want and vote with your
-            preferences to define the budget.
+          description: What projects do you think we should allocate budget for? Assign at least %{minimum_budget} to the projects you want and vote with your preferences to define the budget.
           title: You decide the budget
         count:
           projects_count:

data/decidim-budgets/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -12,7 +13,7 @@ es:
     budgets:
       actions:
         attachments: Archivos adjuntos
-        confirm_destroy: '¿Estás seguro de que deseas eliminar este proyecto?'
+        confirm_destroy: "¿Estás seguro de que deseas eliminar este proyecto?"
         destroy: Borrar
         edit: Editar
         new: Nuevo
@@ -47,7 +48,7 @@ es:
             title: Título
       projects:
         budget_confirm:
-          are_you_sure: '¿Estás de acuerdo? Una vez que hayas confirmado tu voto, no puedes cambiarlo.'
+          are_you_sure: "¿Estás de acuerdo? Una vez que hayas confirmado tu voto, no puedes cambiarlo."
           cancel: Cancelar
           confirm: Confirmar
           description: Estos son los proyectos que has elegido para formar parte del presupuesto.
@@ -58,13 +59,13 @@ es:
           ok: De acuerdo
           title: Presupuesto excedido
         budget_summary:
-          are_you_sure: '¿Estás seguro de que deseas cancelar tu voto?'
+          are_you_sure: "¿Estás seguro de que deseas cancelar tu voto?"
           assigned: 'Asignado:'
           cancel_order: eliminar tu voto y empezar de nuevo
           checked_out:
             description: Ya has votado para el presupuesto. Si has cambiado de idea, puedes %{cancel_link}.
             title: Voto enviado correctamente
-          description: '¿Qué proyectos crees que deberíamos asignar el presupuesto? Asigna por lo menos %{minimum_budget} a los proyectos que desees y vota para definir el presupuesto.'
+          description: "¿Qué proyectos crees que deberíamos asignar el presupuesto? Asigna por lo menos %{minimum_budget} a los proyectos que desees y vota para definir el presupuesto."
           title: Tú decides el presupuesto
         count:
           projects_count:
@@ -108,10 +109,12 @@ es:
         name: Presupuestos
         settings:
           global:
+            announcement: Aviso
             comments_enabled: Comentarios habilitados
             total_budget: Presupuesto total
             vote_threshold_percent: Porcentaje mínimo del presupuesto
           step:
+            announcement: Aviso
             comments_blocked: Comentarios bloqueados
             show_votes: Mostrar votos
             votes_enabled: Votos habilitados

data/decidim-budgets/config/locales/eu.yml

@@ -5,15 +5,15 @@ eu:
         budget: Aurrekontua
         decidim_category_id: Kategoria
         decidim_scope_id: Esparrua
-        description: Deskribapena
+        description: Descripción
         proposal_ids: Honekin lotutako proposamenak
-        title: Izenburua
+        title: Titulua
   decidim:
     budgets:
       actions:
         attachments: Fitxategi erantsiak
         confirm_destroy: Ziur zaude proiektu hau ezabatu nahi duzula?
-        destroy: Garbitu
+        destroy: Ezabatu
         edit: Editatu
         new: Berria
         preview: Aurreikusi
@@ -27,7 +27,7 @@ eu:
             invalid: Arazo bat izan da proiektu hau sortzean
             success: Proiektua ongi sortu da
           destroy:
-            success: Proiektu ongi ezabatu da
+            success: Proiektua ongi ezabatu da
           edit:
             title: Editatu proiektua
             update: Eguneratu
@@ -44,19 +44,19 @@ eu:
       models:
         project:
           fields:
-            title: Izenburua
+            title: Titulua
       projects:
         budget_confirm:
-          are_you_sure: Ados zaude? Behin zure botoa baieztatuta, ezin izanen duzu aldatu.'
+          are_you_sure: Ados zaude? Behin zure botoa baieztatuta, ezin izanen duzu aldatu.
           cancel: Utzi
           confirm: Baieztatu
-          description: Proiektu hauek hautatu dituzu aurrekontuan sartzeko
+          description: Proiektu hauek hautatu dituzu aurrekontuan sartzeko.
           title: Baieztatu botoa
         budget_excess:
           close: Itxi
           description: Proiektu honek gehieneko aurrekontua gainditzen du, eta ezin da gehitu. Nahi baduzu, jada hautatua duzun proiektu bat ezaba dezakezu edo botoa eman zure lehenespenekin bat.
           ok: Ados
-          title: Aurrekontua gainditu da.
+          title: Aurrekontua gainditu da
         budget_summary:
           are_you_sure: Ziur zaude zure botoa ezeztatu nahi duzula?
           assigned: 'Esleituta:'
@@ -82,7 +82,7 @@ eu:
           filter_by: 'Iragazi honen arabera:'
           unfold: Zabaldu
         order_progress:
-          vote: Bozkatu
+          vote: Proiektuaren alde egin
         order_selected_projects:
           remove: Kendu
           selected_projects:
@@ -108,10 +108,12 @@ eu:
         name: Aurrekontuak
         settings:
           global:
+            announcement: Oharra
             comments_enabled: Iruzkinak gaituta
             total_budget: Guztizko aurrekontua
             vote_threshold_percent: Aurrekontuaren gutxieneko ehunekoa
           step:
+            announcement: Oharra
             comments_blocked: Iruzkinak blokeatuta
             show_votes: Erakutsi botoak
             votes_enabled: Botoak gaituta

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

@@ -15,6 +15,8 @@ fi:
         confirm_destroy: Haluatko varmasti poistaa tämän projektin?
         destroy: Poista
         edit: Muokkaa
+        new: Uusi
+        preview: Esikatsele
         title: Toiminnot
       admin:
         models:
@@ -28,11 +30,13 @@ fi:
             success: Projekti tuhottu onnistuneesti
           edit:
             title: Muokkaa projektia
+            update: Päivitä
           index:
             finished_orders: Valmiit tilaukset
             pending_orders: Odottavat tilaukset
             title: Projektit
           new:
+            create: Luo
             title: Uusi tulos
           update:
             invalid: Tämän projektin päivityksessä tapahtui virhe
@@ -68,6 +72,8 @@ fi:
             other: "%{count} projektia"
         filters:
           category: Kategoria
+          category_prompt: Valitse kategoria
+          scope_prompt: Valitse konteksti
           scopes: Konteksti
           search: Haku
         filters_small_view:
@@ -102,11 +108,14 @@ fi:
         name: Budjetit
         settings:
           global:
+            announcement: Ilmoitus
             comments_enabled: Kommentointi sallittu
             total_budget: Koko budjetti
             vote_threshold_percent: Äänestyskynnyksen prosentti
           step:
+            announcement: Ilmoitus
             comments_blocked: Kommentointi kielletty
+            show_votes: Näytä äänet
             votes_enabled: Äänestys sallittu
     orders:
       checkout:
@@ -115,6 +124,9 @@ fi:
       destroy:
         error: Äänesi peruutuksen yhteydessä tapahtui virhe
         success: Äänesi on peruttu onnistuneesti
+    resource_links:
+      included_proposals:
+        project_proposals: 'Tähän projektiin liittyvät ehdotukset:'
   index:
     confirmed_orders_count: Tilauksien määrä
   total_budget: Koko budjetti

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

@@ -11,7 +11,7 @@ fr:
   decidim:
     budgets:
       actions:
-        attachments: Pièces jointes
+        attachments: Documents liés
         confirm_destroy: Êtes-vous certain de vouloir supprimer ce projet?
         destroy: Supprimer
         edit: Modifier
@@ -53,7 +53,7 @@ fr:
           description: Voici les projets que vous avez choisis pour le budget.
           title: Confirmez votre vote
         budget_excess:
-          close: Fermer
+          close: Clore
           description: Ce projet dépasse le budget maximum et ne peut pas être ajouté. Si vous le souhaitez, vous pouvez supprimer un projet que vous avez déjà sélectionné ou voter selon vos préférences.
           ok: D'accord
           title: Budget maximum dépassé
@@ -73,10 +73,11 @@ 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 vue
+          close_modal: Fermer la fenêtre de dialogue
           filter: Filtrer
           filter_by: Filtrer par
           unfold: Déplier
@@ -107,10 +108,12 @@ fr:
         name: Budgets
         settings:
           global:
+            announcement: Annonce
             comments_enabled: Commentaires activés
             total_budget: Budget total
             vote_threshold_percent: Pourcentage de seuil de vote
           step:
+            announcement: Annonce
             comments_blocked: Commentaires bloqués
             show_votes: Afficher les votes
             votes_enabled: Votes activés

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

@@ -2,6 +2,7 @@ it:
   activemodel:
     attributes:
       project:
+        budget: Budget
         decidim_category_id: Categoria
         decidim_scope_id: Visibilità/ambito
         description: Descrizione
@@ -54,6 +55,7 @@ it:
         budget_excess:
           close: Chiudi
           description: Questo progetto supera il budget e non può essere aggiunto. Se vuoi puoi cancellare un progetto che hai già scelto di aggiungere, oppure votare in base alle tue preferenze.
+          ok: Ok
           title: Budget superato
         budget_summary:
           are_you_sure: Sei certo di voler cancellare il tuo voto?
@@ -71,6 +73,7 @@ it:
         filters:
           category: Categoria
           category_prompt: Scegli una categoria
+          scope_prompt: Selezionare un ambito
           scopes: Visibilità/ambito
           search: Cerca
         filters_small_view:
@@ -96,6 +99,7 @@ it:
           add: Aggiungi
           added: Aggiunto
         show:
+          budget: Budget
           view_all_projects: Visualizza tutti i progetti
     features:
       budgets:
@@ -104,10 +108,12 @@ it:
         name: Investimenti
         settings:
           global:
+            announcement: Annuncio
             comments_enabled: Commenti abilitati
             total_budget: Budget totale
             vote_threshold_percent: Soglia voti (percentuale)
           step:
+            announcement: Annuncio
             comments_blocked: Commenti bloccati
             show_votes: Visualizza voti
             votes_enabled: Voti abilitati

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

@@ -2,4 +2,131 @@ nl:
   activemodel:
     attributes:
       project:
+        budget: Begroting
+        decidim_category_id: Categorie
+        decidim_scope_id: Reikwijdte
         description: Beschrijving
+        proposal_ids: Verwante voorstellen
+        title: Titel
+  decidim:
+    budgets:
+      actions:
+        attachments: Bijlagen
+        confirm_destroy: Weet u zeker dat u dit project wilt verwijderen?
+        destroy: Verwijderen
+        edit: Bewerk
+        new: nieuwe
+        preview: Voorbeeld
+        title: Acties
+      admin:
+        models:
+          project:
+            name: Project
+        projects:
+          create:
+            invalid: Er is een probleem opgetreden met het creëren van dit project
+            success: Project succesvol gemaakt
+          destroy:
+            success: Project succesvol vernietigd
+          edit:
+            title: Bewerk project
+            update: Bijwerken
+          index:
+            finished_orders: Afgewerkte bestellingen
+            pending_orders: Openstaande bestellingen
+            title: Projecten
+          new:
+            create: Creëren
+            title: Nieuw resultaat
+          update:
+            invalid: Er is een probleem opgetreden bij het bijwerken van dit project
+            success: Project succesvol bijgewerkt
+      models:
+        project:
+          fields:
+            title: Titel
+      projects:
+        budget_confirm:
+          are_you_sure: Bent u het eens? Zodra u uw stem heeft bevestigd, kunt u het niet wijzigen.
+          cancel: Annuleer
+          confirm: Bevestigen
+          description: Dit zijn de projecten die u hebt gekozen om deel uit te maken van de begroting.
+          title: Bevestig de stem
+        budget_excess:
+          close: Sluit
+          description: Dit project overschrijdt het maximale budget en kan niet worden toegevoegd. Als u wilt, kunt u een project verwijderen dat u al hebt geselecteerd om toe te voegen of uw stem te maken met uw voorkeuren.
+          ok: OK
+          title: Maximum budget overschreden
+        budget_summary:
+          are_you_sure: Weet u zeker dat u uw stem wilt annuleren?
+          assigned: 'Toegewezen:'
+          cancel_order: Verwijder uw stem en begin opnieuw
+          checked_out:
+            description: Je hebt al voor de begroting gestemd. Als u van mening bent, kunt u %{cancel_link}.
+            title: Begrotingsstemming voltooid
+          description: Welke projecten denk je dat we budget moeten voordelen? Geef ten minste %{minimum_budget} toe aan de projecten die u wilt en stem met uw voorkeuren om het budget te definiëren.
+          title: U bepaalt het budget
+        count:
+          projects_count:
+            one: 1 project
+            other: "%{count} projecten"
+        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
+        order_progress:
+          vote: Stemmen
+        order_selected_projects:
+          remove: Verwijderen
+          selected_projects:
+            one: Geselecteerd project
+            other: Geselecteerde projecten
+          view: Uitzicht
+        project:
+          add: Toevoegen
+          count:
+            one: 1 ondersteuning
+            other: "%{count} ondersteunt"
+          remove: Verwijderen
+        project_budget_button:
+          add: Toevoegen
+          added: Toegevoegd
+        show:
+          budget: Begroting
+          view_all_projects: Bekijk alle projecten
+    features:
+      budgets:
+        actions:
+          vote: Stemmen
+        name: Begrotingen
+        settings:
+          global:
+            announcement: Aankondiging
+            comments_enabled: Reacties ingeschakeld
+            total_budget: Totale budget
+            vote_threshold_percent: Stem drempel percentage
+          step:
+            announcement: Aankondiging
+            comments_blocked: Reacties geblokkeerd
+            show_votes: T
+            votes_enabled: Stemmen ingeschakeld
+    orders:
+      checkout:
+        error: Er is een fout opgetreden tijdens het verwerken van uw stem
+        success: Uw stem is succesvol geaccepteerd
+      destroy:
+        error: Er is een fout opgetreden tijdens het annuleren van uw stem
+        success: Uw stem is succesvol geannuleerd
+    resource_links:
+      included_proposals:
+        project_proposals: 'Voorstellen opgenomen in dit project:'
+  index:
+    confirmed_orders_count: Bestellingen tellen
+  total_budget: Totale budget