decidim-core 0.26.2 → 0.26.3

data/config/locales/nl.yml

@@ -973,7 +973,7 @@ nl:
           title: conversaties
         reply:
           placeholder: Jouw antwoord...
-          send: Sturen
+          send: Verzenden
           title: Beantwoorden
         show:
           back: Terug naar alle gesprekken
@@ -983,7 +983,7 @@ nl:
           title: Gesprek met %{usernames}
         start:
           send: Verzenden
-          title: Een gesprek beginnen
+          title: Gesprek starten
         update:
           error: Bericht is niet verzonden vanwege een fout
     metrics:
@@ -1618,7 +1618,7 @@ nl:
         see_more: Zie meer
   locale:
     name: Nederlands
-    name_with_error: Engels (fout!)
+    name_with_error: Nederlands (fout!)
   password_validator:
     blacklisted: staat op de zwarte lijst
     domain_included_in_password: lijkt te veel op deze domeinnaam

data/config/locales/no.yml

@@ -1672,7 +1672,7 @@
         see_more: Se mer
   locale:
     name: Engelsk
-    name_with_error: Engelsk (feil!)
+    name_with_error: Norsk (feil!)
   password_validator:
     blacklisted: er svartelistet
     domain_included_in_password: er for lik dette domenenavnet

data/config/locales/oc-FR.yml

@@ -0,0 +1 @@
+oc:

data/config/locales/pl.yml

@@ -22,6 +22,7 @@ pl:
       user:
         about: O użytkowniku
         email: Twój email
+        locale: Język
         name: Twoje imię
         nickname: Pseudonim
         password: Hasło
@@ -34,12 +35,17 @@ pl:
       decidim/demoted_membership: Nie jest już administratorem grupy
       decidim/gamification/badge_earned_event: Zdobyta odznaka
       decidim/gamification/level_up_event: Awansowałeś
+      decidim/invited_to_group_event: Zaproszono do grupy
       decidim/join_request_accepted_event: Zaakceptowano prośbę o dołączenie
       decidim/join_request_rejected_event: Odrzucono prośbę o dołączenie
       decidim/profile_updated_event: Profil zaktualizowany
       decidim/promote_to_admin: Awansowano na administratora grupy
+      decidim/promoted_to_admin_event: Awansowano na administratora grupy
       decidim/removed_from_group: Usunięto z grupy
       decidim/resource_endorsed_event: Zasoby zatwierdzone
+      decidim/resource_hidden_event: Zasób ukryty
+      decidim/user_group_created_event: Utworzono grupę użytkowników
+      decidim/welcome_notification_event: Wiadomość powitalna
   activerecord:
     attributes:
       decidim/user:
@@ -84,9 +90,52 @@ pl:
       decidim_with_day_and_month_name: "%A %d %b %Y"
       decidim_with_month_name: "%d %B %Y"
       decidim_with_month_name_short: "%d %b"
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: około 1 godz.
+        few: około %{count} godz.
+        many: około %{count} godz.
+        other: około %{count} godz.
+      about_x_months:
+        one: około 1 mies.
+        few: około %{count} mies.
+        many: około %{count} mies.
+        other: około %{count} mies.
+      half_a_minute: pół minuty
+      less_than_x_minutes:
+        one: mniej niż min.
+        few: mniej niż %{count} min.
+        many: mniej niż %{count} min.
+        other: mniej niż %{count} min.
+      less_than_x_seconds:
+        one: teraz
+        few: mniej niż %{count} min.
+        many: mniej niż %{count} min.
+        other: mniej niż %{count} min.
+      x_days:
+        one: 1 dzień temu
+        few: "%{count} dni temu"
+        many: "%{count} dni temu"
+        other: "%{count} dni temu"
+      x_hours:
+        one: 1 godzinę temu
+        few: "%{count} godzin temu"
+        many: "%{count} godzin temu"
+        other: "%{count} godzin temu"
+      x_minutes:
+        one: 1 min. temu
+        few: "%{count} min. temu"
+        many: "%{count} min. temu"
+        other: "%{count} min. temu"
+      x_seconds:
+        one: 1 sekundę temu
+        other: "%{count} sekund temu"
+        zero: właśnie teraz
   decidim:
     accessibility:
       external_link: Link zewnętrzny
