decidim-core 0.25.2 → 0.26.0.rc1

data/app/views/decidim/messaging/conversations/show.html.erb

@@ -5,9 +5,11 @@
     <% end %>
   </div>
 
-  <% if conversation.accept_user?(current_user) %>
+  <% if conversation.with_deleted_users?(current_user) %>
+    <div class="callout warning margin-top-2"><%= t ".deleted_accounts" %></div>
+  <% elsif conversation.accept_user?(current_user) %>
     <%= render "reply", form: @form, conversation: conversation %>
   <% else %>
-    <em><%= t ".not_allowed" %></em>
+    <div class="callout warning margin-top-2"><%= t ".not_allowed" %></div>
   <% end %>
 <% end %>

data/app/views/decidim/newsletters/show.html.erb

@@ -5,7 +5,7 @@
   newsletter: newsletter,
   recipient_user: @user
 ) %>
-<%= decidim_sanitize @cell.to_s %>
+<%= decidim_sanitize_editor @cell.to_s %>
 
 <% content_for :note do %>
   <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>

data/app/views/decidim/notification_mailer/event_received.html.erb

@@ -9,6 +9,10 @@
 <% end %>
 
 <% if @event_instance.try(:safe_resource_text).present? %>
+  <% if @event_instance.perform_translation? %>
+    <p style="font-weight: bold"><%= t(".original_text") %></p>
+  <% end %>
+
   <blockquote>
     <p>
       <%= @event_instance.safe_resource_text %>
@@ -16,6 +20,19 @@
   </blockquote>
 <% end %>
 
+<% if @event_instance.content_in_same_language? %>
+  <p><%= t(".same_language", language: I18n.locale.to_s ) %></p>
+<% elsif @event_instance.translation_missing? %>
+  <p><%= t(".no_translation_available", link: @event_instance.resource_url ) %></p>
+<% elsif @event_instance.perform_translation? %>
+  <p style="font-weight: bold"><%= t(".translated_text") %></p>
+  <blockquote>
+    <p>
+      <%= @event_instance.safe_resource_translated_text %>
+    </p>
+  </blockquote>
+<% end %>
+
 <% if @event_instance.has_button? %>
   <table class="button expanded radius">
     <tr>

data/app/views/decidim/pages/_tabbed.html.erb

@@ -32,7 +32,7 @@
                 <h2>
                   <%= translated_attribute page.title %>
                 </h2>
-                <%= decidim_sanitize translated_attribute page.content %>
+                <%= decidim_sanitize_editor translated_attribute page.content %>
               </div>
             </div>
           </div>

data/app/views/decidim/searches/_filters_small_view.html.erb

@@ -1,13 +1,13 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t ".filter" %>
     <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <h3 id="filter-box-label" class="reveal__title"><%= t ".filter_by" %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

data/app/views/decidim/shared/_login_modal.html.erb

@@ -1,12 +1,15 @@
-<div class="reveal" id="loginModal" data-reveal>
+<div class="reveal" id="loginModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="loginModal-label">
   <div class="reveal__header">
-    <h2 class="reveal__title"><%= t(".please_sign_in") %></h2>
+    <h2 id="loginModal-label" class="reveal__title"><%= t(".please_sign_in") %></h2>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
   <% if current_organization.sign_in_enabled? %>
+    <% cache current_organization do %>
+      <%= render "decidim/devise/shared/omniauth_buttons_mini" %>
+    <% end %>
     <div class="row">
       <div class="columns medium-8 medium-centered">
           <%
@@ -39,9 +42,6 @@
           </p>
       </div>
     </div>
-    <% cache current_organization do %>
-      <%= render "decidim/devise/shared/omniauth_buttons_mini" %>
-    <% end %>
   <% else %>
     <div class="row">
       <div class="columns medium-8 medium-centered">

data/app/views/decidim/shared/_orders.html.erb

@@ -9,7 +9,7 @@
       data-close-on-click="true"
       role="menubar">
       <li class="is-dropdown-submenu-parent" role="presentation">
-        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="true" title="<%= t("#{i18n_scope}.label") %>" role="menuitem"><%= t("#{i18n_scope}.#{order}") %></a>
+        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="menu" title="<%= t("#{i18n_scope}.label") %>" role="menuitem"><%= t("#{i18n_scope}.#{order}") %></a>
 
         <ul id="<%= menu_id %>" class="menu" role="menu" aria-labelledby="<%= menu_id %>-control">
           <% orders.each do |order_name| %>

