decidim-core 0.26.2 → 0.26.4

data/config/locales/tr-TR.yml

@@ -729,18 +729,6 @@ tr:
           how: Nasıl kazanabilirsin
           page_description: Rozetler, katılımcı eylemleri ve platformdaki ilerlemeleri tanımaktadır. Platformda keşfetmeye, katılmaya ve etkileşim kurmaya başladığınızda farklı rozetler kazanacaksınız. İşte rozetlerin listesi ve bunları kazanmanın bazı yolları.
           title: Rozetler
-        invitations:
-          conditions:
-            - Arkadaşlarınızı davet etmek için kullanıcı sayfanızdaki “arkadaşlarını davet et” bağlantısını kullanın.
-            - İsterseniz, göndermek istediğiniz mesajı özelleştirin
-            - Davetiyeler göndererek ve onları kayıt altına alarak seviye atlayacaksınız.
-          description: Bu rozeti, bazı kişileri davet ettiğinizde ve %{organization_name} kaydolmak ve katılımcı olmak için biraz zaman ayırdıklarında verilir. Yaptığınız için teşekkür ederiz %{organization_name} başkalarına bilinen ve topluluğu genişletmek için yardımcı!
-          description_another: Bu kullanıcı %{score} kullanıcı davet etti.
-          description_own: '%{score} kullanıcıyı davet ettiniz.'
-          name: Davetiyeler
-          next_level_in: Bir sonraki seviyeye ulaşmak için %{score} kullanıcı daha davet edin!
-          unearned_another: Bu kullanıcı henüz bir kullanıcıyı davet etmedi.
-          unearned_own: Henüz hiç kullanıcı davet etmediniz.
       description: Rozetler, katılımcı eylemleri ve platformdaki ilerlemeleri tanımaktadır. Platformda keşfetmeye, katılmaya ve etkileşim kurmaya başladığınızda farklı rozetler kazanacaksınız.
       level: Seviye %{level}
       reached_top: Bu rozetin en üst seviyesine ulaştınız.
@@ -929,7 +917,7 @@ tr:
           ok: OK
         index:
           ago: önce
-          close: Pencereyi kapat
+          close: Yakın kalıcı
           from: Gönderen
           groups: Gruplarım
           last_message: Son mesaj
@@ -947,7 +935,7 @@ tr:
           title: '%{usernames} ile görüşme'
         start:
           send: Gönder
-          title: Bir görüşme başlat
+          title: Bir görüşme başlatın
         update:
           error: Bir hata nedeniyle mesaj gönderilemedi
     metrics:
@@ -1446,15 +1434,6 @@ tr:
       updated_not_active: Şifreniz başarıyla değiştirildi.
     registrations:
       destroyed: Hoşçakal! Hesabınız başarıyla iptal edildi. Kısa süre sonra tekrar görmeyi umuyoruz.
-      edit:
-        are_you_sure: Emin misiniz?
-        cancel_my_account: Hesabımı iptal et
-        currently_waiting_confirmation_for_email: 'Şu an için bekleme onayı: %{email}'
-        leave_blank_if_you_don_t_want_to_change_it: değiştirmek istemiyorsanız boş bırakın
-        title: '%{resource}düzenle'
-        unhappy: Mutsuz?
-        update: Güncelleştirme
-        we_need_your_current_password_to_confirm_your_changes: değişikliklerinizi onaylamak için mevcut şifrenize ihtiyacımız var
       new:
         sign_up: kaydol
       signed_up: Hoşgeldiniz! Başarıyla kaydoldunuz.
