decidim-core 0.0.1.alpha4 → 0.0.1.alpha5

data/config/i18n-tasks.yml

@@ -89,6 +89,7 @@ ignore_missing:
 ## Consider these keys used:
 ignore_unused:
   - '{time.formats}.*'
+  - devise.mailer.password_change.subject
 # - 'activerecord.attributes.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/initializers/devise.rb

@@ -2,8 +2,6 @@
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 
-require "decidim/devise_failure_app"
-
 Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing

data/config/locales/ca.yml

@@ -0,0 +1,48 @@
+---
+ca:
+  decidim:
+    home:
+      show:
+        register: Registra't
+        welcome: Benvingut/da a %{organization}!
+    menu:
+      home: Inici
+  devise:
+    mailer:
+      invitation_instructions:
+        accept: Acceptar invitació
+        accept_until: Aquesta invitació caducarà el dia %{due_date}.
+        hello: Hola %{email}
+        ignore: |-
+          Si no vols acceptar la invitació, ignora aquest correu.<br />
+          El teu compte no es crearà fins que no accedeixis a l'enllaç de sota i triïs la teva contrasenya.
+        someone_invited_you: Algú t'ha convidat a %{application}, pots acceptar la invitació amb l'enllaç a continuació.
+      organization_admin_invitation_instructions:
+        subject: T'han convidat a administrar %{organization}
+      password_change:
+        greeting: Hola %{recipient}!
+        message: Ens posem en contacte amb tu per notificar-te que la teva contrasenya ha estat canviada correctament.
+        subject: Contrasenya canviada
+  layouts:
+    decidim:
+      footer:
+        about: Quant a Decidim
+        accessibility: Accessibilitat
+        made_with_open_source: Aquesta web està feta amb <a target="_blank" href="https://github.com/codegram/decidim">software lliure</a>.
+        terms_of_use: Termes i condicions
+      header:
+        close_menu: Tancar menú
+        navigation: Navegació
+        sign_in: Entra
+        sign_out: Surt
+        sign_up: Registra't
+  locales:
+    ca: Català
+    en: English
+    es: Castellano
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%B %d, %Y %I:%M %p"

data/config/locales/en.yml

@@ -17,6 +17,8 @@ en:
           If you don't want to accept the invitation, please ignore this email.<br />
           Your account won't be created until you access the link above and set your password.
         someone_invited_you: Someone has invited you to %{application}, you can accept it through the link below.
+      organization_admin_invitation_instructions:
+        subject: You've been invited to admin %{organization}
   layouts:
     decidim:
       footer:
@@ -27,6 +29,13 @@ en:
       header:
         close_menu: Close menu
         navigation: Navigation
+        sign_in: Sign In
+        sign_out: Sign out
+        sign_up: Sign Up
+  locales:
+    ca: Català
+    en: English
+    es: Castellano
   time:
     formats:
       devise:

data/config/locales/es.yml

@@ -0,0 +1,48 @@
+---
+es:
+  decidim:
+    home:
+      show:
+        register: Regístrate
+        welcome: Bienvenido/da %{organization}!
+    menu:
+      home: Inicio
+  devise:
+    mailer:
+      invitation_instructions:
+        accept: Aceptar invitación
+        accept_until: Esta invitación caducará el día %{due_date}.
+        hello: Hola %{email}
+        ignore: |-
+          Si no quieres aceptar la invitación ignora este correo.<br />
+          Tu cuenta no se creará hasta que accedas al enlance de abajo y escojas tu contraseña.
+        someone_invited_you: Alguien te ha invitado a %{application}, puedes aceptar la invitación con el enlace a continuación.
+      organization_admin_invitation_instructions:
+        subject: Te han invitado a administrar %{organization}
+      password_change:
+        greeting: "¡Hola %{recipient}!"
+        message: Nos ponemos en contacto contigo para notificarte que tu contraseña ha sido cambiada correctamente.
+        subject: Contraseña cambiada
+  layouts:
+    decidim:
+      footer:
+        about: En cuanto a Decidim
+        accessibility: Accesibilidad
+        made_with_open_source: Esta web está hecha con <a target="_blank" href="https://github.com/codegram/decidim">software libre</a>.
+        terms_of_use: Términos y condiciones
+      header:
+        close_menu: Cerrar menú
+        navigation: Navegación
+        sign_in: Entra
+        sign_out: Sale
+        sign_up: Regístrate
+  locales:
+    ca: Català
+    en: English
+    es: Castellano
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "% B% d,% Y% I:% M% p"

data/config/routes.rb

@@ -12,5 +12,6 @@ Decidim::Core::Engine.routes.draw do
                registrations: "decidim/devise/registrations",
                passwords: "decidim/devise/passwords"
              }
+  resource :locale, only: [:create]
   root to: "home#show"
 end

data/db/migrate/20161010085443_add_name_to_users.rb

@@ -0,0 +1,5 @@
+class AddNameToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_users, :name, :string, null: false
+  end
+end

data/db/migrate/20161010102356_translate_processes.rb

