decidim 0.0.7 → 0.0.8.1

data/decidim-api/README.md

@@ -23,7 +23,7 @@ $ bundle
 ```
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

data/decidim-budgets/README.md

@@ -17,7 +17,7 @@ $ bundle
 ```
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

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

@@ -15,7 +15,7 @@ ca:
         confirm_destroy: Estàs segur que vols eliminar aquest projecte?
         destroy: Esborrar
         edit: Editar
-        new: Nou %{name}
+        new: Nou
         preview: Previsualitzar
         title: Accions
       admin:
@@ -30,13 +30,13 @@ ca:
             success: Projecte eliminat correctament
           edit:
             title: Editar projecte
-            update: Actualitzar projecte
+            update: Actualitzar
           index:
             finished_orders: Vots finalitzats
             pending_orders: Vots en procés
             title: Projectes
           new:
-            create: Crear projecte
+            create: Crear
             title: Nou resultat
           update:
             invalid: Hi ha hagut un problema actualitzant aquest projecte

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

@@ -16,7 +16,7 @@ en:
         confirm_destroy: Are you sure you want to delete this project?
         destroy: Delete
         edit: Edit
-        new: New %{name}
+        new: New
         preview: Preview
         title: Actions
       admin:
@@ -31,13 +31,13 @@ en:
             success: Project successfully destroyed
           edit:
             title: Edit project
-            update: Update project
+            update: Update
           index:
             finished_orders: Finished orders
             pending_orders: Pending orders
             title: Projects
           new:
-            create: Create project
+            create: Create
             title: New result
           update:
             invalid: There's been a problem updating this project

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

@@ -15,7 +15,7 @@ es:
         confirm_destroy: '¿Estás seguro de que deseas eliminar este proyecto?'
         destroy: Borrar
         edit: Editar
-        new: Nuevo %{name}
+        new: Nuevo
         preview: Previsualizar
         title: Acciones
       admin:
@@ -30,13 +30,13 @@ es:
             success: Proyecto eliminado exitosamente
           edit:
             title: Editar proyecto
-            update: Actualizar proyecto
+            update: Actualizar
           index:
             finished_orders: Votos finalizados
             pending_orders: Votos pendientes
             title: Proyectos
           new:
-            create: Crear proyecto
+            create: Crear
             title: Nuevo resultado
           update:
             invalid: Ha habido un problema al actualizar este proyecto

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

@@ -15,7 +15,6 @@ eu:
         confirm_destroy: Ziur zaude proiektu hau ezabatu nahi duzula?
         destroy: Garbitu
         edit: Editatu
-        new: '%{name} berria'
         preview: Aurreikusi
         title: Ekintzak
       admin:
@@ -30,13 +29,11 @@ eu:
             success: Proiektu ongi ezabatu da
           edit:
             title: Editatu proiektua
-            update: Eguneratu proiektua
           index:
             finished_orders: Emandako botoak
             pending_orders: Emateke dauden botoak
             title: Proiektuak
           new:
-            create: Sortu proiektua
             title: Emaitza berria
           update:
             invalid: Arazo bat izan da proiektu hau eguneratzean

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

@@ -15,7 +15,6 @@ fi:
         confirm_destroy: Haluatko varmasti poistaa tämän projektin?
         destroy: Poista
         edit: Muokkaa
-        new: Uusi %{name}
         title: Toiminnot
       admin:
         models:
@@ -29,13 +28,11 @@ fi:
             success: Projekti tuhottu onnistuneesti
           edit:
             title: Muokkaa projektia
-            update: Päivitä projektia
           index:
             finished_orders: Valmiit tilaukset
             pending_orders: Odottavat tilaukset
             title: Projektit
           new:
-            create: Luo projekti
             title: Uusi tulos
           update:
             invalid: Tämän projektin päivityksessä tapahtui virhe

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