@@ -1509,7 +1488,6 @@ tr:
         other: 'İsteğinizi işlerken birden çok hata oluştu:'
       too_many_marks: çok fazla ardışık noktalama işareti kullanıyor (örneğin! ve?)
       too_much_caps: çok fazla büyük harf kullanıyor (metnin% 25'inden fazlası)
-      too_short: çok kısa (15 karakterin altında)
   forms:
     correct_errors: Aşağıdaki formda hatalar oluştu, Devam etmek için lütfen bunları düzeltin.
     required: gereklidir

data/config/locales/uk.yml

@@ -385,10 +385,9 @@ uk:
           close: Закрити віконце
           no_conversations: У вас ще немає бесід
         reply:
-          title: Відповісти
+          send: Надіслати
         start:
           send: Надіслати
-          title: Почати бесіду
     newsletter_mailer:
       newsletter:
         note: Ви отримали цього електронного листа, оскільки ви підписалися на новини щодо %{organization_name}. Ви можете змінити свої налаштування на <a href="%{link}">сторінці сповіщень</a>.

data/config/locales/zh-CN.yml

@@ -656,18 +656,6 @@ zh-CN:
           how: 你如何赚钱
           page_description: 徽章是对参与者行动和平台进展的承认。 当您开始发现、参与和互动平台时，您将获得不同的徽章。 这里是徽章列表和您可以赚取它们的某些方式。
           title: 徽章
-        invitations:
-          conditions:
-            - 使用您用户页面上的“邀请好友”链接来邀请您的朋友
-            - 自定义，如果您想要，您正在发送的消息
-            - 您将通过发送邀请和注册来提高等级。
-          description: 当您已经邀请了一些人并且他们花了一些时间在 %{organization_name} 注册并成为参与者时，这个徽章将被授予。 感谢您向其他人宣传了 %{organization_name} 并帮助扩展社区！
-          description_another: 此参与者已邀请了 %{score} 人。
-          description_own: 您已邀请了 %{score} 人。
-          name: 邀请
-          next_level_in: 邀请更多 %{score} 人到达下一个关卡！
-          unearned_another: 此参与者尚未邀请任何人。
-          unearned_own: 你还没有邀请任何人。
       description: 徽章是对参与者行动和平台进展的承认。 当您开始发现、参与和互动平台时，您将获得不同的徽章。
       level: 等级 %{level}
       reached_top: 你已经达到了这个徽章的顶级了。
@@ -1350,15 +1338,6 @@ zh-CN:
       updated_not_active: 您的密码已成功更改。
     registrations:
       destroyed: 您的帐户已成功取消。我们希望很快再见到您。
-      edit:
-        are_you_sure: 您确定吗？
-        cancel_my_account: 取消我的帐户
-        currently_waiting_confirmation_for_email: '正在等待确认: %{email}'
-        leave_blank_if_you_don_t_want_to_change_it: 如果您不想更改它，请留空
-        title: 编辑 %{resource}
-        unhappy: 不愉快？
-        update: 更新
-        we_need_your_current_password_to_confirm_your_changes: 我们需要您当前的密码来确认您的更改
       new:
         sign_up: 注册
       signed_up: 欢迎！您已成功注册。
@@ -1411,7 +1390,6 @@ zh-CN:
         other: '处理您的请求时发生多个错误：'
       too_many_marks: 正在使用太多连续标点符号(例如! 和 ?)
       too_much_caps: 正在使用太多大写字母(超过25%文本)
-      too_short: 太短(低于15个字符)
   forms:
     correct_errors: 表单上有错误，请更正以继续。
     required: 必填字段
@@ -1472,8 +1450,8 @@ zh-CN:
       widget:
         see_more: 查看更多
   locale:
-    name: Distr.
-    name_with_error: 英文(错误!)
+    name: 中文
+    name_with_error: 中文(错误!)
   password_validator:
     domain_included_in_password: 与这个域名太近了
     email_included_in_password: 与您的电子邮件太相似了

data/config/routes.rb

@@ -11,11 +11,29 @@ Decidim::Core::Engine.routes.draw do
                invitations: "decidim/devise/invitations",
                sessions: "decidim/devise/sessions",
                confirmations: "decidim/devise/confirmations",
-               registrations: "decidim/devise/registrations",
                passwords: "decidim/devise/passwords",
                unlocks: "decidim/devise/unlocks",
                omniauth_callbacks: "decidim/devise/omniauth_registrations"
-             }
+             },
+             skip: [:registrations]
+
+  # Manually define the registration routes because otherwise the default "edit"
+  # route would be exposed through Devise while we already have the edit and
+  # destroy routes available through the account pages.
+  resource(
+    :registration,
+    only: [:new, :create],
+    as: :user_registration,
+    path: "/users",
+    path_names: { new: "sign_up" },
+    controller: "devise/registrations"
+  ) do
+    # The "cancel" route forces the session data which is usually expired after
+    # sign in to be expired now. This is useful if the user wants to cancel
+    # OAuth signing in/up in the middle of the process, removing all OAuth
+    # session data. @see [Devise::RegistrationsController#cancel]
+    get :cancel
+  end
 
   devise_for :user_groups,
              class_name: "Decidim::UserGroup",

data/lib/decidim/attributes/localized_date.rb

