decidim-core 0.23.5 → 0.23.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59a972cf39fde06d391cf3addeb640418deb75f593d839169cf5ab210f4b5827
-  data.tar.gz: ec89bfeb9e97c4a195b8ce6c117ab2122727f48d765099d04fbc88463ce85107
+  metadata.gz: cfc52bd802501b273d139e03c0861f09ee105c9adad1f120adc6aabbb87480ce
+  data.tar.gz: 8a182280c3e75898854c75b604ce9e7d2ac218254ce3f74b91af7d9e9374c528
 SHA512:
-  metadata.gz: 76cc9661137f48a55b18467e139685fc392fe74123c63267ef3314f9cd07de84d923d6bdeb28f2684293e9f0f9989ac1343a9e5ca12e6e21e410729a0d9997a3
-  data.tar.gz: 857059af38a34f249eb1acd9552900dc797262821e59b46bea2bdca63ac8d21912c3cfbeebd068479a0673b2d71092ca2e372da726caf70d5214669ac5229ab4
+  metadata.gz: f26f0b99ced6993a4bca46925dd675ed82a51af75c2c7f5c7edd340ced49ac52de8a2b631ad6d6321ceb84e1971659c10ed1be84462cfd08c41a85d425668591
+  data.tar.gz: 83cf89e4dde056e1f4c02b72ceaf35fb78aac2bdca19855e9932d872d542efa87a4d611129ef700d541e06e4e57c81e1b74fcb5e88cde86bdff4700353e26ead

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

@@ -29,6 +29,7 @@ module Decidim
       helper Decidim::LayoutHelper
       helper Decidim::MenuHelper
       helper Decidim::OmniauthHelper
+      helper Decidim::CacheHelper
 
       layout "layouts/decidim/application"
 

data/app/forms/decidim/account_form.rb

@@ -20,7 +20,7 @@ module Decidim
 
     validates :name, presence: true
     validates :email, presence: true, 'valid_email_2/email': { disposable: true }
-    validates :nickname, presence: true, format: /\A[\w\-]+\z/
+    validates :nickname, presence: true, format: Decidim::User::REGEXP_NICKNAME
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, confirmation: true

data/app/helpers/decidim/application_helper.rb

@@ -7,6 +7,7 @@ module Decidim
     include Decidim::ScopesHelper
     include Decidim::ContextualHelpHelper
     include Decidim::AmendmentsHelper
+    include Decidim::CacheHelper
 
     # Truncates a given text respecting its HTML tags.
     #

data/app/helpers/decidim/cache_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper overrides for the ActionView::Helpers::CacheHelper in order to take
+  # locale into account for fragment caching.
+  module CacheHelper
+    # See: https://git.io/J3ouj
+    def cache(name = {}, options = {}, &block)
+      name = Array(name) + [current_locale]
+
+      super(name, options, &block)
+    end
+  end
+end

data/app/models/decidim/user.rb

@@ -11,6 +11,8 @@ module Decidim
     include Decidim::Searchable
     include Decidim::ActsAsAuthor
 
+    REGEXP_NICKNAME = /\A[\w\-]+\z/.freeze
+
     class Roles
       def self.all
         Decidim.config.user_roles
@@ -31,7 +33,11 @@ module Decidim
     has_many :access_tokens, class_name: "Doorkeeper::AccessToken", foreign_key: :resource_owner_id, dependent: :destroy
 
     validates :name, presence: true, unless: -> { deleted? }
-    validates :nickname, presence: true, unless: -> { deleted? || managed? }, length: { maximum: Decidim::User.nickname_max_length }
+    validates :nickname,
+              presence: true,
+              format: { with: REGEXP_NICKNAME },
+              length: { maximum: Decidim::User.nickname_max_length },
+              unless: -> { deleted? || managed? }
     validates :locale, inclusion: { in: :available_locales }, allow_blank: true
     validates :tos_agreement, acceptance: true, allow_nil: false, on: :create
     validates :tos_agreement, acceptance: true, if: :user_invited?

data/app/models/decidim/user_base_entity.rb

@@ -23,7 +23,7 @@ module Decidim
     validates_avatar
     mount_uploader :avatar, Decidim::AvatarUploader
 
-    validates :name, :nickname, format: { with: REGEXP_NAME }
+    validates :name, format: { with: REGEXP_NAME }
 
     # Public: Returns a collection with all the entities this user is following.
     #

