decidim-core 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eff907b57b0cab03cceeb32b458e2cfd59e7dc6
-  data.tar.gz: 133dc98f767565fc733b02f8733c057855cd7d9b
+  metadata.gz: 59aba1722a03f74a972774bc6023125925137b79
+  data.tar.gz: 71a97c8c7e3b669e142897d9aaf6a6e9f09067be
 SHA512:
-  metadata.gz: beb54c792c2e01aa0f08ebe85be2ad2b2b2888b2b102e008b1499e1a769279076bc650b7d14189bde0fd00d59d4d28734876271a81d02ea69c9b5e6746f70218
-  data.tar.gz: a45d55c72e259bae57b7ba19a2293259a8ca8a9199f3b5c02f906d37e06e6ad7a879ee20cafef940175dc7740aaf37667897e6c1ff9b121d9c4faacd8a9d3e61
+  metadata.gz: 2b793c229ce33485dc9ddf1efc8e1af7c5d85fff82b7aa5c959f71b6d6ce2aef597a3ad59234bdcea636eeba942921e1756fa9b30061ec559b2eb044a15ebc63
+  data.tar.gz: 467bd6ed6b3f823671ea15fa871641779d345a3d6336774d28665a67046799ca613d8c17fd4c7b84f5270d6392c0a6030151564993f977281f78de5a3780a637

data/app/assets/javascripts/decidim/form_filter.component.js.es6