@@ -0,0 +1,97 @@
+fr:
+  activemodel:
+    attributes:
+      project:
+        budget: Budget
+        decidim_category_id: Catégorie
+        decidim_scope_id: Champ d'application
+        description: Description
+        proposal_ids: Propositions liées
+        title: Titre
+  decidim:
+    budgets:
+      actions:
+        attachments: Pièces jointes
+        confirm_destroy: Êtes-vous certain de vouloir supprimer ce projet?
+        destroy: Supprimer
+        edit: Modifier
+        preview: Aperçu
+        title: Actions
+      admin:
+        models:
+          project:
+            name: Projet
+        projects:
+          create:
+            invalid: Il y a eu un problème lors de la création de ce projet
+            success: Projet créé avec succès
+          destroy:
+            success: Projet supprimé avec succès
+          edit:
+            title: Éditer un projet
+          index:
+            finished_orders: Commandes terminées
+            pending_orders: Commandes en attente
+            title: Projets
+          new:
+            title: Nouveau résultat
+          update:
+            invalid: Il y a eu un problème de mise à jour de ce projet
+            success: Projet mis à jour avec succès
+      models:
+        project:
+          fields:
+            title: Titre
+      projects:
+        budget_confirm:
+          are_you_sure: Êtes-vous d'accord ? Une fois que vous aurez confirmé votre vote, vous ne pourrez plus le modifier.
+          cancel: Annuler
+          confirm: Confirmer
+          description: Voici les projets que vous avez choisis pour le budget.
+          title: Confirmez votre vote
+        budget_excess:
+          close: Fermer
+          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é
+        budget_summary:
+          are_you_sure: Êtes-vous certain de vouloir annuler votre vote ?
+          assigned: 'Affecté à :'
+          cancel_order: supprimer votre vote et recommencer
+          checked_out:
+            description: Vous avez déjà voté pour le budget. Si vous avez changé d'avis, vous pouvez %{cancel_link}.
+            title: Vote du budget terminé
+          description: A quels projets pensez-vous que nous devrions allouer un budget ? Assignez au moins %{minimum_budget} aux projets que vous soutenez et votez selon vos préférences pour définir le budget.
+          title: Vous décidez du budget
+        count:
+          projects_count:
+            one: 1 projet
+            other: "%{count} projets"
+        filters:
+          category: Catégorie
+          category_prompt: Sélectionner une catégorie
+          scopes: Étendues
+          search: Rechercher
+        filters_small_view:
+          close_modal: Fermer la vue
+          filter: Filtrer
+          filter_by: Filtrer par
+          unfold: Déplier
+        order_progress:
+          vote: Voter
+        order_selected_projects:
+          remove: Supprimer
+          selected_projects:
+            one: projet sélectionné
+            other: projets sélectionnés
+          view: Voir
+        project:
+          add: Ajouter
+          count:
+            one: 1 soutien
+            other: "%{count} soutiens"
+    features:
+      budgets:
+        settings:
+          global:
+            vote_threshold_percent: Pourcentage de seuil de vote

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

@@ -0,0 +1,5 @@
+nl:
+  activemodel:
+    attributes:
+      project:
+        description: Beschrijving

data/decidim-budgets/db/migrate/20170410074214_remove_not_null_reference_budgets.rb

@@ -0,0 +1,5 @@
+class RemoveNotNullReferenceBudgets < ActiveRecord::Migration[5.0]
+  def change
+    change_column_null :decidim_budgets_projects, :reference, true
+  end
+end

data/decidim-budgets/spec/shared/manage_projects_examples.rb

@@ -63,7 +63,7 @@ RSpec.shared_examples "manage projects" do
   end
 
   it "creates a new project" do