data/app/models/decidim/user_group.rb

@@ -36,6 +36,10 @@ module Decidim
         .where("extended_data->>'document_number' = ?", number)
     end
 
+    def non_deleted_memberships
+      memberships.where(decidim_users: { deleted_at: nil })
+    end
+
     # Returns the presenter for this author, to be used in the views.
     # Required by ActsAsAuthor.
     def presenter

data/app/queries/decidim/user_groups/accepted_memberships.rb

@@ -23,7 +23,7 @@ module Decidim
       # Returns an ActiveRecord::Relation.
       def query
         user_group
-          .memberships
+          .non_deleted_memberships
           .includes(:user)
           .where(role: %w(creator admin member))
       end

data/app/queries/decidim/user_groups/admin_memberships.rb

@@ -24,7 +24,7 @@ module Decidim
       # Returns an ActiveRecord::Relation.
       def query
         user_group
-          .memberships
+          .non_deleted_memberships
           .includes(:user)
           .where(role: :admin)
       end

data/app/queries/decidim/user_groups/member_memberships.rb

@@ -24,7 +24,7 @@ module Decidim
       # Returns an ActiveRecord::Relation.
       def query
         user_group
-          .memberships
+          .non_deleted_memberships
           .includes(:user)
           .where(role: :member)
       end

data/app/views/decidim/application/_document.html.erb

@@ -1,7 +1,7 @@
 <div class="card--list__item">
   <div class="card--list__text">
     <div>
-      <a href="<%= document.url %>" class="card__link">
+      <a href="<%= document.url %>" class="card__link" target="_blank">
         <h4 class="card--list__heading heading6">
           <%= attachment_title(document) %> <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
         </h4>

data/app/views/decidim/reported_mailer/report.html.erb

@@ -35,7 +35,15 @@
   <% if author_profile_url.present? %>
     <p><%= link_to @author.name, author_profile_url, target: :blank %></p>
   <% else %>
-    <p><%= @author.name %></p>
+    <p>
+      <%=
+        if @author.respond_to?(:name)
+          @author.name
+        elsif @author.respond_to?(:title)
+          translated_attribute(@author.title)
+        end
+      %>
+    </p>
   <% end %>
 <% end %>
 <br>

data/config/locales/ar.yml

@@ -255,8 +255,6 @@ ar:
         name: مثال إذن
       dummy_authorization_workflow:
         name: سير العمل التخويل وهمية
-      errors:
-        duplicate_authorization: مشارك مفوض بالفعل مع نفس البيانات.
       expired_at: انتهت في %{timestamp}
       expires_at: تنتهي في %{timestamp}
       foo_authorization:

data/config/locales/bg.yml

@@ -263,8 +263,6 @@ bg:
         name: Примерна идентификация
       dummy_authorization_workflow:
         name: Макет на процедура за идентификация
-      errors:
-        duplicate_authorization: Участника вече е идентифициран с тези данни.
       expired_at: Изтече на %{timestamp}
       expires_at: Изтича на %{timestamp}
       foo_authorization:

data/config/locales/ca.yml

@@ -270,8 +270,6 @@ ca:
         name: Autorització d'exemple
       dummy_authorization_workflow:
         name: Flux de treball d'autorització d'exemple
-      errors:
-        duplicate_authorization: Ja s'ha autoritzat a una participant amb les mateixes dades.
       expired_at: Vençut el %{timestamp}
       expires_at: Venç en %{timestamp}
       foo_authorization:

data/config/locales/cs.yml

@@ -434,7 +434,7 @@ cs:
       registrations:
         new:
           already_have_an_account?: Máte již účet?
-          newsletter: Dostávejte příležitostný zpravodaj s relevantními informacemi
+          newsletter: Chci dostávat příležitostný zpravodaj s relevantními informacemi
           newsletter_title: Povolení kontaktu
           nickname_help: Vaše přezdívka v %{organization}
           password_help: "%{minimun_characters} minimum znaků, nesmí být příliš běžné (např. 123456) a musí být jiné než vaše přezdívka a váš e-mail."

data/config/locales/de.yml

@@ -274,7 +274,7 @@ de:
       dummy_authorization_workflow:
         name: Arbeitsablauf Dummy Berechtigung
       errors:
