decidim-core 0.30.0.rc3 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1741dcb0de873587b3e2ff7eb8faae32fa98107e26b42a1c30e1cff7c876f7b3
-  data.tar.gz: 7d5c4a405e277850a00645b6625097cf69a0b4b18dfdfa876be69ca045e71062
+  metadata.gz: 763791440d8acd9bfdb66f0afe4d1a738f362815fd237b20b703a6fdc89edfb8
+  data.tar.gz: e6ff16714f702a13b60bee8d4bce8fe03978be54bbeea60c779bb5aaf735661f
 SHA512:
-  metadata.gz: fd16b3dbf24ccaf8cced5f0b23eb3dd496e5269bb19fb14010c4db9cc21e01f19c9cd19cff38540d1c9fd474d5e28d3e2a191d9a4e7d2bebde039eff54cdcf1b
-  data.tar.gz: 598051abedb973a6c95e2504d03a30de39f050a57d414aa625c474a2483cc0db42b78e0c923456aab83b960f2ed0dc42983304bc1798d24e9e80a4f08907ad1d
+  metadata.gz: 6ca3eaa4281c6b5f676f1df20466d18f8cd1893a26645f5bdd1f00ed9efe413849250801ae49d3e8572a7ca66fe24c0fe09935fb972719b67083df9ff13b4143
+  data.tar.gz: '068568c77bcf227bb7ef783606a63e858d59992001cc2e36d88c97212bf89fac3acefde0568f3557b4af7aa518326db6f5f10e5188d2195211a1a2b356228789'

data/app/cells/decidim/address/show.erb

@@ -4,13 +4,13 @@
       <%= icon "map-pin-line" %>
       <div class="address">
         <% if has_location? %>
-          <div class="address__location"><%= location %></div>
+          <p class="address__location"><%= location %></p>
         <% end %>
 
-        <div class="address__address"><%= address %></div>
+        <p class="address__address"><%= address %></p>
 
         <% if has_location_hints? %>
-          <div class="address__hints"><%= location_hints %></div>
+          <p class="address__hints"><%= location_hints %></p>
         <% end %>
       </div>
     </div>

data/app/cells/decidim/author/show.erb

@@ -1,6 +1,6 @@
 <%# If the options hash has the demo key it means we are in the decidim-design engine, so it is not a real-world scenario with actual users %>
 <% tooltip = options.has_key?(:demo) ? { tooltip: render(:profile_minicard).html_safe } : nil %>
-<%= content_tag(:span, class: :author, data: ) do %>
+<%= content_tag(:p, class: :author, data: ) do %>
   <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: tooltip do %>
     <% if layout == :compact %>
       <%= render :avatar %>

data/app/cells/decidim/content_blocks/participatory_space_extra_data/extra_data.erb

@@ -2,10 +2,10 @@
   <div class="participatory-space__metadata-item">
     <div class="participatory-space__metadata-item-title">
       <%= icon item[:icon] %>
-      <span><%= item[:title] %></span>
+      <h2><%= item[:title] %></h2>
     </div>
     <% if item[:text].present? %>
-      <%= content_tag :span, item[:text] %>
+      <%= content_tag :p, item[:text] %>
     <% elsif item[:partial].present? %>
       <%= render item[:partial] %>
     <% end %>

data/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb

@@ -1,9 +1,9 @@
 <h4 class="menu-bar__secondary-dropdown__title"><%= title %></h4>
-<div class="menu-bar__secondary-dropdown__metadata">
-  <% if hashtag.present? %>
+<% if hashtag.present? %>
+  <div class="menu-bar__secondary-dropdown__metadata">
     <span>
       <%= icon "twitter-x-line", class: "text-gray fill-current" %>
       <%= link_to "##{hashtag}", twitter_hashtag_url(hashtag), target: "_blank", class: "text-secondary underline" %>
     </span>
-  <% end %>
-</div>
+  </div>
+<% end %>

data/app/cells/decidim/participatory_space_dropdown_metadata/show.erb

@@ -3,7 +3,9 @@
     <%= render :metadata %>
     <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", model, hide_participatory_space: true %>
   </div>