@@ -0,0 +1,15 @@
+class TranslateProcesses < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :decidim_participatory_processes, :title
+    remove_column :decidim_participatory_processes, :subtitle
+    remove_column :decidim_participatory_processes, :description
+    remove_column :decidim_participatory_processes, :short_description
+
+    change_table :decidim_participatory_processes do |t|
+      t.hstore :title, null: false
+      t.hstore :subtitle, null: false
+      t.hstore :short_description, null: false
+      t.hstore :description, null: false
+    end
+  end
+end

data/db/migrate/20161010131544_add_locale_to_users.rb

@@ -0,0 +1,5 @@
+class AddLocaleToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_users, :locale, :string
+  end
+end

data/db/seeds.rb

@@ -7,29 +7,49 @@ if !Rails.env.production? || ENV["SEED"]
   )
 
   Decidim::User.create!(
+    name: "Organization Admin",
     email: "admin@decidim.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
     organization: staging_organization,
+    confirmed_at: Time.current,
+    locale: I18n.default_locale,
     roles: ["admin"]
   )
 
   Decidim::User.create!(
+    name: "Responsible Citizen",
     email: "user@decidim.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
+    confirmed_at: Time.current,
+    locale: I18n.default_locale,
     organization: staging_organization
   )
 
   Decidim::ParticipatoryProcess.create!(
-    title: 'Urbanistic plan for Newtown neighbourhood',
+    title: {
+      en: 'Urbanistic plan for Newtown neighbourhood',
+      es: 'Plan urbanístico para el barrio de Villanueva',
+      ca: 'Pla urbanístic pel barri de Vilanova'
+    },
     slug: 'urbanistic-plan-for-newtown-neighbourhood',
-    subtitle: 'Go for it!',
+    subtitle: {
+      en: 'Go for it!',
+      es: 'Vamos!',
+      ca: 'Som-hi!'
+    },
     hashtag: '#urbaNewtown',
-    short_description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed feugiat ex at neque vehicula, non facilisis mi laoreet. Duis id felis at libero cursus tincidunt vehicula posuere elit. Cras venenatis ultricies ligula, a eleifend sem viverra at. Cras quis venenatis diam. Etiam consectetur, nulla nec consequat sollicitudin, risus ipsum rutrum lacus, a ultrices risus mauris in metus. Aenean dignissim ullamcorper efficitur. Sed eget elit suscipit, efficitur dui vitae, placerat quam. Pellentesque sodales congue tortor ut maximus. Cras a nulla enim. Aliquam ac lacinia lorem, nec vehicula turpis.',
-    description: '<p>Mauris nec diam nibh. Quisque tincidunt aliquam malesuada. Aliquam eget velit pretium, placerat metus in, auctor dui. In mollis, ligula vel interdum hendrerit, eros sem bibendum justo, ac ornare orci nulla non mauris. Phasellus tincidunt urna est, sit amet condimentum est efficitur fringilla. Sed egestas tellus nec ligula vehicula, nec suscipit tellus consequat. Mauris interdum eu urna mollis volutpat. Maecenas condimentum pharetra lectus, quis egestas sem finibus et. Ut non est et metus ultrices convallis ut vel magna. Donec sagittis justo nec varius vestibulum.</p>
-
-    <p>Phasellus eget urna at nisl pellentesque tempus in at sem. Sed consectetur, lectus sit amet aliquam aliquet, augue justo iaculis eros, sodales mollis mauris odio vel elit. Nam ut tristique ipsum, in consectetur elit. Nullam tellus dui, placerat ut lobortis laoreet, cursus vestibulum nunc. Praesent consequat nisi non iaculis laoreet. Nullam sed molestie arcu. Vivamus ultricies dapibus neque tristique maximus. Cras quis pulvinar leo. Cras semper enim non justo lacinia cursus in eu enim. Pellentesque id erat pellentesque, semper nisi non, dignissim odio. In hac habitasse platea dictumst. Sed hendrerit purus elit, in condimentum ligula iaculis nec. Cras semper metus non lectus placerat, a auctor mauris feugiat. Sed euismod tempus egestas. Fusce porttitor vel enim non tincidunt. Duis non risus eu justo ultricies dignissim.</p>',
+    short_description: {
+      en: 'Short description',
+      es: 'Descripción corta',
+      ca: 'Descripció curta'
+    },
+    description: {
+      en: 'Description',
+      es: 'Descripción',
+      ca: 'Descripció'
+    },
     organization: staging_organization
   )
 end

data/lib/decidim/core.rb

@@ -4,6 +4,10 @@ require "decidim/core/version"
 
 # Decidim configuration.
 module Decidim
+  autoload :TranslatableAttributes, "decidim/translatable_attributes"
+  autoload :FormBuilder, "decidim/form_builder"
+  autoload :DeviseFailureApp, "decidim/devise_failure_app"
+
   @config = OpenStruct.new
 
   def self.setup

data/lib/decidim/core/engine.rb

@@ -2,21 +2,21 @@
 require "rails"
 require "active_support/all"
 
+require "pg"
+require "redis"
+
 require "devise"
 require "devise-i18n"
 require "devise_invitable"
 require "jquery-rails"
 require "sass-rails"
 require "turbolinks"