-        duplicate_authorization: Ein*e Benutzer*in ist bereits mit den gleichen Daten berechtigt.
+        duplicate_authorization: Ein Teilnehmer ist bereits mit den gleichen Daten autorisiert.
       expired_at: Abgelaufen am %{timestamp}
       expires_at: Läuft am %{timestamp} ab
       foo_authorization:

data/config/locales/el.yml

@@ -266,8 +266,6 @@ el:
         name: Παράδειγμα εξουσιοδότησης
       dummy_authorization_workflow:
         name: Ροή εργασίας εικονικής εξουσιοδότησης
-      errors:
-        duplicate_authorization: Ένας συμμετέχων έχει ήδη εξουσιοδοτηθεί με τα ίδια δεδομένα.
       expired_at: Έληξε στις %{timestamp}
       expires_at: Λήγει στις %{timestamp}
       foo_authorization:

data/config/locales/es-MX.yml

@@ -273,8 +273,6 @@ es-MX:
         name: Autorización de ejemplo
       dummy_authorization_workflow:
         name: Flujo de trabajo de autorización de ejemplo
-      errors:
-        duplicate_authorization: Un usuario ya está autorizado con los mismos datos.
       expired_at: Caducado el %{timestamp}
       expires_at: Caduca en %{timestamp}
       foo_authorization:

data/config/locales/es-PY.yml

@@ -273,8 +273,6 @@ es-PY:
         name: Autorización de ejemplo
       dummy_authorization_workflow:
         name: Flujo de trabajo de autorización de ejemplo
-      errors:
-        duplicate_authorization: Un usuario ya está autorizado con los mismos datos.
       expired_at: Caducado el %{timestamp}
       expires_at: Caduca en %{timestamp}
       foo_authorization:

data/config/locales/es.yml

@@ -270,8 +270,6 @@ es:
         name: Autorización de ejemplo
       dummy_authorization_workflow:
         name: Flujo de trabajo de autorización de ejemplo
-      errors:
-        duplicate_authorization: Ya se ha autorizado a una participante con los mismos datos.
       expired_at: Caducado el %{timestamp}
       expires_at: Caduca el %{timestamp}
       foo_authorization:

data/config/locales/eu.yml

@@ -207,8 +207,6 @@ eu:
         name: Adibidez baimena
       dummy_authorization_workflow:
         name: Dummy baimena eragiketa
-      errors:
-        duplicate_authorization: Badago erabiltzaile bat, datu berberekin baimendua.
       expired_at: '%{timestamp} iraungita dago'
       expires_at: '%{timestamp} iraungitzen da'
       foo_authorization:

data/config/locales/fi-plain.yml

@@ -274,7 +274,7 @@ fi-pl:
       dummy_authorization_workflow:
         name: Dummy-varmennuksen työnkulku
       errors:
-        duplicate_authorization: Käyttäjätili on jo varmennettu samoilla tiedoilla.
+        duplicate_authorization: Toinen käyttäjätili on jo vahvistettu samoilla tiedoilla.
       expired_at: Umpeutuu %{timestamp}
       expires_at: Umpeutuu %{timestamp}
       foo_authorization:

data/config/locales/fr-CA.yml

@@ -274,7 +274,7 @@ fr-CA:
       dummy_authorization_workflow:
         name: Procédure d'autorisation factice
       errors:
-        duplicate_authorization: Un utilisateur est déjà autorisé avec les mêmes données.
+        duplicate_authorization: Un participant est déjà autorisé avec ces mêmes données.
       expired_at: Expiré à %{timestamp}
       expires_at: Expire à %{timestamp}
       foo_authorization:

data/config/locales/fr.yml

@@ -274,7 +274,7 @@ fr:
       dummy_authorization_workflow:
         name: Procédure d'autorisation factice
       errors:
-        duplicate_authorization: Un utilisateur est déjà autorisé avec les mêmes données.
+        duplicate_authorization: Un participant est déjà autorisé avec ces mêmes données.
       expired_at: Expiré à %{timestamp}
       expires_at: Expire à %{timestamp}
       foo_authorization:

data/config/locales/gl.yml

@@ -209,8 +209,6 @@ gl:
         name: Autorización de exemplo
       dummy_authorization_workflow:
         name: Fluxo de traballo de autorización dummy
-      errors:
-        duplicate_authorization: Un usuario xa está autorizado cos mesmos datos.
       expired_at: Caducou en %{timestamp}
       expires_at: Caduca no %{timestamp}
       foo_authorization:

data/config/locales/hu.yml