data/app/views/decidim/shared/_results_per_page.html.erb

@@ -9,7 +9,7 @@
       data-close-on-click="true"
       role="menubar">
       <li class="is-dropdown-submenu-parent" role="presentation">
-        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="true" title="<%= t("decidim.shared.results_per_page.title") %>" role="menuitem"><%= per_page %></a>
+        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="menu" title="<%= t("decidim.shared.results_per_page.title") %>" role="menuitem"><%= per_page %></a>
         <ul id="<%= menu_id %>" class="menu" role="menu" aria-labelledby="<%= menu_id %>-control">
           <% Decidim::Paginable::OPTIONS.each do |per_page_option| %>
             <li role="presentation">

data/app/views/decidim/shared/participatory_space_filters/_filters_small_view.html.erb

@@ -1,13 +1,13 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t("filter", scope: "decidim.searches.filters_small_view") %>
     <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t("unfold", scope: "decidim.searches.filters_small_view"), role: "img" %>
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t("filter_by", scope: "decidim.searches.filters_small_view") %>:</h3>
+    <h3 id="filter-box-label" class="reveal__title"><%= t("filter_by", scope: "decidim.searches.filters_small_view") %>:</h3>
     <button class="close-button" data-close aria-label="<%= 't("close_modal", scope: "decidim.searches.filters_small_view")' %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

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

@@ -1,15 +1,4 @@
-<% add_decidim_meta_tags({
-  description: strip_tags(translated_attribute(current_organization.description)),
-  title: current_organization.name,
-  url: request.original_url,
-  twitter_handler: current_organization.twitter_handler,
-  image_url: Decidim::ContentBlock.published.find_by(
-    organization: current_organization,
-    scope_name: :homepage,
-    manifest_name: :hero
-  ).try(:images_container).try(:attached_uploader, :background_image).try(:path)
-}) %>
-
+<%= render partial: "layouts/decidim/meta_tags_config" %>
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>" class="no-js">
   <head>

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

@@ -17,6 +17,10 @@
 <meta property="og:description" content="<%= decidim_meta_description %>">
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
+<% if current_organization.colors["theme"] %>
+  <meta name="theme-color" content="<%= current_organization.colors["theme"] %>">
+<% end %>
+
 <%= favicon %>
 <%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>

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

@@ -7,7 +7,7 @@
       data-close-on-click="true"
       role="menubar">
       <li class="is-dropdown-submenu-parent" role="presentation">
-        <%= link_to t("name", scope: "locale"), "#language-chooser-menu", id: "language-chooser-control", "aria-label": t("layouts.decidim.language_chooser.choose_language"), "aria-controls": "language-chooser-menu", "aria-haspopup": "true", role: "menuitem" %>
+        <%= link_to t("name", scope: "locale"), "#language-chooser-menu", id: "language-chooser-control", "aria-label": t("layouts.decidim.language_chooser.choose_language"), "aria-controls": "language-chooser-menu", "aria-haspopup": "menu", role: "menuitem" %>
         <ul class="menu is-dropdown-submenu" id="language-chooser-menu" role="menu" aria-labelledby="language-chooser-control">
           <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
             <li lang="<%= locale %>" role="presentation"><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post, role: "menuitem" %></li>

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

@@ -0,0 +1,11 @@
+<% add_decidim_meta_tags({
+  description: strip_tags(translated_attribute(current_organization.description)),
+  title: current_organization.name,
+  url: request.original_url,
+  twitter_handler: current_organization.twitter_handler,
+  image_url: Decidim::ContentBlock.published.find_by(
+    organization: current_organization,
+    scope_name: :homepage,
+    manifest_name: :hero
+  ).try(:images_container).try(:attached_uploader, :background_image).try(:path)
+}) %>

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

@@ -66,7 +66,7 @@ end
                     data-close-on-click="true"
                     role="menubar">
                     <li class="is-dropdown-submenu-parent show-for-medium" role="presentation">
-                      <%= link_to current_user.name, decidim.account_path, id: "user-menu-control", "aria-controls": "user-menu", "aria-haspopup": "true", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name), "role": "menuitem" %>
+                      <%= link_to current_user.name, decidim.account_path, id: "user-menu-control", "aria-controls": "user-menu", "aria-haspopup": "menu", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name), "role": "menuitem" %>
                       <ul class="menu is-dropdown-submenu" id="user-menu" role="menu" aria-labelledby="user-menu-control">
                         <%= render partial: "layouts/decidim/user_menu" %>
                       </ul>