+      front_page_link: Przejdź do strony głównej
       logo: "Oficjalne logo %{organization}"
       skip_button: Przejdź do głównej zawartości
     account:
@@ -982,7 +1031,7 @@ pl:
           title: Konwersacja z %{usernames}
         start:
           send: Wyślij
-          title: Zacznij konwersację
+          title: Rozpocznij konwersację
         update:
           error: Wiadomość nie została wysłana z powodu błędu
     metrics:
@@ -1565,7 +1614,7 @@ pl:
         other: 'Podczas przetwarzania Twojego żądania wystąpiły błędy:'
       too_many_marks: używa zbyt wielu kolejnych znaków interpunkcyjnych (np.! i?)
       too_much_caps: używa zbyt dużej liczby wielkich liter (ponad 25% tekstu)
-      too_short: jest za krótki (poniżej 15 znaków)
+      too_short: jest za krótkie
   forms:
     correct_errors: Wystąpiły błędy w formularzu, popraw je, aby kontynuować.
     length_validator:

data/config/locales/pt-BR.yml

@@ -963,7 +963,7 @@ pt-BR:
           title: Conversas
         reply:
           placeholder: Sua resposta...
-          send: Mandar
+          send: Enviar
           title: Resposta
         show:
           back: Voltar para todas as conversas
@@ -972,7 +972,7 @@ pt-BR:
           title: Conversa com %{usernames}
         start:
           send: Enviar
-          title: Comece uma conversa
+          title: Iniciar uma conversa
         update:
           error: A mensagem não foi enviada devido a um erro
     metrics:
@@ -1627,7 +1627,7 @@ pt-BR:
         see_more: Ver mais
   locale:
     name: Português
-    name_with_error: Inglês (erro!)
+    name_with_error: Português (erro!)
   password_validator:
     domain_included_in_password: é muito semelhante a este nome de domínio
     email_included_in_password: é muito parecido com o seu email

data/config/locales/pt.yml

@@ -457,7 +457,7 @@ pt:
           newsletter: Receber um boletim informativo ocasional com informações relevantes
           newsletter_title: Permissão de contacto
           nickname_help: A sua alcunha em %{organization}. Só pode conter letras, números, “-”, e “_”
-          password_help: "%{minimun_characters} caracteres no mínimo, não deverá ser muito comum (por ex. 123456) e deverá ser diferente da sua alcunha e do seu e-mail."
+          password_help: "%{minimun_characters} de caracteres no mínimo, não deverá ser muito comum (por ex. 123456) e deverá ser diferente da sua alcunha e do seu e-mail."
           sign_in: Entrar
           sign_up: Inscreva-se
           sign_up_as:
@@ -963,7 +963,7 @@ pt:
           title: Conversas
         reply:
           placeholder: A sua resposta...
-          send: Mandar
+          send: Enviar
           title: Responder
         show:
           back: Retroceder a todas as conversas

data/config/locales/ro-RO.yml

@@ -473,7 +473,7 @@ ro:
           newsletter: Primește un buletin informativ ocazional cu informații relevante
           newsletter_title: Drepturi privind contactele
           nickname_help: Pseudonimul tău în %{organization}. Poate conține doar litere, numere, '-' și '_'.
-          password_help: "minim %{minimun_characters} caractere, nu trebuie să fie prea comune (ex. 123456) și trebuie să fie diferite de pseudonimul și adresa ta de e-mail."
+          password_help: "minim %{minimun_characters} caractere, nu trebuie să fie prea comune (ex. 123456) și trebuie să fie diferite de porecla și adresa dvs. de e-mail."
           sign_in: Autentificare
           sign_up: Înscrie-te
           sign_up_as:

data/config/locales/ru.yml

@@ -300,7 +300,6 @@ ru:
           already_have_an_account?: У вас уже есть учетная запись?
           newsletter: Получать время от времени рассылку со свежими новостями
           newsletter_title: Разрешение на связь с вами