-  <ul class="menu-bar__secondary-dropdown__menu">
-    <%= render :links %>
-  </ul>
+  <nav role="navigation" aria-label="<%= t("decidim.accessibility.secondary_menu") %>">
+    <ul class="menu-bar__secondary-dropdown__menu">
+      <%= render :links %>
+    </ul>
+  </nav>
 </div>

data/app/commands/decidim/create_report.rb

@@ -34,7 +34,7 @@ module Decidim
       send_report_notification_to_moderators
 
       if hideable?
-        hide!
+        @tool.hide!
         send_hide_notification_to_moderators
       end
 
@@ -72,16 +72,15 @@ module Decidim
       hidden_by_admin? || (!@reportable.hidden? && moderation.report_count >= Decidim.max_reports_before_hiding)
     end
 
-    def hide!
-      @tool.hide!
-      @tool.send_notification_to_author
-    end
-
     def send_hide_notification_to_moderators
       participatory_space_moderators.each do |moderator|
         next unless moderator.email_on_moderations
 
-        ReportedMailer.hide(moderator, @report).deliver_later
+        if hidden_by_admin?
+          ReportedMailer.hidden_manually(moderator, @report, current_user).deliver_later
+        else
+          ReportedMailer.hidden_automatically(moderator, @report).deliver_later
+        end
       end
     end
   end

data/app/commands/decidim/invite_user.rb

@@ -41,7 +41,7 @@ module Decidim
       @user = Decidim::User.new(
         name: form.name,
         email: form.email.downcase,
-        nickname: UserBaseEntity.nicknamize(form.name, organization: form.organization),
+        nickname: UserBaseEntity.nicknamize(form.name, form.organization.id),
         organization: form.organization,
         admin: form.role == "admin",
         roles: form.role == "admin" ? [] : [form.role].compact

data/app/commands/decidim/search.rb

@@ -37,6 +37,12 @@ module Decidim
                     klass.order_by_id_list(result_ids.take(HIGHLIGHTED_RESULTS_COUNT))
                   end
 
+        uncommentable_resources = uncommentable_resources(results) if results.present?
+        if uncommentable_resources.present?
+          results -= uncommentable_resources
+          results_count -= uncommentable_resources.count
+        end
+
         results_by_type.update(class_name => {
                                  count: results_count,
                                  results:
@@ -89,5 +95,13 @@ module Decidim
       query = query.global_search(I18n.transliterate(term)) if term.present?
       query
     end
+
+    def uncommentable_resources(results)
+      results.where(id: results.select { |obj| related_uncommentable_resources?(obj) }.map(&:id))
+    end
+
+    def related_uncommentable_resources?(object)
+      object.respond_to?(:commentable) && !object.commentable.commentable?
+    end
   end
 end

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

@@ -9,6 +9,7 @@ module Decidim
 
     included do
       include Decidim::NeedsOrganization
+      include Decidim::UserRoleChecker
 
       helper ParticipatorySpaceHelpers, IconHelper, ContextualHelpHelper
       helper_method :current_participatory_space
@@ -81,8 +82,10 @@ module Decidim
       return true unless current_participatory_space.try(:private_space?) &&
                          !current_participatory_space.try(:is_transparent?)
       return false unless current_user
+      return true if current_user.admin?
+      return true if user_has_any_role?(current_user, current_participatory_space, broad_check: true)
 
-      current_user.admin || current_participatory_space.users.include?(current_user)
+      current_participatory_space.users.include?(current_user)
     end
 
     def help_section

data/app/controllers/decidim/reports_controller.rb

@@ -2,6 +2,7 @@
 
 module Decidim
   # Exposes the report resource so users can report a reportable.
+  # Unless the reportable is marked as hideable, the resource notice will change accordingly.
   class ReportsController < Decidim::ApplicationController
     include FormFactory
     include NeedsPermission
@@ -15,8 +16,12 @@ module Decidim
 
       CreateReport.call(@form, reportable) do
         on(:ok) do
-          flash[:notice] = I18n.t("decidim.reports.create.success")
-          redirect_back fallback_location: root_path
+          flash[:notice] = if hideable?
+                             I18n.t("decidim.reports.hide.success")
+                           else
+                             I18n.t("decidim.reports.create.success")
+                           end
+          redirect_to reportable.reload.reported_content_url
         end
 
         on(:invalid) do

data/app/forms/decidim/account_form.rb

@@ -21,7 +21,10 @@ module Decidim
 
     validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :nickname, presence: true, format: { with: Decidim::UserBaseEntity::REGEXP_NAME }
+    validates :nickname,
+              presence: true,
+              format: { with: Decidim::User::REGEXP_NICKNAME, message: :format },
+              length: { maximum: Decidim::User.nickname_max_length }
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }

data/app/forms/decidim/ephemeral_user_form.rb

@@ -16,7 +16,7 @@ module Decidim
     end
 
     def nickname
-      super || User.nicknamize(name)
+      super || User.nicknamize("#{name}_#{SecureRandom.alphanumeric(8)}", organization.id)
     end
   end
 end

data/app/forms/decidim/omniauth_registration_form.rb

@@ -26,7 +26,7 @@ module Decidim
     end
 
     def normalized_nickname
-      UserBaseEntity.nicknamize(nickname || name, organization: current_organization)
+      UserBaseEntity.nicknamize(nickname || name, current_organization.id)
     end
 
     def newsletter_at

data/app/forms/decidim/registration_form.rb

@@ -37,7 +37,7 @@ module Decidim
     end
 
     def generate_nickname(name, organization)
-      Decidim::UserBaseEntity.nicknamize(name, organization:)
+      Decidim::UserBaseEntity.nicknamize(name, organization.id)
     end
 
     def valid_users

data/app/helpers/decidim/menu_helper.rb

@@ -39,7 +39,7 @@ module Decidim
       @breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
         :menu,
         self,
-        container_options: { class: "menu-bar__main-dropdown__menu" }
+        container_options: { class: "menu-bar__dropdown-menu" }
       )
     end
 
@@ -47,7 +47,7 @@ module Decidim
       @mobile_breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
         :mobile_menu,
         self,
-        container_options: { class: "menu-bar__main-dropdown__menu" }
+        container_options: { class: "menu-bar__main-dropdown__top-menu" }
       )
     end
 