@@ -10,12 +10,20 @@ module Decidim
 
         Date.strptime(value, I18n.t("date.formats.decidim_short"))
       rescue ArgumentError
-        nil
+        coerce_fallback(value)
       end
 
       def type
         Axiom::Types::Date
       end
+
+      private
+
+      def coerce_fallback(value)
+        coercer.coercers[DateTime].public_send(type.coercion_method, value)
+      rescue Date::Error
+        nil
+      end
     end
   end
 end

data/lib/decidim/attributes/time_with_zone.rb

@@ -10,12 +10,24 @@ module Decidim
 
         Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
       rescue ArgumentError
-        nil
+        coerce_fallback(value)
       end
 
       def type
         Axiom::Types::Time
       end
+
+      private
+
+      def coerce_fallback(value)
+        fallback = coercer.coercers[Time].public_send(type.coercion_method, value)
+        return Time.zone.strptime(fallback.split(".").first, "%FT%R:%S") if fallback.is_a?(String)
+        return nil unless fallback.is_a?(Time)
+
+        ActiveSupport::TimeWithZone.new(fallback, Time.zone)
+      rescue ArgumentError, TypeError
+        nil
+      end
     end
   end
 end

data/lib/decidim/content_parsers/hashtag_parser.rb

@@ -18,7 +18,7 @@ module Decidim
 
       # Matches a hashtag if it starts with a letter or number
       # and only contains letters, numbers or underscores.
-      HASHTAG_REGEX = /\s\K\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i.freeze
+      HASHTAG_REGEX = /(?:\A|\s\K)\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i.freeze
 
       # Replaces hashtags name with new or existing hashtags models global ids.
       #

data/lib/decidim/core/engine.rb

@@ -254,7 +254,7 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/views") # for partials
       end
 
-      initializer "doorkeeper" do
+      initializer "doorkeeper", before: "doorkeeper.params.filter" do
         Doorkeeper.configure do
           orm :active_record
 
@@ -531,11 +531,6 @@ module Decidim
       end
 
       initializer "decidim.core.add_badges" do
-        Decidim::Gamification.register_badge(:invitations) do |badge|
-          badge.levels = [1, 5, 10, 30, 50]
-          badge.reset = ->(user) { Decidim::User.where(invited_by: user.id).count }
-        end
-
         Decidim::Gamification.register_badge(:followers) do |badge|
           badge.levels = [1, 15, 30, 60, 100]
           badge.reset = ->(user) { user.followers.count }

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "m-cell" do |model_name|
+  context "with decorated title" do
+    let(:cell_model) { send(model_name) }
+
+    before do
+      cell_model.update!(title: { en: "Model <strong>decorated title</strong>" })
+    end
+
+    it "renders the escaped title correctly" do
+      expect(cell_html.to_s).to include("Model &lt;strong&gt;decorated title&lt;/strong&gt;")
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "resource endorsed event" do
+  include_context "when a simple event"
+
+  let(:event_name) { "decidim.events.resource_endorsed" }
+  let(:author) { create :user, organization: resource.organization }
+
+  let(:extra) { { endorser_id: author.id } }
+  let(:endorsement) { create :endorsement, resource: resource, author: author }
+  let(:resource_path) { resource_locator(resource).path }
+  let(:follower) { create(:user, organization: resource.organization) }
+  let(:follow) { create(:follow, followable: author, user: follower) }
+
+  it_behaves_like "a simple event"
+
+  describe "types" do
+    subject { described_class }
+
+    it "supports notifications" do
+      expect(subject.types).to include :notification
+    end
+
+    it "supports emails" do
+      expect(subject.types).to include :email
+    end
+  end
+
+  describe "email_subject" do
+    it "is generated correctly" do
+      expect(subject.email_subject).to eq("#{author_presenter.nickname} has performed a new endorsement")
+    end
+  end
+
+  describe "email_intro" do
+    it "is generated correctly" do
+      expect(subject.email_intro)
+        .to eq("#{author.name} #{author_presenter.nickname}, who you are following," \
+               " has just endorsed \"#{translated resource.title}\" and we think it may be interesting to you. Check it out and contribute:")
+    end
+  end
+
+  describe "notification_title" do
+    it "is generated correctly" do
+      expect(subject.notification_title)
+        .to include("The <a href=\"#{resource_path}\">#{translated resource.title}</a> #{resource_type} has been endorsed by ")
+
+      expect(subject.notification_title)
+        .to include("<a href=\"/profiles/#{author.nickname}\">#{author.name} #{author_presenter.nickname}</a>.")
+    end
+  end
+
+  describe "resource_text" do
+    it "shows the resource text" do
+      expect(subject.resource_text).to eq resource_text
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "versions controller" do
+  let(:base_params) do
+    if resource.is_a?(Decidim::Participable)
+      { "#{resource.model_name.singular_route_key}_slug".to_sym => resource.slug }
+    else
+      { "#{resource.model_name.singular_route_key}_id".to_sym => resource.id }
+    end
+  end
+
+  before do
+    request.env["decidim.current_organization"] = resource.organization
+
+    if resource.is_a?(Decidim::HasComponent)
+      request.env["decidim.current_participatory_space"] = resource.participatory_space
+      request.env["decidim.current_component"] = resource.component
+    end
+  end
+
+  describe "GET show" do
+    context "with an existing version" do
+      it "returns a HTTP 200" do
+        get :show, params: base_params.merge(id: 1)
+
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context "when the resource does not exist" do
+      it "raises a routing error" do
+        expect do
+          get :show, params: base_params.merge(id: 999_999_999)
+        end.to raise_error(ActionController::RoutingError)
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ require "spec_helper"
 # users of this test should delare the `subject` variable.
 shared_examples "with endorsable permissions can perform actions related to endorsable" do
   let(:action_subject) { :endorsement }