data/config/brakeman.ignore

@@ -0,0 +1,149 @@
+{
+  "ignored_warnings": [
+    {
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 2,
+      "fingerprint": "211ff4b5e0d738e40e3c7f6d27b6905f23b1ed4e20347c179af3df40f6e5694d",
+      "check_name": "CrossSiteScripting",
+      "message": "Unescaped model attribute",
+      "file": "app/views/decidim/messaging/conversations/_conversation.html.erb",
+      "line": 20,
+      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
+      "code": "username_list((Unresolved Model).new.interlocutors(current_user), :shorten => true)",
+      "render_path": [
+        {
+          "type": "template",
+          "name": "decidim/messaging/conversations/index",
+          "line": 25,
+          "file": "app/views/decidim/messaging/conversations/index.html.erb",
+          "rendered": {
+            "name": "decidim/messaging/conversations/_conversation",
+            "file": "app/views/decidim/messaging/conversations/_conversation.html.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "decidim/messaging/conversations/_conversation"
+      },
+      "user_input": "(Unresolved Model).new.interlocutors(current_user)",
+      "confidence": "Weak",
+      "note": ""
+    },
+    {
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 4,
+      "fingerprint": "2c7f1da812b5d4b350d2260b604e9061ef082ecae90073ae09fe2eb46c1b9a08",
+      "check_name": "LinkToHref",
+      "message": "Unsafe parameter value in `link_to` href",
+      "file": "app/views/decidim/links/_modal.html.erb",
+      "line": 16,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
+      "code": "link_to(t(\"decidim.links.warning.proceed\"), params[:external_url], :target => \"_blank\", :data => ({ :close => \"\" }), :class => \"button primary button--nomargin\")",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "Decidim::LinksController",
+          "method": "new",
+          "line": 16,
+          "file": "app/controllers/decidim/links_controller.rb",
+          "rendered": {
+            "name": "decidim/links/new",
+            "file": "app/views/decidim/links/new.js.erb"
+          }
+        },
+        {
+          "type": "template",
+          "name": "decidim/links/new",
+          "line": 3,
+          "file": "app/views/decidim/links/new.js.erb",
+          "rendered": {
+            "name": "decidim/links/_modal",
+            "file": "app/views/decidim/links/_modal.html.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "decidim/links/_modal"
+      },
+      "user_input": "params[:external_url]",
+      "confidence": "High",
+      "note": ""
+    },
+    {
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 2,
+      "fingerprint": "2d9910c9250df37f9cf9ddd225d4541ab9c411c61e74562b9a4b7b188e44cc47",
+      "check_name": "CrossSiteScripting",
+      "message": "Unescaped parameter value",
+      "file": "app/views/decidim/searches/index.js.erb",
+      "line": 5,
+      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
+      "code": "j(cell(\"decidim/search_results\", @sections, :params => (params)).show).strip",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "Decidim::SearchesController",
+          "method": "index",
+          "line": 15,
+          "file": "app/controllers/decidim/searches_controller.rb",
+          "rendered": {
+            "name": "decidim/searches/index",
+            "file": "app/views/decidim/searches/index.js.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "decidim/searches/index"
+      },
+      "user_input": "params",
+      "confidence": "Weak",
+      "note": ""
+    },
+    {
+      "warning_type": "Cross-Site Scripting",
+      "warning_code": 2,
+      "fingerprint": "b46eb40178db883a8a9065d3affe7fb7868369084048fd88321f887d8618eea5",
+      "check_name": "CrossSiteScripting",
+      "message": "Unescaped parameter value",
+      "file": "app/views/decidim/messaging/conversations/_show.html.erb",
+      "line": 29,
+      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
+      "code": "t(\".title\", :usernames => username_list(form(ConversationForm).from_params(params, :sender => current_user).recipient.to_a))",
+      "render_path": [
+        {
+          "type": "controller",
+          "class": "Decidim::Messaging::ConversationsController",
+          "method": "new",
+          "line": 35,
+          "file": "app/controllers/decidim/messaging/conversations_controller.rb",
+          "rendered": {
+            "name": "decidim/messaging/conversations/new",
+            "file": "app/views/decidim/messaging/conversations/new.html.erb"
+          }
+        },
+        {
+          "type": "template",
+          "name": "decidim/messaging/conversations/new",
+          "line": 1,
+          "file": "app/views/decidim/messaging/conversations/new.html.erb",
+          "rendered": {
+            "name": "decidim/messaging/conversations/_show",
+            "file": "app/views/decidim/messaging/conversations/_show.html.erb"
+          }
+        }
+      ],
+      "location": {
+        "type": "template",
+        "template": "decidim/messaging/conversations/_show"
+      },
+      "user_input": "params",
+      "confidence": "Weak",
+      "note": ""
+    }
+  ],
+  "updated": "2021-12-22 09:55:40 +0000",
+  "brakeman_version": "5.1.2"
+}

data/config/initializers/devise.rb

@@ -88,7 +88,7 @@ Devise.setup do |config|
   # It will change confirmation, password recovery and other workflows
   # to behave the same regardless if the e-mail provided was right or wrong.
   # Does not affect registerable.
-  # config.paranoid = true
+  config.paranoid = true
 
   # By default Devise will store the user in session. You can skip storage for
   # particular strategies by setting this option.

data/config/initializers/rack_attack.rb

@@ -7,31 +7,33 @@ if Rails.env.production? || Rails.env.test?
     config.middleware.use Rack::Attack
   end
 
-  Rack::Attack.blocklist("block all access to system") do |request|
-    # Requests are blocked if the return value is truthy
-    if request.path.start_with?("/system")
-      Decidim.system_accesslist_ips.any? && Decidim.system_accesslist_ips.map { |ip_address| IPAddr.new(ip_address).include?(IPAddr.new(request.ip)) }.any?
+  ActiveSupport::Reloader.to_prepare do
+    Rack::Attack.blocklist("block all access to system") do |request|
+      # Requests are blocked if the return value is truthy
+      if request.path.start_with?("/system")
+        Decidim.system_accesslist_ips.any? && Decidim.system_accesslist_ips.map { |ip_address| IPAddr.new(ip_address).include?(IPAddr.new(request.ip)) }.any?
+      end
     end
-  end
 
-  unless Rails.env.test?
-    Rack::Attack.throttle(
-      "requests by ip",
-      limit: Decidim.throttling_max_requests,
-      period: Decidim.throttling_period,
-      &:ip
-    )
+    unless Rails.env.test?
+      Rack::Attack.throttle(
+        "requests by ip",
+        limit: Decidim.throttling_max_requests,
+        period: Decidim.throttling_period,
+        &:ip
+      )
 
-    # Throttle login attempts for a given email parameter to 6 reqs/minute
-    # Return the email as a discriminator on POST /users/sign_in requests
-    Rack::Attack.throttle("limit logins per email", limit: 5, period: 60.seconds) do |request|
-      request.params["user"]["email"] if request.path == "/users/sign_in" && request.post?
-    end
+      # Throttle login attempts for a given email parameter to 6 reqs/minute
+      # Return the email as a discriminator on POST /users/sign_in requests
+      Rack::Attack.throttle("limit logins per email", limit: 5, period: 60.seconds) do |request|
+        request.params["user"]["email"] if request.path == "/users/sign_in" && request.post?
+      end
 
-    # Throttle login attempts for a given email parameter to 6 reqs/minute
-    # Return the email as a discriminator on POST /users/sign_in requests
-    Rack::Attack.throttle("limit password recovery attempts per email", limit: 5, period: 60.seconds) do |request|
-      request.params["user"]["email"] if request.path == "/users/password" && request.post?
+      # Throttle login attempts for a given email parameter to 6 reqs/minute
+      # Return the email as a discriminator on POST /users/sign_in requests
+      Rack::Attack.throttle("limit password recovery attempts per email", limit: 5, period: 60.seconds) do |request|
+        request.params["user"]["email"] if request.path == "/users/password" && request.post?
+      end
     end
   end
 end

data/config/locales/ca.yml

@@ -967,6 +967,7 @@ ca:
         show:
           back: Tornar a totes les converses
           chat_with: Conversa amb
+          deleted_accounts: No podeu tenir una conversa amb un compte d'usuari eliminat.
           not_allowed: Aquesta participant no accepta missatges directes.
           title: Conversa amb %{usernames}
         start:
@@ -1331,6 +1332,7 @@ ca:
         title_reply: Respondre
       show:
         back: Mostra totes les converses
+        deleted_accounts: No podeu tenir una conversa amb un compte d'usuari eliminat.
         not_allowed: Aquesta participant no accepta missatges directes.
         title: Conversa amb %{usernames}
       update:

data/config/locales/cs.yml

@@ -84,6 +84,49 @@ cs:
       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: asi 1 hodina
+        few: asi %{count} hodiny
+        many: asi %{count} hodin
+        other: asi %{count} hodin
+      about_x_months:
+        one: asi 1 měsíc
+        few: asi %{count} měsíce
+        many: asi %{count} měsíců
+        other: asi %{count} měsíců
+      half_a_minute: půl minuty
+      less_than_x_minutes:
+        one: méně než minutu.
+        few: méně než %{count} minuty.
+        many: méně než %{count} minut.
+        other: méně než %{count} minut.
+      less_than_x_seconds:
+        one: právě teď
+        few: méně než %{count} vteřiny.
+        many: méně než %{count} vteřin.
+        other: méně než %{count} vteřin.
+      x_days:
+        one: před 1 dnem
+        few: "před %{count} dny"
+        many: "před %{count} ti dny"
+        other: "před %{count} ti dny"
+      x_hours:
+        one: před 1 hodinou
+        few: "před %{count} hodinami"
+        many: "před %{count} hodinami"
+        other: "před %{count} hodinami"
+      x_minutes:
+        one: před 1 minutou
+        few: "před %{count} minutami"
+        many: "před %{count} minutami"
+        other: "před %{count} minutami"
+      x_seconds:
+        one: před 1 vteřinou
+        few: "před %{count} vteřinami"
+        many: "před %{count} vteřinami"
+        other: "před %{count} vteřinami"
   decidim:
     accessibility:
       external_link: Externí odkaz
@@ -527,6 +570,11 @@ cs:
           this_application_will_not_be_able_to: 'Tato aplikace nebude moci:'
           update_profile: Aktualizujte svůj profil
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> chce používat váš účet"
+    editor_images:
+      create:
+        error: Chyba při nahrávání obrázku
+        success: Obrázek byl úspěšně nahrán
+      drag_and_drop_help: Přidejte obrázky přetažením nebo vložením.
     endorsable:
       endorsements: Schválení
       endorsements_count: Počet schvalování
@@ -992,6 +1040,7 @@ cs:
         show:
           back: Zpět ke všem konverzacím
           chat_with: Konverzace s
+          deleted_accounts: Nemůžete mít konverzaci s odstraněnými účty.
           not_allowed: Tento uživatel nepřijímá přímé zprávy.
           title: Konverzace s číslem %{usernames}
         start:
@@ -1059,6 +1108,12 @@ cs:
         greetings: Zdravím,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Ahoj,
         subject: Chcete nadále dostávat příslušné informace o %{organization_name}?
+    notification_mailer:
+      event_received:
+        no_translation_available: Omlouváme se, po odeslání e-mailu nelze získat automatický překlad. Překlad původního textu můžete zkontrolovat na následujícím odkazu %{link}.
+        original_text: 'Původní text:'
+        same_language: Obsah byl zveřejněn ve vašem preferovaném jazyce (%{language}), proto se v tomto e-mailu nezobrazuje automatický překlad.
+        translated_text: 'Automaticky přeložený text:'
     notifications:
       no_notifications: Zatím žádné oznámení.
     notifications_settings:
@@ -1358,6 +1413,7 @@ cs:
         title_reply: Odpovědět
       show:
         back: Zobrazit všechny konverzace
+        deleted_accounts: Nemůžete mít konverzaci s odstraněnými účty.
         not_allowed: Tento uživatel již nepřijímá žádné přímé zprávy.
         title: Konverzace s %{usernames}
       update:
@@ -1661,10 +1717,12 @@ cs:
     name: Čeština
     name_with_error: Čeština
   password_validator:
+    blacklisted: je na černé listině
     domain_included_in_password: je příliš podobné tomuto názvu domény
     email_included_in_password: je příliš podobný e-mailu
     fallback: není platný
     name_included_in_password: je příliš podobné vašemu jménu
+    nickname_included_in_password: je příliš podobné vaší přezdívce
     not_enough_unique_characters: nemá dostatek jedinečných znaků
     password_not_allowed: není povoleno
     password_too_common: je příliš běžné
@@ -1699,6 +1757,8 @@ cs:
       day_of_week: "%a"
       day_of_week_long: "%a %e"
       day_of_year: "%d.%m.%y"
+      ddmm: "%d.%m"
+      ddmmyyyy: "%d.%m.%Y"
       decidim_day_of_year: "%d %B %Y"
       decidim_short: "%d/%m/%Y %H:%M"
       default: "%a, %d %b %Y %H:%M:%S %z"