data/app/helpers/decidim/paginate_helper.rb

@@ -13,7 +13,7 @@ module Decidim
 
       per_page = (params[:per_page] || paginate_params[:per_page] || Decidim::Paginable::OPTIONS.first).to_i
 
-      content_tag :div, class: "flex flex-col-reverse md:flex-row items-center justify-between gap-1 py-8 md:py-16", data: { pagination: "" } do
+      content_tag :div, class: "flex flex-col-reverse md:flex-row items-center justify-between gap-1 py-8 md:py-16 md:flex-wrap", data: { pagination: "" } do
         template = ""
         template += render(partial: "decidim/shared/results_per_page", locals: { per_page: }, formats: [:html]) if collection.total_pages.positive?
         template += paginate collection, window: 2, outer_window: 1, theme: "decidim", params: paginate_params

data/app/helpers/decidim/tooltip_helper.rb

@@ -5,7 +5,10 @@ module Decidim
   # on the layout.
   module TooltipHelper
     def with_tooltip(title, opts = {}, &)
-      content_tag(:span, title:, data: { tooltip: content_tag(:div, title, id: opts[:id], class: opts[:class] || "bottom", role: "tooltip", "aria-hidden": "true") }) do
+      content_tag(:p,
+                  title:,
+                  class: "inline-block",
+                  data: { tooltip: content_tag(:p, title, id: opts[:id], class: opts[:class] || "bottom", role: "tooltip", "aria-hidden": "true") }) do
         capture(&).html_safe
       end
     end

data/app/mailers/decidim/notifications_digest_mailer.rb

@@ -14,7 +14,13 @@ module Decidim
         @organization = user.organization
         @notifications_digest = Decidim::NotificationsDigestPresenter.new(user)
         @display_see_more_message = notifications.size > SIZE_LIMIT
-        @notifications = notifications[0...SIZE_LIMIT].map { |notification| Decidim::NotificationToMailerPresenter.new(notification) }
+        # Note that this could be improved by adding a "type" column to the notifications table
+        # This fix can generate lists of notifications that are below the SIZE_LIMIT
+        @notifications = notifications[0...SIZE_LIMIT].filter_map do |notification|
+          next unless notification.event_class_instance.respond_to?(:email_intro)
+
+          Decidim::NotificationToMailerPresenter.new(notification)
+        end
 
         mail(to: user.email, subject: @notifications_digest.subject)
       end