@@ -263,8 +263,6 @@ hu:
         name: Példa feljogosításra
       dummy_authorization_workflow:
         name: Dummy feljogosítási folyamat
-      errors:
-        duplicate_authorization: Egy résztvevő ezekkel az adatokkal már engedélyezésre került.
       expired_at: 'Lejárat: %{timestamp}'
       expires_at: 'Lejárat: %{timestamp}'
       foo_authorization:

data/config/locales/id-ID.yml

@@ -202,8 +202,6 @@ id:
         name: Contoh otorisasi
       dummy_authorization_workflow:
         name: Alur kerja otorisasi dummy
-      errors:
-        duplicate_authorization: Pengguna sudah diotorisasi dengan data yang sama.
       expired_at: Kedaluwarsa pada %{timestamp}
       expires_at: Kedaluwarsa pada %{timestamp}
       foo_authorization:

data/config/locales/it.yml

@@ -273,8 +273,6 @@ it:
         name: Esempio di autorizzazione
       dummy_authorization_workflow:
         name: Flusso di lavoro fittizio di autorizzazione
-      errors:
-        duplicate_authorization: Esiste già un utente autorizzato con questi dati.
       expired_at: Scaduto a %{timestamp}
       expires_at: Scade a %{timestamp}
       foo_authorization:

data/config/locales/ja.yml

@@ -266,8 +266,6 @@ ja:
         name: 許可の例：
       dummy_authorization_workflow:
         name: ダミー認証ワークフロー
-      errors:
-        duplicate_authorization: 同じデータを持つ参加者はすでに承認されています．
       expired_at: '%{timestamp} で期限切れ'
       expires_at: '%{timestamp} で期限切れ'
       foo_authorization:

data/config/locales/lv.yml

@@ -267,8 +267,6 @@ lv:
         name: Autorizācijas paraugs
       dummy_authorization_workflow:
         name: Viettura autorizācijas darbplūsma
-      errors:
-        duplicate_authorization: Dalībnieks jau ir autorizēts ar tiem pašiem datiem.
       expired_at: Termiņš beidzās plkst. %{timestamp}
       expires_at: Termiņš beigsies plkst. %{timestamp}
       foo_authorization:

data/config/locales/nl.yml

@@ -272,8 +272,6 @@ nl:
         name: Voorbeeld autorisatie
       dummy_authorization_workflow:
         name: Dummy autorisatie workflow
-      errors:
-        duplicate_authorization: Een gebruiker is al gemachtigd met dezelfde gegevens.
       expired_at: Verstreken op %{timestamp}
       expires_at: Verloopt op %{timestamp}
       foo_authorization:

data/config/locales/no.yml

@@ -269,8 +269,6 @@
         name: Eksempel autorisering
       dummy_authorization_workflow:
         name: Dummy autoriserings arbeidskraft
-      errors:
-        duplicate_authorization: En deltaker har allerede autorisert med den samme informasjonen.
       expired_at: Utgått på %{timestamp}
       expires_at: Går ut %{timestamp}
       foo_authorization:

data/config/locales/pl.yml

@@ -285,8 +285,6 @@ pl:
         name: Przykładowa autoryzacja
       dummy_authorization_workflow:
         name: Przykładowy proces autoryzacji
-      errors:
-        duplicate_authorization: Użytkownik jest już uprawniony na podstawie tych samych danych.
       expired_at: Wygasł %{timestamp}
       expires_at: Wygasa %{timestamp}
       foo_authorization:

data/config/locales/pt-BR.yml

@@ -207,8 +207,6 @@ pt:
         name: Exemplo de autorização
       dummy_authorization_workflow:
         name: Fluxo de trabalho de autorização falsa
-      errors:
-        duplicate_authorization: Um usuário já está autorizado com os mesmos dados.
       expired_at: Expirou em %{timestamp}
       expires_at: Expira em %{timestamp}
       foo_authorization:

data/config/locales/pt.yml

@@ -271,8 +271,6 @@ pt:
         name: Exemplo de autorização
       dummy_authorization_workflow:
         name: Fluxo de trabalho de autorização falsa
-      errors:
-        duplicate_authorization: Um participante com os mesmos dados já está autorizado.
       expired_at: Expirou em %{timestamp}
       expires_at: Expira em %{timestamp}
       foo_authorization:

data/config/locales/ro-RO.yml