-  let(:resource) { create :dummy_resource }
+  let(:resource) { create :dummy_resource, component: component }
   before do
     context[:current_settings] = double(current_settings)
     context[:resource] = resource

data/lib/decidim/core/test.rb

@@ -71,3 +71,6 @@ require "decidim/core/test/shared_examples/categories_container_examples"
 require "decidim/core/test/shared_examples/assembly_announcements_examples"
 require "decidim/core/test/shared_examples/translated_event_examples"
 require "decidim/core/test/shared_examples/conversations_examples"
+require "decidim/core/test/shared_examples/versions_controller_examples"
+require "decidim/core/test/shared_examples/resource_endorsed_event_examples"
+require "decidim/core/test/shared_examples/mcell_examples"

data/lib/decidim/core/version.rb

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

data/lib/decidim/events/simple_event.rb

@@ -32,7 +32,14 @@ module Decidim
       end
 
       def email_subject
-        I18n.t("email_subject", i18n_options).html_safe
+        I18n.t("email_subject", email_subject_i18n_options).html_safe
+      end
+
+      def email_subject_i18n_options
+        sanitized_values = { resource_title: decidim_sanitize(resource_title) }
+        sanitized_values[:mentioned_proposal_title] = decidim_sanitize(mentioned_proposal_title) if i18n_options.has_key?(:mentioned_proposal_title)
+        sanitized_values[:participatory_space_title] = decidim_sanitize(participatory_space_title) if i18n_options.has_key?(:participatory_space_title)
+        i18n_options.merge(sanitized_values)
       end
 
       def email_intro

data/lib/decidim/form_builder.rb

@@ -380,7 +380,14 @@ module Decidim
     def datetime_field(attribute, options = {})
       value = object.send(attribute)
       data = { datepicker: "", timepicker: "" }
-      data[:startdate] = I18n.l(value, format: :decidim_short) if value.present? && value.is_a?(ActiveSupport::TimeWithZone)
+      if value.present?
+        case value
+        when ActiveSupport::TimeWithZone
+          data[:startdate] = I18n.l(value, format: :decidim_short)
+        when Time, DateTime
+          data[:startdate] = I18n.l(value.in_time_zone(Time.zone), format: :decidim_short)
+        end
+      end
       datepicker_format = ruby_format_to_datepicker(I18n.t("time.formats.decidim_short"))
       data[:"date-format"] = datepicker_format
 

data/lib/decidim/has_resource_permission.rb

@@ -14,8 +14,6 @@ module Decidim
 
       delegate :resource_manifest, :resource_key, to: :class
 
-      alias_method :manifest, :resource_manifest
-
       # Public: Whether the permissions for this object actions can be set at resource level.
       def allow_resource_permissions?
         false

data/lib/decidim/map/provider/dynamic_map/here.rb

@@ -33,7 +33,7 @@ module Decidim
               )
             end
 
-            base_config.merge(api_key: api_key)
+            base_config.merge(api_key: api_key, language: language_code)
           end
 
           # A builder for the HERE maps which needs to be configured differently