data/app/mailers/decidim/reported_mailer.rb

@@ -21,13 +21,29 @@ module Decidim
       end
     end
 
-    def hide(user, report)
+    # This is used when a user with special rights (like an administrator, a space administrator or a moderator) hides a resource
+    def hidden_manually(user, report, current_user)
       with_user(user) do
         @report = report
         @participatory_space = @report.moderation.participatory_space
+        @reportable = @report.moderation.reportable
+        @organization = user.organization
+        @user = user
+        @moderator = current_user
+        subject = I18n.t("hidden_manually.subject", scope: "decidim.reported_mailer", moderator: @moderator.name)
+        mail(to: user.email, subject:)
+      end
+    end
+
+    # This is meant to be used when a resource is hidden by an algorithm, such as the `decidim-ai` module, or the `Decidim.max_reports_before_hiding` feature.
+    def hidden_automatically(user, report)
+      with_user(user) do
+        @report = report
+        @participatory_space = @report.moderation.participatory_space
+        @reportable = @report.moderation.reportable
         @organization = user.organization
         @user = user
-        subject = I18n.t("hide.subject", scope: "decidim.reported_mailer")
+        subject = I18n.t("hidden_automatically.subject", scope: "decidim.reported_mailer")
         mail(to: user.email, subject:)
       end
     end

data/app/models/decidim/action_log.rb

@@ -157,15 +157,7 @@ module Decidim
 
     def self.publicable_public_resource_types
       @publicable_public_resource_types ||= public_resource_types
-                                            .select { |klass| klass.constantize.column_names.include?("published_at") } - publicable_exceptions
-    end
-
-    def self.publicable_exceptions
-      @publicable_exceptions = %w(
-        Decidim::Blogs::Post
-      ).select do |klass|
-        klass.safe_constantize.present?
-      end
+                                            .select { |klass| klass.constantize.column_names.include?("published_at") }
     end
 
     def self.ransackable_scopes(auth_object = nil)

data/app/packs/src/decidim/datepicker/datepicker_functions.js