-    click_link "New Project"
+    find(".card-title a.button").click
 
     within ".new_project" do
       fill_in_i18n(

data/decidim-comments/README.md

@@ -69,7 +69,7 @@ Since we are using Typescript we can generate interfaces and types from our sche
 This command will create a file called `app/frontend/support/schema.ts` that can be used to strict type checking in our components.
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

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

@@ -0,0 +1,5 @@
+fr:
+  decidim:
+    comments:
+      comment_notification_mailer:
+        hello: Bonjour %{name},

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

@@ -0,0 +1,5 @@
+nl:
+  decidim:
+    comments:
+      comment_notification_mailer:
+        hello: Hallo %{name},

data/decidim-dev/README.md

@@ -18,7 +18,7 @@ $ bundle
 ```
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

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

@@ -0,0 +1,5 @@
+fr:
+  decidim:
+    resource_links:
+      test_link:
+        dummy_resource_dummy: Mannequin apparenté

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

@@ -0,0 +1,5 @@
+nl:
+  decidim:
+    resource_links:
+      test_link:
+        dummy_resource_dummy: Gerelateerde dummy

data/decidim-dev/lib/decidim/dev.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "letter_opener_web"
+require "decidim/dev/railtie"
 
 module Decidim
   # Decidim::Dev holds all the convenience logic and libraries to be able to
@@ -11,11 +12,13 @@ module Decidim
     #
     # Returns a String with the path for a particular asset.
     def self.asset(name)
-      File.join(
-        File.dirname(__FILE__),
-        "dev",
-        "assets",
-        name
+      File.expand_path(
+        File.join(
+          File.dirname(__FILE__),
+          "dev",
+          "assets",
+          name
+        )
       )
     end
   end

data/decidim-dev/lib/decidim/dev/common_rake.rb

@@ -1,28 +1,6 @@
 # frozen_string_literal: true
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require_relative "../../generators/decidim/dummy_generator"
-
-engine_path = Dir.pwd
-engine_name = engine_path.split("/").last
-dummy_app_path = File.expand_path(File.join(engine_path, "spec", "#{engine_name}_dummy_app"))
-
-desc "Generates a dummy app for testing"
-task :generate_test_app do
-  Decidim::Generators::DummyGenerator.start(
-    [
-      "--engine_path=#{engine_path}",
-      "--migrate=true",
-      "--quiet"
-    ]
-  )
-
-  require File.join(dummy_app_path, "config", "application")
-  Rails.application.load_tasks
-  Rake.application["assets:precompile"].invoke
-
-  FileUtils.cd(engine_path)
-end
 
 RSpec::Core::RakeTask.new(:spec)
-task default: [:generate_test_app, :spec]
+task default: [:spec]

data/decidim-dev/lib/decidim/dev/railtie.rb

@@ -0,0 +1,13 @@
+module Decidim
+  module Dev
+    class Railtie < Rails::Railtie
+      railtie_name :decidim_dev
+
+      rake_tasks do
+        Dir[File.join(File.dirname(__FILE__), "../../tasks/*.rake")].each do |file|
+          load file
+        end
+      end
+    end
+  end
+end

data/decidim-dev/lib/decidim/dev/test/base_spec_helper.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 ENV["RAILS_ENV"] ||= "test"
 
+root_path = File.join(Dir.pwd, "..")
 engine_name = ENV["ENGINE_NAME"]
 engine_spec_dir = File.join(Dir.pwd, "spec")
-dummy_app_path = File.expand_path(File.join(engine_spec_dir, "#{engine_name}_dummy_app"))
+dummy_app_path = File.expand_path(File.join(root_path, "spec", "decidim_dummy_app"))
 
-if ENV["CI"]
+if ENV["SIMPLECOV"]
   require "simplecov"
-  SimpleCov.root(ENV["TRAVIS_BUILD_DIR"])
+  SimpleCov.root(root_path)
 
   SimpleCov.start do
     filters.clear
@@ -17,7 +18,7 @@ if ENV["CI"]
     add_filter "/vendor/"
 
     add_filter do |src|
-      !(src.filename =~ /^#{ENV["TRAVIS_BUILD_DIR"]}/)
+      !(src.filename =~ /^#{root_path}/)
     end
   end
 
@@ -34,7 +35,7 @@ require "#{File.dirname(__FILE__)}/rspec_support/feature.rb"
 begin
   require "#{dummy_app_path}/config/environment"
 rescue LoadError
-  puts "Could not load dummy application. Please ensure you have run `bundle exec rake generate_test_app`"
+  puts "Could not load dummy application. Please ensure you have run `bundle exec rake decidim:generate_test_app`"
   puts "Tried to load it from #{dummy_app_path}"
   exit(-1)
 end

data/decidim-dev/lib/generators/decidim/dummy_generator.rb

@@ -18,8 +18,8 @@ module Decidim
     class DummyGenerator < Rails::Generators::Base
       desc "Generate dummy app for testing purposes"
 
-      class_option :engine_path, type: :string,
-                                 desc: "The library where the dummy app will be installed"
+      class_option :dummy_app_path, type: :string,
+                                    desc: "The path where the dummy app will be installed"
 
       def source_paths
         [
@@ -28,12 +28,13 @@ module Decidim
       end
 
       def cleanup
-        remove_directory_if_exists(dummy_path)
+        remove_directory_if_exists(dummy_app_path)
       end
 
       def create_dummy_app
         Decidim::Generators::AppGenerator.start [
-          dummy_path,
+          dummy_app_path,
+          "--app_const_base=DummyApplication",
           "--skip_gemfile",
           "--skip-bundle",
           "--skip-git",
@@ -44,29 +45,29 @@ module Decidim
       end
 
       def set_locales
-        inject_into_file "#{dummy_path}/config/application.rb", after: "class Application < Rails::Application" do
+        inject_into_file "#{dummy_app_path}/config/application.rb", after: "class Application < Rails::Application" do
           "\n    config.i18n.available_locales = %w(en ca es)\n    config.i18n.default_locale = :en"
         end
       end
 
       def decidim_dev
-        template "decidim_dev.rb", "#{dummy_path}/config/initializers/decidim_dev.rb"
+        template "decidim_dev.rb", "#{dummy_app_path}/config/initializers/decidim_dev.rb"
 
         # TODO: Remove these after PhantomJS updates WebKit version (see YML and
         #       initializer comments)
-        template "autoprefixer.yml", "#{dummy_path}/config/autoprefixer.yml"
-        template "autoprefixer_initializer.rb", "#{dummy_path}/config/initializers/autoprefixer.rb"
+        template "autoprefixer.yml", "#{dummy_app_path}/config/autoprefixer.yml"
+        template "autoprefixer_initializer.rb", "#{dummy_app_path}/config/initializers/autoprefixer.rb"
       end
 
       def test_env
-        gsub_file "#{dummy_path}/config/environments/test.rb",
+        gsub_file "#{dummy_app_path}/config/environments/test.rb",
           /allow_forgery_protection = (.*)/, 'allow_forgery_protection = true'
       end
 
       private
 
-      def dummy_path
-        ENV["DUMMY_PATH"] || engine_path + "/spec/#{dir_name}_dummy_app"
+      def dummy_app_path
+        options[:dummy_app_path]
       end
 
       def remove_directory_if_exists(path)
@@ -74,11 +75,7 @@ module Decidim
       end
 
       def dir_name
-        engine_path.split("/").last
-      end
-
-      def engine_path
-        options[:engine_path]
+        dummy_app_path.split("/").last
       end
     end
   end