-require "jquery-turbolinks"
 require "foundation-rails"
 require "foundation_rails_helper"
 require "jbuilder"
 require "active_link_to"
 require "rectify"
-
-require "decidim/translatable_attributes"
-require "decidim/form_builder"
+require "roadie-rails"
 
 module Decidim
   module Core
@@ -42,6 +42,7 @@ module Decidim
       config.to_prepare do
         Rails.application.config.assets.precompile += %w(
           decidim_core_manifest.js
+          decidim/email.css
         )
       end
     end

data/lib/decidim/core/version.rb

@@ -2,7 +2,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.0.1.alpha4"
+    "0.0.1.alpha5"
   end
 
   def self.rails_version

data/lib/decidim/translatable_attributes.rb

@@ -27,7 +27,7 @@ module Decidim
         attribute name, Hash, default: {}
 
         locales.each do |locale|
-          attribute_name = "#{name}_#{locale}"
+          attribute_name = "#{name}_#{locale}".gsub("-", "__")
 
           attribute attribute_name, type, *options
 
@@ -60,7 +60,7 @@ module Decidim
         fields = arguments[0..-2]
 
         localized_fields = fields.flat_map do |f|
-          locales.map { |locale| "#{f}_#{locale}" }
+          locales.map { |locale| "#{f}_#{locale}".gsub("-", "__") }
         end
 
         validation_arguments = localized_fields + [options]
@@ -80,7 +80,8 @@ module Decidim
 
     def translatable_attribute_getter(name, locale)
       field = public_send(name) || {}
-      field[locale.to_s] || field[locale.to_sym]
+      corrected_locale = locale.to_s.gsub("__", "-")
+      field[corrected_locale] || field[corrected_locale.to_sym]
     end
   end
 end

data/lib/tasks/decidim_tasks.rake

@@ -5,5 +5,6 @@
 # end
 
 namespace :decidim do
+  # Install migrations from Decidim to the app.
   task upgrade: ["railties:install:migrations"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha4
+  version: 0.0.1.alpha5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,75 +125,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: jquery-turbolinks
+  name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: foundation_rails_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: foundation_rails_helper
+  name: active_link_to
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: active_link_to
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: roadie-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1.alpha5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1.alpha5
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -215,6 +243,7 @@ files:
 - app/assets/javascripts/decidim.js
 - app/assets/stylesheets/decidim.scss
 - app/assets/stylesheets/decidim/application.sass
+- app/assets/stylesheets/decidim/email.css
 - app/assets/stylesheets/decidim/layouts/_home.scss
 - app/assets/stylesheets/decidim/layouts/_user.scss
 - app/assets/stylesheets/decidim/layouts/_view.scss
@@ -265,6 +294,7 @@ files:
 - app/assets/stylesheets/decidim/utils/_settings.scss
 - app/assets/stylesheets/decidim/utils/_toggle-expand.scss
 - app/assets/stylesheets/decidim/utils/_variables.scss
+- app/controllers/concerns/decidim/locale_switcher.rb
 - app/controllers/concerns/decidim/needs_organization.rb
 - app/controllers/decidim/application_controller.rb
 - app/controllers/decidim/devise/confirmations_controller.rb
@@ -273,10 +303,12 @@ files:
 - app/controllers/decidim/devise/registrations_controller.rb
 - app/controllers/decidim/devise/sessions_controller.rb
 - app/controllers/decidim/home_controller.rb
+- app/controllers/decidim/locales_controller.rb
 - app/helpers/decidim/application_helper.rb
 - app/helpers/decidim/layout_helper.rb
 - app/helpers/decidim/translations_helper.rb
 - app/jobs/decidim/application_job.rb
+- app/mailers/concerns/decidim/localised_mailer.rb
 - app/mailers/decidim/application_mailer.rb
 - app/mailers/decidim/decidim_devise_mailer.rb
 - app/middleware/decidim/current_organization.rb
@@ -301,9 +333,12 @@ files:
 - app/views/layouts/decidim/_footer.html.erb
 - app/views/layouts/decidim/_header.html.erb
 - app/views/layouts/decidim/_meta.html.erb
+- app/views/layouts/decidim/mailer.html.erb
 - config/i18n-tasks.yml
 - config/initializers/devise.rb
+- config/locales/ca.yml
 - config/locales/en.yml
+- config/locales/es.yml
 - config/routes.rb
 - db/migrate/20160817115213_devise_create_decidim_users.rb
 - db/migrate/20160919104837_create_decidim_organizations.rb
@@ -313,6 +348,9 @@ files:
 - db/migrate/20161005130108_add_participatory_processes.rb
 - db/migrate/20161005153007_add_description_to_organizations.rb
 - db/migrate/20161006085629_add_confirmable_to_devise.rb
+- db/migrate/20161010085443_add_name_to_users.rb
+- db/migrate/20161010102356_translate_processes.rb
+- db/migrate/20161010131544_add_locale_to_users.rb
 - db/seeds.rb
 - lib/decidim/core.rb
 - lib/decidim/core/engine.rb