-          password_help: "Минимум %{minimun_characters} символов, не должен быть слишком распространенным (например, 123456) и должен отличаться от вашего имени и электронной почты."
           sign_in: Войти
           sign_up: Зарегистрироваться
           sign_up_as:
@@ -513,10 +512,8 @@ ru:
           no_conversations: У вас еще нет бесед
         reply:
           send: Отправить
-          title: Ответить
         start:
           send: Отправить
-          title: Начать беседу
     newsletter_mailer:
       newsletter:
         note: Вы получили это электронное письмо, потому что подписались на новостные рассылки %{organization_name}. Вы можете изменить свои настройки на своей <a href="%{link}">странице уведомлений</a>.
@@ -763,6 +760,8 @@ ru:
       edit:
         new_password: Пароль
     registrations:
+      edit:
+        are_you_sure: Вы уверены?
       new:
         sign_up: Зарегистрироваться
       signed_up: Добро пожаловать! Вы успешно зарегистрировались.

data/config/locales/sk.yml

@@ -409,7 +409,7 @@ sk:
           already_have_an_account?: Už máte účet?
           newsletter: Dostávajte príležitostný spravodajca s relevantnými informáciami
           newsletter_title: Povolenie kontaktu
-          password_help: "%{minimun_characters} minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
+          password_help: "%{minimun_characters} je minimum znakov, nesmie byť príliš bežné (napr. 123456) a musí byť iné ako vaše prezývka a váš e-mail."
           sign_in: Prihlásiť sa
           sign_up: Zaregistrovať sa
           sign_up_as:
@@ -821,15 +821,12 @@ sk:
           no_conversations: Nemáte zatím žádné konverzace
           title: Konverzace
         reply:
-          placeholder: Vaša odpoveď...
           send: Poslat
-          title: Odpověď
         show:
           chat_with: Konverzácia s
           title: Konverzace s číslem %{usernames}
         start:
           send: Poslat
-          title: Spusťte konverzaci
     metrics:
       followers:
         description: Počet účastníkov, ktorí sledujú tento participatívny priestor

data/config/locales/sv.yml

@@ -41,6 +41,7 @@ sv:
       decidim/promote_to_admin: Befordrad till gruppadministratör
       decidim/removed_from_group: Borttagen från gruppen
       decidim/resource_endorsed_event: Resurs instämd
+      decidim/welcome_notification_event: Välkomstmeddelande
   activerecord:
     attributes:
       decidim/user:
@@ -123,7 +124,7 @@ sv:
           ok: Ja, radera mitt konto
           question: Är du säker på att du vill radera ditt konto?
           title: Radera mitt konto
-        explanation: Ange skälet till varför du vill radera ditt konto (valfritt).
+        explanation: Ange skälet till varför du vill radera ditt konto (frivilligt).
       destroy:
         error: Det gick inte att radera ditt konto.
         success: Ditt konto har raderats.

data/config/locales/tr-TR.yml

@@ -929,7 +929,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 +947,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:

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

@@ -1472,8 +1472,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/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
 

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,5 @@ 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"

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.3"
     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/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/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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -754,28 +754,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1994,6 +1994,7 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -2392,6 +2393,7 @@ files:
 - lib/decidim/core/test/shared_examples/railtie_examples.rb
 - lib/decidim/core/test/shared_examples/reportable.rb
 - lib/decidim/core/test/shared_examples/reports_examples.rb
+- lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb
 - lib/decidim/core/test/shared_examples/resource_search_examples.rb
 - lib/decidim/core/test/shared_examples/resourceable.rb
 - lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb
@@ -2410,6 +2412,7 @@ files:
 - lib/decidim/core/test/shared_examples/traceable_interface_examples.rb
 - lib/decidim/core/test/shared_examples/translated_event_examples.rb
 - lib/decidim/core/test/shared_examples/uncommentable_component_examples.rb
+- lib/decidim/core/test/shared_examples/versions_controller_examples.rb
 - lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb
 - lib/decidim/core/version.rb
 - lib/decidim/data_portability.rb