@@ -280,8 +280,6 @@ ro:
         name: Exemplu de autorizare
       dummy_authorization_workflow:
         name: Flux de lucru autorizare fictiv
-      errors:
-        duplicate_authorization: Un participant este deja autorizat cu aceleași date.
       expired_at: A expirat la %{timestamp}
       expires_at: Expiră la %{timestamp}
       foo_authorization:

data/config/locales/ru.yml

@@ -194,8 +194,6 @@ ru:
         name: Пример подтверждения личности
       dummy_authorization_workflow:
         name: Пример пути подтверждения личности
-      errors:
-        duplicate_authorization: С теми же данными уже подтвердил свою личность другой участник.
       expired_at: Срок действия истек %{timestamp}
       expires_at: Срок действия истекает в %{timestamp}
       foo_authorization:

data/config/locales/sk.yml

@@ -275,8 +275,6 @@ sk:
         name: Príklad autorizácie
       dummy_authorization_workflow:
         name: Pracovný postup autorizácie
-      errors:
-        duplicate_authorization: Účastník je už autorizovaný s rovnakými dátami.
       expired_at: Platnosť vypršala v %{timestamp}
       expires_at: Platnosť vyprší v %{timestamp}
       foo_authorization:

data/config/locales/sv.yml

@@ -272,8 +272,6 @@ sv:
         name: Exempelbekräftelse
       dummy_authorization_workflow:
         name: Dummy-arbetsflöde för bekräftelse
-      errors:
-        duplicate_authorization: En deltagare är redan behörig med samma data.
       expired_at: Förföll vid %{timestamp}
       expires_at: Förfaller vid %{timestamp}
       foo_authorization:
@@ -441,6 +439,7 @@ sv:
           buttons:
             check: Kontrollera och fortsätt
             close_modal: Stäng modal
+            uncheck: Behåll avmarkeringen
           notice: |-
             <p>Hej, är du säker på att du inte vill få nyhetsbrevet?<br>
             Överväg gärna en gång till att markera kryssrutan för nyhetsbrev nedan.<br>
@@ -1167,6 +1166,7 @@ sv:
         view_all: Visa alla (%{count})
     security:
       selfxss_warning:
+        description: Denna webbläsarfunktion är avsedd för utvecklare och du bör inte klistra in något här om du ombads att göra det. Klistra in innehåll i detta fönster kan påverka din integritet och ge hackare tillgång till ditt konto.
         title: OBS!
     shared:
       confirm_modal:

data/config/locales/tr-TR.yml

@@ -271,8 +271,6 @@ tr:
         name: Örnek yetkilendirme
       dummy_authorization_workflow:
         name: Sahte yetkilendirme iş akışı
-      errors:
-        duplicate_authorization: Bir katılımcı zaten aynı verilerle yetkilendirilmiştir.
       expired_at: '%{timestamp} bitti'
       expires_at: '%{timestamp} sona eriyor'
       foo_authorization:

data/config/locales/uk.yml

@@ -141,8 +141,6 @@ uk:
         name: Приклад підтвердження своєї особи
       dummy_authorization_workflow:
         name: Приклад шляху підтвердження особи
-      errors:
-        duplicate_authorization: Інший учасник вже підтвердив свою особу з такими ж даними.
       expired_at: Строк дії закінчився %{timestamp}
       expires_at: Строк дії закінчується %{timestamp}
       foo_authorization:

data/config/locales/zh-CN.yml

@@ -255,8 +255,6 @@ zh-CN:
         name: 示例授权
       dummy_authorization_workflow:
         name: 虚拟授权 Workflow
-      errors:
-        duplicate_authorization: 参与者已经被授权使用相同的数据。
       expired_at: 过期时间为 %{timestamp}
       expires_at: 于 %{timestamp} 过期
       foo_authorization:

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.23.5"
+      "0.23.6"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.23.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -586,22 +586,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.x
+        version: 5.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.x
+        version: 5.2.6
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -844,28 +838,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.23.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.23.6
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.23.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.23.6
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1453,6 +1447,7 @@ files:
 - app/helpers/decidim/aria_selected_link_to_helper.rb
 - app/helpers/decidim/attachments_helper.rb
 - app/helpers/decidim/authorization_form_helper.rb
+- app/helpers/decidim/cache_helper.rb
 - app/helpers/decidim/card_helper.rb
 - app/helpers/decidim/categories_helper.rb
 - app/helpers/decidim/cells_helper.rb