@@ -29,12 +29,12 @@ export const formatInputDate = (date, formats) => {
   const month = dateList[1];
   const day = dateList[2];
 
-  if (formats.order === "d-m-y") {
-    return `${day}${formats.separator}${month}${formats.separator}${year}`;
+  if (formats.order === "m-d-y") {
+    return `${month}${formats.separator}${day}${formats.separator}${year}`;
   } else if (formats.order === "y-m-d") {
     return `${year}${formats.separator}${month}${formats.separator}${day}`;
   };
-  return `${month}${formats.separator}${day}${formats.separator}${year}`;
+  return `${day}${formats.separator}${month}${formats.separator}${year}`;
 };
 
 export const formatInputTime = (time, format, input) => {

data/app/packs/src/decidim/index.js

@@ -71,7 +71,8 @@ import handleNotificationActions from "src/decidim/notifications_actions"
 import RemoteModal from "src/decidim/remote_modal"
 import selectActiveIdentity from "src/decidim/identity_selector_dialog"
 import createTooltip from "src/decidim/tooltips"
-import fetchRemoteTooltip from "src/decidim/remote_tooltips"
+// Temporary disabling this feature because we have a poor performance. See https://github.com/decidim/decidim/issues/14431
+// import fetchRemoteTooltip from "src/decidim/remote_tooltips"
 import createToggle from "src/decidim/toggle"
 import {
   createAccordion,
@@ -202,7 +203,8 @@ const initializer = (element = document) => {
   // Initialize data-toggles
   element.querySelectorAll("[data-toggle]").forEach((elem) => createToggle(elem))
 
-  element.querySelectorAll("[data-remote-tooltip]").forEach((elem) => fetchRemoteTooltip(elem))
+  // Temporary disabling this feature because we have a poor performance. See https://github.com/decidim/decidim/issues/14431
+  // element.querySelectorAll("[data-remote-tooltip]").forEach((elem) => fetchRemoteTooltip(elem))
 
   element.querySelectorAll(".new_report").forEach((elem) => changeReportFormBehavior(elem))
 

data/app/packs/src/decidim/input_character_counter.js

@@ -93,7 +93,7 @@ export default class InputCharacterCounter {
       this.$srTarget = $(`#${screenReaderId}`);
       if (!this.$srTarget.length) {
         this.$srTarget = $(
-          `<span role="status" id="${screenReaderId}" class="sr-only remaining-character-count-sr" />`
+          `<span role="status" id="${screenReaderId}" class="sr-only remaining-character-count-sr" aria-hidden="true"/>`
         );
         this.$target.before(this.$srTarget);
       }

data/app/packs/stylesheets/decidim/_cards.scss

@@ -163,7 +163,7 @@
   /* shared styles */
   &__highlight-metadata,
   &__grid-metadata {
-    @apply mt-auto flex items-center justify-between flex-wrap text-sm text-gray-2 [&>*]:flex [&>*]:items-center [&>*]:gap-1 first:[&>*]:flex-none;
+    @apply mt-auto flex items-center justify-between flex-wrap w-full text-sm text-gray-2 [&>*]:flex [&>*]:items-center [&>*]:gap-1 first:[&>*]:w-4/5;
 
     svg {
       @apply flex-none text-gray fill-current;

data/app/packs/stylesheets/decidim/_content_blocks.scss

@@ -27,6 +27,10 @@
         @apply block;
       }
     }
+
+    > h3:not([class~="not-prose"]) {
+      @apply mb-[-0.4rem] pt-4 pb-2;
+    }
   }
 
   &__span {

data/app/packs/stylesheets/decidim/_header.scss

@@ -167,7 +167,7 @@ header {
       }
 
       &__item {
-        @apply relative;
+        @apply flex relative;
       }
 
       &__search {
@@ -334,10 +334,6 @@ header {
       &__dropdown-trigger {
         @apply flex items-center justify-between text-white;
 
-        span {
-          @apply flex flex-wrap md:flex-nowrap gap-x-2.5 overflow-hidden text-white;
-        }
-
         svg {
           @apply w-6 h-6 fill-current;
         }
@@ -373,54 +369,77 @@ header {
       @apply absolute top-full left-0 bg-white rounded w-full bg-gray-5;
     }
 
-    &__main-dropdown {
-      @apply bg-white divide-y divide-gray-3 rounded-b shadow-lg text-black w-full lg:w-[1280px] h-screen md:h-auto;
+    &__dropdown-menu {
+      @apply w-full md:w-1/4 bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
 
-      &__bottom,
-      &__top {
-        @apply flex flex-col md:flex-row justify-between p-4 md:p-8 gap-x-8;
+      > * {
+        @apply py-3 md:py-3.5;
+      }
 
-        &-right {
-          @apply hidden md:block md:w-1/2;
+      a {
+        @apply flex items-center justify-start gap-1 font-semibold text-lg text-white;
+
+        span {
+          @apply min-w-0 truncate;
         }
-      }
 
-      &__bottom {
-        @apply hidden md:flex;
+        svg {
+          @apply flex-none fill-current;
+        }
       }
+    }
 
-      &__title {
-        @apply hidden h4 md:flex md:h3;
-      }
+    &__main-dropdown {
+      @apply bg-white flex flex-row rounded-b shadow-lg text-black w-full lg:w-[1280px] h-screen md:h-auto;
 
-      &__subtitle {
-        @apply hidden text-md md:flex md:text-lg text-gray-2 mt-5;
+      &__left {
+        @apply flex flex-col justify-between p-4 md:p-8 space-y-5 hidden md:block md:w-3/4;
+
+        &-top {
+          @apply border-b-4 border-gray-3 pb-3;
+        }
       }
 
-      &__menu {
-        @apply w-full md:w-1/2 mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
+      &__top {
+        @apply w-full px-4;
 
-        > * {
-          @apply py-3 md:py-3.5 border-b last:border-0 border-gray-3;
+        &-menu {
+          @apply w-full md:w-1/2 mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
+
+          > * {
+            @apply py-3 md:py-3.5 border-b last:border-0 border-gray-3;
 
-          /* since the grid has 2 columns, remove the border for these last 2 columns */
-          &:nth-last-child(-n + 2) {
-            @apply md:border-0;
+            /* since the grid has 2 columns, remove the border for these last 2 columns */
+            &:nth-last-child(-n + 2) {
+              @apply md:border-0;
+            }
           }
-        }
 
-        a {
-          @apply flex items-center justify-start gap-1 font-semibold text-lg text-secondary;
+          a {
+            @apply flex items-center justify-start gap-1 font-semibold text-lg text-secondary;
 
-          span {
-            @apply min-w-0 truncate;
-          }
+            span {
+              @apply min-w-0 truncate;
+            }
 
-          svg {
-            @apply flex-none fill-current;
+            svg {
+              @apply flex-none fill-current;
+            }
           }
         }
       }
+
+      &__bottom {
+        @apply hidden md:flex;
+      }
+
+      &__title {
+        @apply hidden h4 md:flex md:h3;
+      }
+
+      &__subtitle {
+        @apply hidden text-md md:flex md:text-lg text-gray-2 mt-5;
+      }
     }
 
     &__secondary-dropdown {
@@ -434,8 +453,12 @@ header {
         @apply h4 md:h3;
       }
 
+      nav {
+        @apply w-full md:w-1/4;
+      }
+
       &__menu {
-        @apply w-full md:w-1/4 bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
+        @apply w-full bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
 
         > * {
           @apply py-3 md:py-3.5;
@@ -455,7 +478,7 @@ header {
       }
 
       &__metadata {
-        @apply flex items-center text-sm space-x-6 py-8;
+        @apply flex items-center text-sm space-x-6 pb-6;
 
         > span {
           @apply flex items-center space-x-2;

data/app/packs/stylesheets/decidim/resource_history.scss

@@ -13,19 +13,29 @@
     }
 
     &_content {
-      @apply flex flex-col lg:items-center lg:flex-row lg:gap-1;
+      @apply flex flex-col lg:items-start lg:flex-row lg:gap-2 lg:pt-[6px];
     }
 
     &_date {
-      @apply text-sm text-gray-2;
+      @apply text-sm text-gray-2 lg:pt-px;
     }
   }
 
   &_text {
-    @apply flex flex-col lg:flex-none lg:block relative;
+    @apply flex flex-col relative max-w-[250px] md:max-w-[600px] lg:max-w-[400px];
+  }
+
+  &_text:has(.resource-link) {
+    .resource-link {
+      @apply md:ml-[-1px] lg:ml-[-106px];
+    }
+  }
+
+  &_text:not(:has(.resource-link)) a {
+    @apply md:ml-[-1px] lg:ml-[-106px];
   }
 
   &__line {
-    @apply absolute -left-[26px] lg:-left-[130px] top-3.5 lg:top-[26px] w-px h-full bg-secondary;
+    @apply absolute -left-[26px] lg:-left-[134px] top-3.5 lg:top-[26px] w-px h-full lg:h-[90%] bg-secondary;
   }
 }

data/app/permissions/decidim/default_permissions.rb

@@ -5,6 +5,8 @@ module Decidim
   # actions by any kind of user. Also works as a default implementation so other
   # components can inherit from it and get some convenience methods.
   class DefaultPermissions
+    include Decidim::UserRoleChecker
+
     def initialize(user, permission_action, context = {})
       @user = user
       @permission_action = permission_action

data/app/presenters/decidim/log/user_presenter.rb

@@ -46,6 +46,7 @@ module Decidim
       # Returns an HTML-safe String.
       def present_user
         return h.content_tag(:span, present_user_name, class: "logs__log__author") if user.blank?
+        return I18n.t("decidim.profile.deleted") if user.respond_to?(:deleted?) && user.deleted?
 
         h.link_to(
           present_user_name,

data/app/presenters/decidim/notification_to_mailer_presenter.rb

@@ -14,15 +14,19 @@ module Decidim
     delegate :url_helpers, to: "Decidim::Core::Engine.routes"
     delegate :resource_title, to: :event
     delegate :resource_url, to: :event
-    delegate :email_intro, to: :event
     delegate :resource_path, to: :event
     delegate :safe_resource_text, to: :event
 
+    def email_intro
+      event.email_intro if event.respond_to?(:email_intro)
+    end
+
     def date_time
+      created_at_in_time_zone = created_at.in_time_zone(resource.organization.time_zone)
       if frequency == :daily
-        created_at.strftime("%H:%M")
+        I18n.l(created_at_in_time_zone, format: :time_of_day)
       else
-        I18n.l(created_at, format: :decidim_short)
+        I18n.l(created_at_in_time_zone, format: :decidim_short)
       end
     end