@@ -1,4 +1,4 @@
-/* eslint-disable no-div-regex, no-useless-escape, no-param-reassign */
+/* eslint-disable no-div-regex, no-useless-escape, no-param-reassign, id-length */
 
 /**
  * A plain Javascript component that handles the form filter.
@@ -7,9 +7,6 @@
  */
 ((exports) => {
   class FormFilterComponent {
-    mounted;
-    $form;
-
     constructor($form) {
       this.$form = $form;
       this.mounted = false;
@@ -102,7 +99,7 @@
     _parseLocationOrderValue() {
       const url = this._getLocation();
       const match = url.match(/order=([^&]*)/);
-      const $orderMenu = $('.order-by .menu');
+      const $orderMenu = this.$form.find('.order-by .menu');
       let order = $orderMenu.find('.menu a:first').data('order');
 
       if (match) {

data/app/assets/javascripts/decidim/form_filter.component.test.js

@@ -1,5 +1,7 @@
-/* eslint-disable no-unused-expressions */
-require('jquery');
+/* global spyOn */
+/* eslint-disable id-length */
+const $ = require('jquery');
+
 require('./history.js.es6');
 require('./form_filter.component.js.es6');
 
@@ -13,14 +15,9 @@ describe('FormFilterComponent', () => {
     let form = `
       <form id="new_filter" action="/filters" method="get">
         <fieldset>
-          <input id="filter_order_start_time_asc" value="asc" type="radio" name="order_start_time" checked />
-          <input id="filter_order_start_time_desc" value="desc" type="radio" name="order_start_time" />
-        </fieldset>
-
-        <fieldset>
-          <input id="filter_scope_id_1" value="1" type="checkbox" name="scope_id[]" />
-          <input id="filter_scope_id_2" value="2" type="checkbox" name="scope_id[]" />
-          <input id="filter_scope_id_3" value="3" type="checkbox" name="scope_id[]" />
+          <input id="filter_scope_id_1" value="1" type="checkbox" name="filter[scope_id][]" />
+          <input id="filter_scope_id_2" value="2" type="checkbox" name="filter[scope_id][]" />
+          <input id="filter_scope_id_3" value="3" type="checkbox" name="filter[scope_id][]" />
         </fieldset>
 
         <fieldset>
@@ -36,95 +33,73 @@ describe('FormFilterComponent', () => {
   });
 
   it('exists', () => {
-    expect(FormFilterComponent).to.exist;
+    expect(FormFilterComponent).toBeDefined();
   });
 
   it('initializes unmounted', () => {
-    expect(subject.mounted).to.be.falsey;
+    expect(subject.mounted).toBeFalsy();
   });
 
   it('initializes the formSelector with the given selector', () => {
-    expect(subject.$form).to.deep.equal($(selector));
+    expect(subject.$form).toEqual($(selector));
   });
 
   describe('when mounted', () => {
     beforeEach(() => {
-      sinon.spy(subject.$form, 'on');
+      spyOn(subject.$form, 'on');
       subject.mountComponent();
     });
 
     afterEach(() => {
-      subject.$form.on.restore();
       subject.unmountComponent();
     });
 
     it('mounts the component', () => {
-      expect(subject.mounted).to.be.truthy;
+      expect(subject.mounted).toBeTruthy();
     });
 
     it('binds the form change event', () => {
-      expect(subject.$form.on).to.have.been.calledWith('change', 'input, select', subject._onFormChange);
-    });
-
-    describe('on form change event', () => {
-      let stub = null;
-
-      beforeEach(() => {
-        stub = sinon.stub(subject.$form, 'submit');
-      });
-
-      it('form is submitted', () => {
-        $(selector).find('input[name=order_start_time][value=desc]').trigger('change');
-
-        expect(stub).to.have.been.calledOnce;
-      })
+      expect(subject.$form.on).toHaveBeenCalledWith('change', 'input, select', subject._onFormChange);
     });
 
     describe('onpopstate event', () => {
       beforeEach(() => {
-        sinon.stub(subject.$form, 'submit');
+        spyOn(subject.$form, 'submit');
       });
 
       it('clears the form data', () => {
-        let clearFormSpy = sinon.spy(subject, '_clearForm');
+        spyOn(subject, '_clearForm');
 
         window.onpopstate();
 
-        expect(clearFormSpy).to.have.been.called;
+        expect(subject._clearForm).toHaveBeenCalled();
       });
 
       it('sets the correct form fields based on the current location', () => {
-        sinon.stub(subject, '_getLocation').returns('/filters?order_start_time=desc&scope_id[]=1&scope_id[]=2&filter[category_id]=2')
-
+        spyOn(subject, '_getLocation').and.returnValue('/filters?filter[scope_id][]=1&scope_id[]=2&filter[category_id]=2');
         window.onpopstate();
 
-        expect($(selector).find('select').val()).to.equal('2');
-        expect($(selector).find('input[name=order_start_time][value=desc]').attr('checked')).to.be.truthy;
-        expect($(selector).find('input[name=order_start_time][value=asc]').attr('checked')).to.be.falsey;
-        expect($(selector).find('input[name=scope_id][value=1]').attr('checked')).to.be.truthy;
-        expect($(selector).find('input[name=scope_id][value=2]').attr('checked')).to.be.truthy;
-        expect($(selector).find('input[name=scope_id][value=3]').attr('checked')).to.be.falsey;
+        expect($(selector).find('select').val()).toEqual('2');
+        expect($(selector).find('input[name="filter[scope_id][]"][value="1"]')[0].checked).toBeTruthy();
+        expect($(selector).find('input[name="filter[scope_id][]"][value="2"]')[0].checked).toBeFalsy();
+        expect($(selector).find('input[name="filter[scope_id][]"][value="3"]')[0].checked).toBeFalsy();
       });
     });
   });
 
   describe('when unmounted', () => {
     beforeEach(() => {
-      sinon.spy(subject.$form, 'off');
+      spyOn(subject.$form, 'off');
       subject.mountComponent();
       subject.unmountComponent();
     });
 
-    afterEach(() => {
-      subject.$form.off.restore();
-    })
-
     it('mounts the component', () => {
-      expect(subject.mounted).to.be.falsey;
+      expect(subject.mounted).toBeFalsy();
     });
 
     it('unbinds the form change event', () => {
-      expect(subject.$form.off).to.have.been.calledWith('change', 'input, select', subject._onFormChange);
+      expect(subject.$form.off).toHaveBeenCalledWith('change', 'input, select', subject._onFormChange);
     });
   });
 

data/app/assets/stylesheets/decidim/editor.sass

@@ -1,4 +1,4 @@
 @import "quill.snow"
 
 .editor-container
-  margin-bottom: 1rem
+  margin-bottom: 1.5rem

data/app/commands/decidim/create_omniauth_registration.rb

@@ -63,7 +63,8 @@ module Decidim
     def create_identity
       @user.identities.create!(
         provider: form.provider,
-        uid: form.uid
+        uid: form.uid,
+        organization: organization
       )
     end
 

data/app/commands/decidim/invite_user.rb

@@ -35,7 +35,7 @@ module Decidim
     end
 
     def invite_user
-      @user = Decidim::User.invite!(
+      @user = Decidim::User.create(
         {
           name: form.name,
           email: form.email.downcase,
@@ -43,7 +43,8 @@ module Decidim
           roles: form.roles,
           comments_notifications: true,
           replies_notifications: true
-        },
+        })
+      @user.invite!(
         form.invited_by,
         invitation_instructions: form.invitation_instructions
       )

data/app/commands/decidim/update_account.rb

@@ -17,10 +17,17 @@ module Decidim
       update_personal_data
       update_avatar
       update_password
-      @user.save!
 
-      @form.remove_avatar = false
-      broadcast(:ok, @user.unconfirmed_email.present?)
+      if @user.valid?
+        @user.save!
+        @form.remove_avatar = false
+        broadcast(:ok, @user.unconfirmed_email.present?)
+      else
+        if @user.errors.has_key? :avatar
+          @form.errors.add :avatar, @user.errors[:avatar]
+        end
+        broadcast(:invalid)
+      end
     end
 
     private

data/app/controllers/concerns/decidim/action_authorization.rb

@@ -65,7 +65,7 @@ module Decidim
     end
 
     def _action_authorizer(action_name)
-      ActionAuthorizer.new(current_user, current_feature, action_name)
+      ::Decidim::ActionAuthorizer.new(current_user, current_feature, action_name)
     end
 
     class Unauthorized < StandardError; end

data/app/controllers/decidim/devise/passwords_controller.rb

@@ -4,6 +4,21 @@ module Decidim
     # Custom Devise PasswordsController to avoid namespace problems.
     class PasswordsController < ::Devise::PasswordsController
       include Decidim::DeviseControllers
+
+      private
+
+      # Since we're using a single Devise installation for multiple
+      # organizations, and user emails can be repeated across organizations,
+      # we need to identify the user by both the email and the organization.
+      # Setting the organization ID here will be used by Devise internally to
+      # find the correct user.
+      #
+      # Note that in orther for this to work we need to define the `reset_password_keys`
+      # Devise attribute in the `Decidim::User` model to include the
+      # `decidim_organization_id` attribute.
+      def resource_params
+        super.merge(decidim_organization_id: current_organization.id)
+      end
     end
   end
 end

data/app/controllers/decidim/participatory_process_groups_controller.rb

@@ -3,7 +3,7 @@ require_dependency "decidim/application_controller"
 
 module Decidim
   class ParticipatoryProcessGroupsController < ApplicationController
-    helper_method :participatory_processes, :group
+    helper_method :participatory_processes, :group, :collection
 
     def show
       authorize! :read, ParticipatoryProcessGroup
@@ -14,6 +14,7 @@ module Decidim
     def participatory_processes
       @participatory_processes ||= group.participatory_processes.published
     end
+    alias_method :collection, :participatory_processes
 
     def group
       Decidim::ParticipatoryProcessGroup.find(params[:id])

data/app/forms/decidim/account_form.rb

@@ -19,6 +19,7 @@ module Decidim
     validates :password, confirmation: true
     validates :password, length: { in: Decidim::User.password_length, allow_blank: true }
     validates :password_confirmation, presence: true, if: :password_present
+    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim::User::MAXIMUM_AVATAR_FILE_SIZE } }
 
     validate :unique_email
 

data/app/models/decidim/identity.rb

@@ -4,9 +4,19 @@ module Decidim
   # Store user's social identities
   class Identity < ApplicationRecord
     belongs_to :user, foreign_key: :decidim_user_id, class_name: Decidim::User
+    belongs_to :organization, foreign_key: :decidim_organization_id, class_name: Decidim::Organization
 
     validates :user, presence: true
     validates :provider, presence: true
-    validates :uid, presence: true, uniqueness: { scope: :provider }
+    validates :uid, presence: true, uniqueness: { scope: [:provider, :organization] }
+
+    validate :same_organization
+
+    private
+
+    def same_organization
+      return if organization == user&.organization
+      errors.add(:organization, :invalid)
+    end
   end
 end

data/app/models/decidim/organization.rb

@@ -4,6 +4,8 @@ module Decidim
   # installation we can find many organizations and each of them can start
   # their own participatory processes.
   class Organization < ApplicationRecord
+    SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github]
+
     has_many :participatory_process_groups, foreign_key: "decidim_organization_id", class_name: Decidim::ParticipatoryProcessGroup, inverse_of: :organization
     has_many :participatory_processes, foreign_key: "decidim_organization_id", class_name: Decidim::ParticipatoryProcess, inverse_of: :organization
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: Decidim::StaticPage, inverse_of: :organization

data/app/models/decidim/user.rb

@@ -4,9 +4,12 @@ require_dependency "devise/models/decidim_validatable"
 module Decidim
   # A User is a citizen that wants to join the platform to participate.
   class User < ApplicationRecord
+    MAXIMUM_AVATAR_FILE_SIZE = 5.megabytes
+
     devise :invitable, :database_authenticatable, :registerable, :confirmable,
            :recoverable, :rememberable, :trackable, :decidim_validatable,
-           :omniauthable, omniauth_providers: [:facebook, :twitter, :google_oauth2]
+           :omniauthable, omniauth_providers: [:facebook, :twitter, :google_oauth2],
+           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email]
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: Decidim::Organization
     has_many :authorizations, foreign_key: "decidim_user_id", class_name: Decidim::Authorization, inverse_of: :user
@@ -19,7 +22,7 @@ module Decidim
     validates :organization, :name, presence: true
     validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }, allow_blank: true
     validates :tos_agreement, acceptance: true, allow_nil: false, on: :create
-    validates :avatar, file_size: { less_than_or_equal_to: 5.megabytes }
+    validates :avatar, file_size: { less_than_or_equal_to: MAXIMUM_AVATAR_FILE_SIZE }
     validates :email, uniqueness: { scope: :organization }
     validate :all_roles_are_valid
     mount_uploader :avatar, Decidim::AvatarUploader
@@ -51,6 +54,20 @@ module Decidim
       super || I18n.t("decidim.anonymous_user")
     end
 
+    # Check if the user exists with the given email and the current organization
+    #
+    # warden_conditions - A hash with the authentication conditions
+    #                   * email - a String that represents user's email.
+    #                   * env - A Hash containing environment variables.
+    # Returns a User.
+    def self.find_for_authentication(warden_conditions)
+      organization = warden_conditions.dig(:env, "decidim.current_organization")
+      where(
+        email: warden_conditions[:email],
+        decidim_organization_id: organization.id
+      ).first
+    end
+
     private
 
     def all_roles_are_valid

data/app/views/decidim/authorizations/index.html.erb

@@ -10,7 +10,7 @@
                 <h5 class="card--list__heading">
                   <%= t("#{authorization.name}.name", scope: "decidim.authorization_handlers") %>
                 </h5>
-                <span class="text-small"><%= l(authorization.created_at, format: :long) %></span>
+                <span class="text-small"><%= l(authorization.updated_at, format: :long) %></span>
               </div>
             </div>
             <div class="card--list__data">

data/app/views/decidim/devise/passwords/edit.html.erb

@@ -22,7 +22,7 @@
             </div>
 
             <div class="actions">
-              <%= f.submit t("devise.passwords.edit.change_my_password", class: "button expanded") %>
+              <%= f.submit t("devise.passwords.edit.change_my_password"), class: "button expanded" %>
             </div>
           <% end %>
 

data/app/views/decidim/participatory_processes/_order_by_processes.html.erb

@@ -1,3 +1,3 @@
 <div class="row collapse order-by">
-  <h2 class="order-by__text section-heading"><%= t(".processes", scope: "layouts", count: participatory_processes.count) %></h2>
+  <h2 class="order-by__text section-heading"><%= t(".processes", scope: "layouts", count: collection.count) %></h2>
 </div>

data/app/views/layouts/decidim/_language_chooser.html.erb

@@ -1,14 +1,14 @@
-<div class="topbar__dropmenu language-choose">
-  <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
-    <li class="is-dropdown-submenu-parent">
-      <%= link_to t("name", scope: "locale") %>
-      <% if available_locales.length > 1 %>
+<% if available_locales.length > 1 %>
+  <div class="topbar__dropmenu language-choose">
+    <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+      <li class="is-dropdown-submenu-parent">
+        <%= link_to t("name", scope: "locale") %>
         <ul class="menu is-dropdown-submenu">
           <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
             <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post%></li>
           <% end %>
         </ul>
-      <% end %>
-    </li>
-  </ul>
-</div>
+      </li>
+    </ul>
+  </div>
+<% end %>

data/config/locales/ca.yml

@@ -249,6 +249,7 @@ ca:
         subject: Contrasenya modificada
   errors:
     messages:
+      content_type_whitelist_error: El tipus de fitxer no és vàlid
       file_size_is_less_than_or_equal_to: la mida del fitxer ha de ser menor que o igual a %{count}
       invalid_manifest: Arxiu de manifest invàlid
       invalid_participatory_process: Procés participatiu invàlid

data/config/locales/en.yml

@@ -250,6 +250,7 @@ en:
         subject: Password changed
   errors:
     messages:
+      content_type_whitelist_error: The file type is not valid
       file_size_is_less_than_or_equal_to: file size must be less than or equal to %{count}
       invalid_manifest: Invalid manifest
       invalid_participatory_process: Invalid participatory process

data/config/locales/es.yml

@@ -249,6 +249,7 @@ es:
         subject: Contraseña modificada
   errors:
     messages:
+      content_type_whitelist_error: El tipo de archivo no es válido
       file_size_is_less_than_or_equal_to: el tamaño del archivo debe ser menor que o igual a %{count}
       invalid_manifest: Manifiesto inválido
       invalid_participatory_process: Proceso participativo inválido

data/config/locales/eu.yml

@@ -1,10 +1,12 @@
 eu:
   activemodel:
     attributes:
+      report:
+        details: Iruzkin gehigarriak
       user:
         email: Zure helbide elektronikoa
         name: Zure izena
-        password: Pasahitz berria
+        password: Pasahitza
         password_confirmation: Baieztatu zure pasahitz berria
         user_group_document_number: Egiaztagiri-zenbakia
         user_group_name: Erakundearen izena
@@ -13,7 +15,7 @@ eu:
     attributes:
       decidim/user:
         current_password: Egungo pasahitza
-        email: Posta elektronikoa
+        email: Helbide elektronikoa
         name: Erabiltzaile-izena
         password: Pasahitza
         password_confirmation: Baieztatu pasahitza
@@ -50,18 +52,24 @@ eu:
         name: baimen-adibidea
       errors:
         duplicate_authorization: Badago erabiltzaile bat, datu berberekin baimendua.
+      foo_authorization:
+        fields:
+          bar: Bar
+          foo: foo
+        name: foo baimena
     authorizations:
       create:
         error: Errorea gertatu da baimena sortzean.
         success: Baimendua izan zara zuzen.
-      current_participatory_processes: behako bat eman egungo prozesuei
+      current_participatory_processes: eman behakoa egungo prozesuei
       first_login:
         actions:
-          decidim/dummy_authorization_handler: Egiaztatu baimen-adibidea ........ren kontra
+          decidim/dummy_authorization_handler: 'Egiaztatu baimen-adibidea honekin erkatuta:'
         title: Egiaztatu zure nortasuna
         verify_with_these_options: 'Hona zure nortasuna egiaztatzeko dituzun aukerak:'
       new:
         authorize: Bidali
+        authorize_with: 'Egiaztatu nire nortasuna honen bidez: %{authorizer}'
       skip_verification: Oraingoz, urrats hau egin gabe utzi dezakezu eta %{link}
     core:
       actions:
@@ -87,6 +95,7 @@ eu:
             user_group: Erakundea / Kolektiboa
           subtitle: Sortu kontu bat eztabaidetan parte hartzeko eta proposamenen alde egiteko
           terms: erabilera-baldintzak
+          tos_agreement: 'Erregistratzean hau onartzen duzu: %{link}.'
           username_help: Izen publikoa, zuk argitaratutakoetan agertzekoa. Anonimatua bermatze aldera, edozein izen izan daiteke.
       sessions:
         new:
@@ -95,10 +104,26 @@ eu:
       shared:
         omniauth_buttons:
           or: Edo
+    features:
+      dummy:
+        actions:
+          bar: Bar
+          foo: foo
+        name: Funtzionaltasun-proba
+        settings:
+          global:
+            comments_enabled: Iruzkinak gaituta
+            dummy_global_attribute_1: Atributu-proba, 1
+            dummy_global_attribute_2: Atributu-proba, 2
+          step:
+            comments_blocked: Iruzkinak blokeatuta
+            dummy_step_attribute_1: Atributu-faseko proba, 1
+            dummy_step_attribute_2: Atributu-faseko proba, 2
     filters:
       linked_classes:
         all: Guztiak
         meeting: Topaketak
+        project: Proiektuak
         proposal: Proposamenak
         result: Emaitzak
     forms:
@@ -106,7 +131,11 @@ eu:
         error: Errorea bat dago eremu honetan.
     menu:
       home: Hasiera
+      more_information: Argibide gehiago
       processes: Prozesuak
+    newsletter_mailer:
+      newsletter:
+        note: 'Mezu hau jaso duzu albiste-buletinean harpidetuta zaudelako hemen: %{organization_name}. Ezarpenak aldatu ditzakezu zure <a href="%{link}">jakinarazpen-orrian</a>.'
     notifications_settings:
       show:
         comments_notifications: Jakinarazpenak jaso nahi ditut nik argitaratutakoei iruzkinak egiten dizkietenean.
@@ -120,6 +149,13 @@ eu:
       index:
         not_verified: Egiaztatu gabe
         verified: Egiaztatuta
+    pages:
+      index:
+        title: Argibide gehiago
+    participatory_process_groups:
+      show:
+        group_participatory_processes: '%{group} talderako prozesuak'
+        title: Prozesu partizipatiboen multzoak
     participatory_process_steps:
       index:
         process_steps: Prozesuaren faseak
@@ -127,6 +163,10 @@ eu:
     participatory_processes:
       index:
         title: Prozesu partizipatiboak
+      participatory_process_groups:
+        none: Bat ere ez
+      scopes:
+        global: Esparrua orokorrak
       show:
         developer_group: Talde sustatzailea
         end_date: Bukaera-data
@@ -135,6 +175,19 @@ eu:
         participatory_structure: Egitura partizipatiboa
         scope: Esparrua
         target: Nori zuzentzen zaio?
+    reported_mailer:
+      hide:
+        hello: Kaixo, %{name},
+        report_html: "<p>Honako eduki hau automatikoki ezkutatu da: <p>%{content} <p>.</p>"
+        subject: Eduki bat automatikoki ezkutatu da
+      report:
+        hello: Kaixo, %{name},
+        report_html: "<p>Honako eduki hau salatua izan da: <p>%{content}<p></p>"
+        subject: Eduki bat salatua izan da
+    reports:
+      create:
+        error: Errorea gertatu da edukia salatzean. Mesedez, saiatu berriro.
+        success: Salaketa zuzen sortu da, eta administratzaile batek aztertuko du.
     shared:
       action_authorization_modal:
         incomplete:
@@ -143,15 +196,28 @@ eu:
           reauthorize: Berriz eskuratu baimena
           title: Mesedez, eskura ezazu berriz baimena
         missing:
+          authorize: 'Baimena eskuratu honen bidez: "%{authorization}"'
+          explanation: 'Ekintza hau egiteko, baimen hau behar duzu: "%{authorization}".'
           title: Baimena behar da
         unauthorized:
           explanation: Ezin diozu heldu ekintza honi, baimen-datuetako batzuk ez direlako behar direnak.
           invalid: "%{field} ez da baliozkoa."
           ok: Ados
           title: Ez dago baimenduta
+      flag_modal:
+        already_reported: Eduki hau jada salatuta dago, eta administratzaile batek.
+        close: Itxi
+        description: Eduki hau desegokia da?
+        does_not_belong: Bertan badago legez kontrako jardunik, suizidio-mehatxurik, informazio pertsonalik edo beste zernahi, zure ustez %{organization_name}-ri ez dagokionik.
+        offensive: Ertan badago arrazakeriarik, sexismorik, irainik, eraso pertsonalik, heriotza-mehatxurik, suizidio-eskaerarik edo beste edozein eratako gorroto-diskurtsorik.
+        report: Salatu
+        spam: Bertan badago clickbait-ik, publizitaterik edo iruzurrik.
+        title: Salatu arazo bat
       login_modal:
         please_sign_in: Mesedez, erregistratu
         sign_up: Erregistratu
+      reference:
+        reference: 'Erreferentzia: %{reference}'
       share_modal:
         close_window: Itxi leihoa
         share: Partekatu
@@ -164,25 +230,42 @@ eu:
     mailer:
       invitation_instructions:
         accept: Onartu gonbita
+        accept_until: 'Gonbit hau data honetan iraungiko da: %{due_date}.'
         hello: Kaixo, %{email},
         ignore: |-
-          Onartu nahi ez baduzu gonbit hau, ez egin kasu mezu honi.<br />
-          Zure kontua ez da sortuko beheko estekara jo eta zure pasahitza aukeratu arte.
+          Nahi ez baduzu onartu gonbit hau, ez egin kasu mezu honi.<br />Zure kontua ez da sortuko beheko estekara jo eta zure pasahitza aukeratu arte.
         invited_you_as_admin: "%{invited_by} izeneko batek gonbit egin dizu %{application} aplikazioaren administratzaile izateko; onartzeko, egin klik esteka honetan:"
+        someone_invited_you: 'Orbaitek gonbit egin dizu aplikazio honetara: %{application}. Onartzeko, egin klik esteka honetan:'
+      invite_admin:
+        subject: 'Gonbita jaso duzu erakunde hau kudeatzeko: %{organization}'
+      invite_collaborator:
+        subject: 'Gonbita jaso duzu erakunde honekin lankidetzan aritzeko: %{organization}'
+      organization_admin_invitation_instructions:
+        subject: 'Gonbita jaso duzu erakunde hau kudeatzeko: %{organization}'
       password_change:
         greeting: Kaixo %{recipient}!
         message: Zuregana jotzen dugu jakinarazteko zure pasahitza zuzen aldatu dela.
         subject: Pasahitza aldatu da
   errors:
     messages:
+      content_type_whitelist_error: fitxategi mota ez da zuzena
       file_size_is_less_than_or_equal_to: fitxategiaren pisuak %{count} izan behar du, edo gutxiago
       invalid_manifest: Manifestua ez da baliozkoa
       invalid_participatory_process: Prozesu partizipatiboa ez da baliozkoa
+      long_words: Hitz luzeegiak ditu
+      must_start_with_caps: Letra larriz hasi behar du
       nesting_too_deep: ezin da egon azpikategoria batean
+      too_many_marks: Galdera- eta harridura-ikur gehiegi erabiltzen ari zara
+      too_much_caps: Letra larri gehiegi erabiltzen ari zara
+      too_short: Laburregia da
+  invisible_captcha:
+    sentence_for_humans: Gizaki bat bazara, ez egin kasu eremu honi
+    timestamp_error_message: Barkatu, baina azkarregi aritu zara! Mesedez, bidali.
   layouts:
     decidim:
       cookie_warning:
-        link_label: aquí
+        description_html: 'Webgune honek bere cookieak eta hirugarrenenak erabiltzen ditu, nabigazioa hobetu eta intereseko edukiak eta zerbitzuak eskaintze aldera. Nabigatzen jarraituz gero, gure cookie-politika onartzen delakoan gaude. Argibide gehiago jasotzeko, kontsultatu hemen: %{link}.'
+        link_label: hemen
         ok: Ados nago
       footer:
         made_with_open_source: 'Webgune hau egiteko, <a target="_blank" href="https://github.com/AjuntamentdeBarcelona/decidim">software librea</a> erabili da.'
@@ -191,6 +274,9 @@ eu:
         navigation: Nabigazioa
         sign_in: Sartu
         sign_up: Erregistratu
+      participatory_process_groups:
+        participatory_process_group:
+          browse: Arakatu
       participatory_processes:
         index:
           promoted_processes: Prozesu nabarmenduak
@@ -198,7 +284,7 @@ eu:
           no_processes_yet: Oraindik ez dago prozesu partizipatiborik!
         order_by_processes:
           processes:
-            one: "Prozesu %{count}"
+            one: "%{count} prozesu"
             other: "%{count} prozesu"
         participatory_process:
           active_step: 'Oraingo fasea:'
@@ -227,13 +313,63 @@ eu:
     name: Euskera
   pages:
     '404':
-      back_home: Hasierara itzuli
+      back_home: Itzuli hasierara
       content_doesnt_exist: Helbide okerra da edo ezabatu da.
-      title: Bilatzen duzun orria ez dago!
+      title: Ez dugu aurkitu bilatzen duzun orria!
     '500':
       title: Arazo bat izan da gure zerbitzariarekin
       try_later: Mesedez, berriz saiatu geroago.
     home:
       extended:
         debates: Eztabaidak
-        debates_explanation: Gure ustez hirirako inportanteak diren gauzak ezagutu, eztabaidatu eta partekatuko ditugu.
+        debates_explanation: Gure ustez hirirako inportanteak diren gauzak ezagutu, eztabaidatu eta partekatuko ditugu.
+        how_to_participate: Nola har dezaket parte prozesu batean?
+        meetings: Topaketak
+        meetings_explanation: Gure ustez hirirako inportanteak diren gauzak ezagutu, eztabaidatu eta partekatuko ditugu.
+        more_info: Argibide gehiago
+        proposals: Proposamenak
+        proposals_explanation: Gune irekia herritarren proposamenetarako, adierazteko zer-nolako hiritan bizi nahi dugun.
+      footer_sub_hero:
+        footer_sub_hero_body: Bihurtu dezagun gizartea irekiago, gardenago eta kolaboratiboago <br /> Bat egin, parte hartu eta erabaki.
+        footer_sub_hero_headline: Ongi etorri %{organization} erakundearen plataforma partizipatibora.
+        register: Erregistratu
+      hero:
+        participate: Parte hartu
+        welcome: Ongi etorri %{organization} erakundera!
+      highlighted_processes:
+        active_processes: Prozesu aktiboak
+        active_step: Fase aktiboa
+        see_all_processes: Ikusi prozesu guztiak
+      statistics:
+        headline: '%{organization} erakundearen egungo egoera'
+        processes: Prozesuak
+        users: Erabiltzaileak
+      sub_hero:
+        register: Erregistroa
+  social_share_button:
+    delicious: Delicious
+    douban: Douban
+    email: Helbide elektronikoa
+    facebook: Facebook
+    google_bookmark: Google Bookmark
+    google_plus: Google+
+    hacker_news: hacker News
+    linkedin: Linkedin
+    pinterest: Pinterest
+    qq: Qzone
+    reddit: Reddit
+    share_to: 'Partekatu honekin: %{name}'
+    tumblr: Tumblr
+    twitter: Twitter
+    vkontakte: Vkontakte
+    wechat: WeChat
+    wechat_footer: Ireki zure WeChat, egin klik "Discover" botoian, eta gero, egin klik berriro "Eskaneatu QR kodea” menuan.
+    weibo: Sina Weibo
+    xing: Xing
+  views:
+    pagination:
+      first: "&laquo; Lehena"
+      last: Azkena &raquo;
+      next: Hurrengoa &rsaquo;
+      previous: "&lsaquo; Aurrekoa"
+      truncate: "&hellip;"

data/db/migrate/20170405091801_change_decidim_user_email_index_uniqueness.rb

@@ -0,0 +1,6 @@
+class ChangeDecidimUserEmailIndexUniqueness < ActiveRecord::Migration[5.0]
+  def change
+    remove_index :decidim_users, :email
+    add_index :decidim_users, [:email, :decidim_organization_id], unique: true
+  end
+end

data/db/migrate/20170405094028_add_organization_to_identities.rb

@@ -0,0 +1,5 @@
+class AddOrganizationToIdentities < ActiveRecord::Migration[5.0]
+  def change
+    add_reference :decidim_identities, :decidim_organization, index: true, foreign_key: true
+  end
+end

data/db/migrate/20170405094258_change_decidim_identities_provider_uid_index_uniqueness.rb

@@ -0,0 +1,12 @@
+class ChangeDecidimIdentitiesProviderUidIndexUniqueness < ActiveRecord::Migration[5.0]
+  def change
+    remove_index :decidim_identities, [:provider, :uid]
+    add_index :decidim_identities, [:provider, :uid, :decidim_organization_id], unique: true,
+    name: "decidim_identities_provider_uid_organization_unique"
+
+    Decidim::Identity.includes(:user).find_each do |identity|
+      identity.organization = identity.user.organization
+      identity.save!
+    end
+  end
+end

data/lib/decidim/core/engine.rb

@@ -35,6 +35,7 @@ require "geocoder"
 require "decidim/api"
 
 require "decidim/query_extensions"
+require "decidim/i18n_exceptions"
 
 module Decidim
   module Core

data/lib/decidim/core/test/factories.rb

@@ -187,6 +187,7 @@ FactoryGirl.define do
     provider "facebook"
     sequence(:uid)
     user
+    organization { user.organization }
   end
 
   factory :authorization, class: Decidim::Authorization do

data/lib/decidim/core/test/shared_examples/manage_moderations_examples.rb

@@ -18,7 +18,7 @@ RSpec.shared_examples "manage moderations" do
   end
 
   before do
-    visit decidim_admin.participatory_process_path(participatory_process)
+    visit decidim_admin.edit_participatory_process_path(participatory_process)
     click_link "Moderations"
   end
 
@@ -41,7 +41,7 @@ RSpec.shared_examples "manage moderations" do
         click_link "Unreport"
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("Resource successfully unreported")
       end
     end
@@ -53,7 +53,7 @@ RSpec.shared_examples "manage moderations" do
         click_link "Hide"
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("Resource successfully hidden")
       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.6"
+    "0.0.7"
   end
 
   def self.rails_version

data/lib/decidim/form_builder.rb

@@ -40,20 +40,24 @@ module Decidim
         )
       end
 
-      field_label = label_i18n(name, options[:label] || label_for(name))
-
-      tabs_panels = "".html_safe
-      if options[:label] != false
-        tabs_panels = content_tag(:ul, class: "tabs", id: "#{name}-tabs", data: { tabs: true }) do
-          locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
-            string + content_tag(:li, class: tab_element_class_for("title", index)) do
-              title = I18n.with_locale(locale) { I18n.t("name", scope: "locale") }
-              element_class = ""
-              element_class += "alert" if error?(name_with_locale(name, locale))
-              content_tag(:a, title, href: "##{name}-panel-#{index}", class: element_class)
+      label_tabs = content_tag(:div, class: "label--tabs") do
+        field_label = label_i18n(name, options[:label] || label_for(name))
+
+        tabs_panels = "".html_safe
+        if options[:label] != false
+          tabs_panels = content_tag(:ul, class: "tabs tabs--lang", id: "#{name}-tabs", data: { tabs: true }) do
+            locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
+              string + content_tag(:li, class: tab_element_class_for("title", index)) do
+                title = I18n.with_locale(locale) { I18n.t("name", scope: "locale") }
+                element_class = nil
+                element_class = "is-tab-error" if error?(name_with_locale(name, locale))
+                content_tag(:a, title, href: "##{name}-panel-#{index}", class: element_class)
+              end
             end
           end
         end
+
+        safe_join [field_label, tabs_panels]
       end
 
       tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: "#{name}-tabs" }) do
@@ -64,7 +68,7 @@ module Decidim
         end
       end
 
-      safe_join [field_label, tabs_panels, tabs_content]
+      safe_join [label_tabs, tabs_content]
     end
 
     # Public: generates a hidden field and a container for WYSIWYG editor

data/lib/decidim/i18n_exceptions.rb

@@ -0,0 +1,15 @@
+unless Rails.env.production?
+  module I18n
+    class JustRaiseExceptionHandler < ExceptionHandler
+      def call(exception, locale, key, options)
+        if exception.is_a?(MissingTranslationData) || exception.is_a?(MissingTranslation)
+          raise exception.to_exception
+        else
+          super
+        end
+      end
+    end
+  end
+
+  I18n.exception_handler = I18n::JustRaiseExceptionHandler.new
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -430,70 +430,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -883,6 +883,9 @@ files:
 - db/migrate/20170307084957_create_reports.rb
 - db/migrate/20170308091316_create_moderations.rb
 - db/migrate/20170313095436_add_available_authorizations_to_organization.rb
+- db/migrate/20170405091801_change_decidim_user_email_index_uniqueness.rb
+- db/migrate/20170405094028_add_organization_to_identities.rb
+- db/migrate/20170405094258_change_decidim_identities_provider_uid_index_uniqueness.rb
 - db/seeds.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
@@ -933,6 +936,7 @@ files:
 - lib/decidim/has_feature.rb
 - lib/decidim/has_reference.rb
 - lib/decidim/has_scope.rb
+- lib/decidim/i18n_exceptions.rb
 - lib/decidim/page_finder.rb
 - lib/decidim/query_extensions.rb
 - lib/decidim/reportable.rb
@@ -978,7 +982,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The core of the Decidim framework.