@@ -44,6 +44,51 @@ module Decidim
               template.javascript_pack_tag("decidim_map_provider_here", defer: false)
             end
           end
+
+          private
+
+          def language_code
+            primary = I18n.locale.to_s
+            secondary = primary.split("-")[0]
+            available_language_codes[primary] || available_language_codes[secondary] || ""
+          end
+
+          def available_language_codes
+            @available_language_codes ||= {
+              "ar" => "ara", # Arabic
+              "eu" => "baq", # Basque
+              "ca" => "cat", # Catalan
+              "zh" => "chi", # Chinese (simplified)
+              # "" => "cht", # Chinese (traditional)
+              "cs" => "cze", # Czech
+              "da" => "dan", # Danish
+              "nl" => "dut", # Dutch
+              "en" => "eng", # English
+              "fi" => "fin", # Finnish
+              "fr" => "fre", # French
+              "de" => "ger", # German
+              "ga" => "gle", # Gaelic
+              "el" => "gre", # Greek
+              "he" => "heb", # Hebrew
+              "hi" => "hin", # Hindi
+              "id" => "ind", # Indonesian
+              "it" => "ita", # Italian
+              "no" => "nor", # Norwegian
+              "fa" => "per", # Persian
+              "pl" => "pol", # Polish
+              "pt" => "por", # Portuguese
+              "ru" => "rus", # Russian
+              "si" => "sin", # Sinhalese
+              "es" => "spa", # Spanish
+              "sv" => "swe", # Swedish
+              "th" => "tha", # Thai
+              "tr" => "tur", # Turkish
+              "uk" => "ukr", # Ukrainian
+              "ur" => "urd", # Urdu
+              "vi" => "vie", # Vietnamese
+              "cy" => "wel" # Welsh
+            }
+          end
         end
       end
     end

data/lib/decidim/nicknamizable.rb

@@ -52,7 +52,7 @@ module Decidim
         candidate = name
 
         2.step do |n|
-          return candidate unless exists?(scope.merge(nickname: candidate))
+          return candidate if Decidim::UserBaseEntity.where("nickname ILIKE ?", candidate.downcase).where(scope).empty?
 
           candidate = numbered_variation_of(name, n)
         end

data/lib/decidim/resourceable.rb

@@ -25,8 +25,8 @@ module Decidim
       # link_name     - The String name of the link between this model and the target resource.
       #
       # Returns an ActiveRecord::Relation.
-      def linked_resources(resource_name, link_name)
-        scope = sibling_scope(resource_name)
+      def linked_resources(resource_name, link_name, component_published: true)
+        scope = sibling_scope(resource_name, component_published: component_published)
 
         from = scope
                .joins(:resource_links_from)
@@ -45,14 +45,15 @@ module Decidim
       # resource_name - The String name of the resource manifest exposed by a component.
       #
       # Returns an ActiveRecord::Relation.
-      def sibling_scope(resource_name)
+      def sibling_scope(resource_name, component_published: true)
         manifest = Decidim.find_resource_manifest(resource_name)
         return self.class.none unless manifest
 
         scope = manifest.resource_scope(component)
         scope = scope.where("#{self.class.table_name}.id != ?", id) if manifest.model_class == self.class
         scope = scope.not_hidden if manifest.model_class.respond_to?(:not_hidden)
-        scope.includes(:component).where.not(decidim_components: { published_at: nil })
+        scope = scope.includes(:component).where.not(decidim_components: { published_at: nil }) if component_published
+        scope
       end
 
       # Links the given resources to this model, replaces any previous links with the same name.

data/lib/decidim/settings_manifest.rb

@@ -97,7 +97,7 @@ module Decidim
         enum: { klass: String, default: nil },
         select: { klass: String, default: nil },
         scope: { klass: Integer, default: nil },
-        time: { klass: Time, default: nil }
+        time: { klass: Decidim::Attributes::TimeWithZone, default: nil }
       }.freeze
 
       attribute :type, Symbol, default: :boolean

data/lib/decidim/translatable_attributes.rb

@@ -43,7 +43,14 @@ module Decidim
 
           define_method attribute_name do
             field = public_send(name) || {}
-            value = field[locale.to_s] || field[locale.to_sym]
+            value =
+              if field.is_a?(Hash)
+                field[locale.to_s] || field[locale.to_sym]
+              else
+                # The value may not be a hash in case the attribute type was
+                # changed and the old value is still stored against the record.
+                field
+              end
             attribute_set[attribute_name].coerce(value)
           end