decidim-admin 0.28.2 → 0.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ccdc4a2f091d223bff9fa56f75347e91c6d8752bfba25eaf0a758191d705c0
-  data.tar.gz: f451da89da78adc0809dd9fee4af0f87761870f5cbb8eee8cc9c20868dc9b023
+  metadata.gz: e2df15806d18b7a9463fba1af0a915d7eb271b42171c44b8ca6ba2d4b0314d7c
+  data.tar.gz: 542095a6b09cc350520f884ec35316b19e59cfb2ec8dd23474f0929020155c78
 SHA512:
-  metadata.gz: 11998db7b9f88af5bef0396a5adb179a9495a8acb21e80b55f9a2e3257557356a5c414039016cf826e06a16e1e6fb5adcbe4e36830000beff84ee9c1abd41852
-  data.tar.gz: 5fbf7d4e81e2fd1a366310eb5dbfd1d6aad2473d3d54af70ef1e6a095739468c8c0cf6e17df1208d6829af345fe52b4aa713d5abb7443f8da15fb63ae44ba929
+  metadata.gz: 853c6bc0e5b9ea946576f04a4fda4c00d3dbade41e6c7f1b95aae97a65cacee29de9df3196dd6570fba5453c6ee99f76fe7b66b3376907adb57813e08b6363f3
+  data.tar.gz: b5fa7e8a4122cae417e557638ef8526ef9f9213241ec5d321ffdee25cc768eeb459e2dcc12d5c2c9098fa3576c3e16a237e04988d6479492dc9a56353c44f15a

data/README.md

@@ -42,19 +42,6 @@ There are some pages that exist by default and cannot be deleted since there
 are links to them inside the Decidim framework, see `Decidim::StaticPage` for
 the default list.
 
-### Pager Configuration
-
-The number of results shown per page and per page range can be configured in the app `decidim.rb` initializer as follows:
-
-```ruby
-Decidim::Admin.configure do |config|
-  config.per_page_range = [15, 50, 100]
-end
-```
-
-* `Decidim::Admin.per_page_range.first` sets the `default_per_page` value for `Decidim::Admin` (in Kaminari)
-* `Decidim::Admin.per_page_range.last` sets the `max_per_page`  value for `Decidim::Admin` (in Kaminari)
-
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).

data/app/commands/decidim/admin/create_participatory_space_private_user.rb

@@ -62,7 +62,7 @@ module Decidim
         return @existing_user if defined?(@existing_user)
 
         @existing_user = User.find_by(
-          email: form.email,
+          email: form.email.downcase,
           organization: private_user_to.organization
         )
 

data/app/commands/decidim/admin/destroy_component.rb

@@ -44,6 +44,7 @@ module Decidim
       end
 
       def run_before_hooks
+        Decidim::Reminder.where(component: @component).destroy_all
         @component.manifest.run_hooks(:before_destroy, @component)
       end
 

data/app/controllers/concerns/decidim/admin/filterable.rb

@@ -9,7 +9,7 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        include Decidim::Admin::Paginable
+        include Decidim::Paginable
         include Decidim::TranslatableAttributes
 
         helper Decidim::Admin::FilterableHelper

data/app/controllers/concerns/decidim/admin/verification_conflicts/filterable.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module VerificationConflicts
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def search_field_predicate
+            :current_user_name_or_current_user_nickname_or_current_user_email_cont
+          end
+
+          def filters
+            []
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/application_controller.rb

@@ -17,6 +17,7 @@ module Decidim
       include Headers::ContentSecurityPolicy
       include DisableRedirectionToExternalHost
       include Decidim::Admin::Concerns::HasBreadcrumbItems
+      include ActiveStorage::SetCurrent
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
@@ -25,7 +26,6 @@ module Decidim
       helper Decidim::Admin::IconWithTooltipHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper
-      helper Decidim::Admin::Paginable::PerPageHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::ScopesHelper

data/app/controllers/decidim/admin/conflicts_controller.rb

@@ -3,18 +3,16 @@
 module Decidim
   module Admin
     class ConflictsController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::VerificationConflicts::Filterable
+
       layout "decidim/admin/users"
 
-      helper_method :context_breadcrumb_items
+      helper_method :context_breadcrumb_items, :conflicts
 
       add_breadcrumb_item_from_menu :impersonate_menu
 
       def index
         enforce_permission_to :index, :impersonatable_user
-
-        @conflicts = Decidim::Verifications::Conflict.joins(:current_user).where(
-          decidim_users: { decidim_organization_id: current_organization.id }
-        )
       end
 
       def edit
@@ -66,6 +64,16 @@ module Decidim
           url: decidim_admin.impersonatable_users_path
         }
       end
+
+      def collection
+        @collection ||= Decidim::Verifications::Conflict.joins(:current_user).where(
+          decidim_users: { decidim_organization_id: current_organization.id }
+        )
+      end
+
+      def conflicts
+        @conflicts ||= filtered_collection.order(created_at: :desc)
+      end
     end
   end
 end

data/app/helpers/decidim/admin/application_helper.rb

@@ -16,6 +16,19 @@ module Decidim
       include Decidim::Admin::ResourceScopeHelper
       include Decidim::Admin::SearchFormHelper
 
+      # Public: Overwrites the `cell` helper method to automatically set some
+      # common context.
+      #
+      # name - the name of the cell to render
+      # model - the cell model
+      # options - a Hash with options
+      #
+      # Renders the cell contents.
+      def cell(name, model, options = {}, &)
+        options = { context: { view_context: self, current_user: } }.deep_merge(options)
+        super
+      end
+
       def participatory_space_active_link?(component)
         endpoints = component.manifest.admin_engine.try(:participatory_space_endpoints)
         endpoints && is_active_link?(decidim_admin_participatory_processes.components_path(current_participatory_space), %r{/\d+/manage/(#{endpoints.join("|")})\b})

data/app/views/decidim/admin/block_user/new.html.erb

@@ -19,7 +19,7 @@
               <%= cell("decidim/announcement", t(".already_reported_html"), callout_class: "alert" ) %>
             <% end %>
 
-            <% if defined?(Decidim::Templates) %>
+            <% if Decidim.module_installed?(:templates) %>
               <%= render "decidim/templates/admin/block_user_templates/template_chooser", form: f %>
             <% end %>
 

data/app/views/decidim/admin/components/index.html.erb

@@ -14,8 +14,12 @@
         <div class="dropdown-pane" id="add-component-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
           <ul class="vertical menu add-components font-normal">
             <% @manifests.each do |manifest| %>
-              <li><%= link_to t("#{manifest.name}.name", scope: "decidim.components"), new_component_path(type: manifest.name), class: manifest.name %></li>
+             <%= link_to new_component_path(type: manifest.name), class: manifest.name do %>
+              <li>
+                <%= t("#{manifest.name}.name", scope: "decidim.components") %>
+              </li>
             <% end %>
+          <% end %>
           </ul>
         </div>
       </div>

data/app/views/decidim/admin/conflicts/index.html.erb

@@ -1,10 +1,32 @@
 <% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
-<div class="card">
-  <div class="item_show__header">
-    <h1 class="item_show__header-title">
-      <%= t("title", scope: "decidim.admin.conflicts") %>
-    </h1>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t("title", scope: "decidim.admin.conflicts") %>
+  </h1>
+</div>
+
+<div class="filters__section">
+  <div class="fcell search">
+    <%= search_form_for(query, url: url_for) do |form| %>
+      <%= applied_filters_hidden_field_tags %>
+      <div class="input-group">
+        <%= form.search_field(
+              search_field_predicate,
+              class: "input-group-field",
+              label: false,
+              placeholder: t(".text")
+            ) %>
+        <div class="input-group-button">
+          <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
+            <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
+          </button>
+        </div>
+      </div>
+    <% end %>
   </div>
+</div>
+
+<div class="card">
   <div class="table-scroll">
     <table class="table-list">
       <thead>
@@ -17,7 +39,7 @@
         </tr>
       </thead>
       <tbody>
-        <% @conflicts.each do |conflict| %>
+        <% conflicts.each do |conflict| %>
           <tr>
             <td><%= conflict.current_user.name %></td>
             <td><%= conflict.managed_user.name %></td>
@@ -30,3 +52,4 @@
     </table>
   </div>
 </div>
+<%= decidim_paginate conflicts %>

data/app/views/decidim/admin/exports/_dropdown.html.erb

@@ -10,11 +10,11 @@
   <ul class="vertical menu add-components">
     <% component.manifest.export_manifests.each do |manifest| %>
       <% manifest.formats.each do |format| %>
-        <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>">
-          <%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{component.manifest.name}.admin.exports.#{manifest.name}"), export_format: t("decidim.admin.exports.formats.#{format}")),
-                      exports_path(component, id: manifest.name, format:, resource_id:, filters:),
-                      method: :post %>
-        </li>
+        <%= link_to exports_path(component, id: manifest.name, format:, resource_id:, filters:), method: :post do %>
+          <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>">
+            <%= t("decidim.admin.exports.export_as", name: t("decidim.#{component.manifest.name}.admin.exports.#{manifest.name}"), export_format: t("decidim.admin.exports.formats.#{format}")) %>
+          </li>
+        <% end %>
       <% end %>
     <% end %>
   </ul>

data/app/views/decidim/admin/imports/_dropdown.html.erb

@@ -7,10 +7,12 @@
     <% if custom %>
       <%= yield %>
     <% else %>
-      <% component.manifest.import_manifests.each do |import_manifest| %>
-        <li class="imports--file imports--<%= import_manifest.name %>">
-          <%= link_to import_manifest.message(:label, self), admin_imports_path(component, resource_id:, name: import_manifest.name) %>
-        </li>
+     <% component.manifest.import_manifests.each do |import_manifest| %>
+        <%= link_to admin_imports_path(component, resource_id:, name: import_manifest.name) do %>
+          <li class="imports--file imports--<%= import_manifest.name %>">
+            <%= import_manifest.message(:label, self) %>
+          </li>
+        <% end %>
       <% end %>
     <% end %>
   </ul>

data/app/views/decidim/admin/imports/new.html.erb

@@ -12,10 +12,11 @@
         <div class="dropdown-pane" id="example-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
           <ul class="vertical menu add-components">
             <% mime_types.each do |format, name| %>
-              <li class="examples--format--<%= format.downcase %> examples--<%= import_manifest.name %>">
-                <%= link_to t(".download_example_format", name:),
-                            admin_imports_example_path(@current_component, name: import_manifest.name, format:) %>
-              </li>
+              <%= link_to admin_imports_example_path(@current_component, name: import_manifest.name, format:) do %>
+                <li class="examples--format--<%= format.downcase %> examples--<%= import_manifest.name %>">
+                  <%= t(".download_example_format", name:) %>
+                </li>
+              <% end %>
             <% end %>
           </ul>
         </div>

data/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb

@@ -54,13 +54,14 @@
         </div>
 
         <% if current_user.admin? %>
-          <div class="card">
+          <div class="card mb-2">
             <div class="card-divider">
               <h2 class="card-title"><%= t ".select_scopes" %></h2>
             </div>
             <div class="card-section">
-              <div class="row column">
-                <%= scopes_picker_filter f, :scope_ids, help_text: t(".scopes_help") %>
+              <div class="cell small-12 medium-6 m-4">
+                <%= scopes_select_field f, :scope_ids, options: { include_blank: false }, html_options: { class: "chosen-select", multiple: true, size: 5 } %>
+                <span class="help-text"> <%= t(".scopes_help") %> </span>
               </div>
             </div>
           </div>

data/app/views/decidim/admin/organization_appearance/form/_minimap.html.erb

@@ -3,7 +3,7 @@
   <div id="minimap" class="grid grid-cols-1 md:grid-cols-2">
     <div class="minimap-tab">
       <% if current_organization.favicon.attached? %>
-        <%= image_tag current_organization.attached_uploader(:favicon).path, class: "minimap-favicon" %>
+        <%= image_tag current_organization.attached_uploader(:favicon).url, class: "minimap-favicon" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-favicon placeholder", style: "width: #{image_width(current_organization, :favicon) * size_factor}px; height: #{image_height(current_organization, :favicon) * size_factor}px;" } do %>
           <span><%= t("favicon", scope: "activemodel.attributes.organization") %></span>
@@ -13,7 +13,7 @@
 
     <div class="minimap-header">
       <% if current_organization.logo.present? %>
-        <%= image_tag current_organization.attached_uploader(:logo).path, class: "minimap-logo" %>
+        <%= image_tag current_organization.attached_uploader(:logo).url, class: "minimap-logo" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-logo placeholder", style: "width: #{image_width(current_organization, :logo) * size_factor}px; height: #{image_height(current_organization, :logo) * size_factor}px;" } do %>
           <span><%= t("logo", scope: "activemodel.attributes.organization") %></span>
@@ -26,7 +26,7 @@
 
     <div class="minimap-footer">
       <% if current_organization.official_img_footer.attached? %>
-        <%= image_tag current_organization.attached_uploader(:official_img_footer).path, class: "minimap-official_img_footer" %>
+        <%= image_tag current_organization.attached_uploader(:official_img_footer).url, class: "minimap-official_img_footer" %>
       <% else %>
         <%= content_tag :div, nil, { class: "minimap-official_img_footer placeholder", style: "width: #{image_width(current_organization, :official_img_footer) * size_factor}px; height: #{image_height(current_organization, :official_img_footer) * size_factor}px;" } do %>
         <span><%= t("official_img_footer", scope: "activemodel.attributes.organization") %></span>

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

@@ -23,7 +23,7 @@
           <div class="layout-nav">
             <%= link_to decidim_admin.root_path, class: "logo hidden md:block", data: { "external-link": false }, aria: { label: t("decidim.accessibility.logo", organization: current_organization.name) } do %>
               <% if current_organization.logo.present? %>
-                <%= image_tag current_organization.attached_uploader(:logo).path, alt: current_organization.name %>
+                <%= image_tag current_organization.attached_uploader(:logo).url, alt: current_organization.name %>
               <% else %>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 134 109">
                   <g fill="#fff">

data/config/locales/bg.yml

@@ -351,6 +351,8 @@ bg:
       conflicts:
         attempts: Опити
         'false': 'Не'
+        index:
+          text: Търсете по имейл, име или псевдоним на текущия потребител.
         managed_user_name: Управляван потребител
         solved: Разрешен случай
         title: Проверка на конфликти

data/config/locales/ca.yml

@@ -23,7 +23,7 @@ ca:
       category:
         description: Descripció
         name: Nom
-        parent_id: Pare
+        parent_id: Categoria mare
         weight: Ordre de posició
       component:
         name: Nom
@@ -110,7 +110,7 @@ ca:
         code: Codi
         name: Nom
         organization: Organització
-        parent_id: Pare
+        parent_id: Àmbit pare
         scope_type: Tipus d'àmbit
         scope_type_id: Tipus d'àmbit
       scope_type:
@@ -351,6 +351,8 @@ ca:
       conflicts:
         attempts: Intents
         'false': 'No'
+        index:
+          text: Cercar per correu electrònic, nom o àlies.
         managed_user_name: Usuari gestionat
         solved: Resolt
         title: Conflictes de verificació

data/config/locales/cs.yml

@@ -351,6 +351,8 @@ cs:
       conflicts:
         attempts: Pokusy
         'false': 'Ne'
+        index:
+          text: Hledat podle aktuálního uživatelského e-mailu, jména nebo přezdívky.
         managed_user_name: Spravovaný uživatel
         solved: Vyřešeno
         title: Konflikty ověření
@@ -379,6 +381,11 @@ cs:
           update: Aktualizovat
       dashboard:
         pending_moderations:
+          anouncement:
+            one: Je zde %{count} čekající na moderování
+            few: Jsou zde %{count} čekající na moderování
+            many: Je zde %{count} čekajících na moderování
+            other: Je tu %{count} čekajících na moderování
           goto_moderation: Přejít na globální moderaci
           title: Čekající moderování
         show:

data/config/locales/de.yml

@@ -351,6 +351,8 @@ de:
       conflicts:
         attempts: Versuche
         'false': 'Nein'
+        index:
+          text: Suche nach bestehender E-Mail, Name oder Spitzname des Teilnehmenden.
         managed_user_name: Verwalteter Benutzer
         solved: Gelöst
         title: Überprüfungskonflikte

data/config/locales/en.yml

@@ -351,6 +351,8 @@ en:
       conflicts:
         attempts: Attempts
         'false': 'No'
+        index:
+          text: Search by current user email, name or nickname.
         managed_user_name: Managed User
         solved: Solved
         title: Verification conflicts

data/config/locales/es-MX.yml

@@ -351,6 +351,8 @@ es-MX:
       conflicts:
         attempts: Intentos
         'false': 'No'
+        index:
+          text: Buscar por correo electrónico, nombre o alias.
         managed_user_name: Usuario gestionado
         solved: Resuelto
         title: Conflictos de verificación

data/config/locales/es-PY.yml

@@ -351,6 +351,8 @@ es-PY:
       conflicts:
         attempts: Intentos
         'false': 'No'
+        index:
+          text: Buscar por correo electrónico, nombre o alias.
         managed_user_name: Usuario gestionado
         solved: Resuelto
         title: Conflictos de verificación

data/config/locales/es.yml

@@ -23,7 +23,7 @@ es:
       category:
         description: Descripción
         name: Nombre
-        parent_id: Superior
+        parent_id: Categoría madre
         weight: Orden de posición
       component:
         name: Nombre
@@ -110,7 +110,7 @@ es:
         code: Código
         name: Nombre
         organization: Organización
-        parent_id: Superior
+        parent_id: Ámbito padre
         scope_type: Tipo de ámbito
         scope_type_id: Tipo de ámbito
       scope_type:
@@ -351,6 +351,8 @@ es:
       conflicts:
         attempts: Intentos
         'false': 'No'
+        index:
+          text: Buscar por correo electrónico, nombre o alias.
         managed_user_name: Usuario gestionado
         solved: Resuelto
         title: Conflictos de verificación

data/config/locales/eu.yml

@@ -351,6 +351,8 @@ eu:
       conflicts:
         attempts: Saiakerak
         'false': 'Ez'
+        index:
+          text: Bilatu gaur egungo erabiltzailearen posta elektronikoaren, izenaren edo ezizenaren bidez.
         managed_user_name: Erabiltzaile kudeatua
         solved: Ebatzita
         title: Egiaztapen-arazoak

data/config/locales/fi-plain.yml

@@ -319,7 +319,7 @@ fi-pl:
         create:
           error: Tämän komponentin luomisessa tapahtui virhe.
           success: Komponentti luotu onnistuneesti.
-          success_landing_page: Komponentti luotu onnistuneesti. Voit lisätä sisältölohkon tälle komponentille osallistumistilan etusivulle. Siirry <a href="%{landing_page_path}">Laskeutumissivu-osioon</a> lisätäksesi komponentin osallistumistilan etusivulle.
+          success_landing_page: Komponentin luonti onnistui. Voit lisätä sisältölohkon tälle komponentille osallistumistilan etusivulle. Siirry <a href="%{landing_page_path}">Laskeutumissivu-osioon</a> lisätäksesi komponentin osallistumistilan etusivulle.
         destroy:
           error: Tämän komponentin tuhoamisessa tapahtui virhe.
           success: Komponentti poistettu onnistuneesti.
@@ -351,6 +351,8 @@ fi-pl:
       conflicts:
         attempts: Yritykset
         'false': 'Ei'
+        index:
+          text: Etsi nykyisen käyttäjän sähköpostin, nimen tai nimimerkin perusteella.
         managed_user_name: Hallittu käyttäjä
         solved: Ratkaistu
         title: Vahvistusten ristiriidat

data/config/locales/fi.yml

@@ -298,7 +298,7 @@ fi:
           error: Aihepiirin luonti epäonnistui.
           success: Aihepiirin luonti onnistui.
         destroy:
-          error: Tämän aihepiirin poistaminen epäonnistui. Poista ensin kaikki sen ala-aihepiirit ja varmista, että mikään muu kohde ei liity tähän aihepiiriin. Kokeile sen jälkeen uudestaan.
+          error: Tämän aihepiirin poistaminen epäonnistui. Poista ensin kaikki sen ala-aihepiirit ja varmista, että mikään muu kohde ei liity tähän aihepiiriin. Kokeile sen jälkeen uudelleen.
           success: Aihepiirin poistaminen onnistui.
         edit:
           title: Muokkaa aihepiiriä
@@ -319,7 +319,7 @@ fi:
         create:
           error: Komponentin luonti epäonnistui.
           success: Komponentin luonti onnistui.
-          success_landing_page: Komponentti luotu onnistuneesti. Voit lisätä sisältölohkon tälle komponentille osallistumistilan etusivulle. Siirry <a href="%{landing_page_path}">Laskeutumissivu-osioon</a> lisätäksesi komponentin osallistumistilan etusivulle.
+          success_landing_page: Komponentin luonti onnistui. Voit lisätä sisältölohkon tälle komponentille osallistumistilan etusivulle. Siirry <a href="%{landing_page_path}">Laskeutumissivu-osioon</a> lisätäksesi komponentin osallistumistilan etusivulle.
         destroy:
           error: Komponentin tuhoaminen epäonnistui.
           success: Komponentin poisto onnistui.
@@ -351,6 +351,8 @@ fi:
       conflicts:
         attempts: Yritykset
         'false': 'Ei'
+        index:
+          text: Etsi nykyisen käyttäjän sähköpostin, nimen tai nimimerkin perusteella.
         managed_user_name: Hallittu käyttäjä
         solved: Ratkaistu
         title: Vahvistusten ristiriidat
@@ -729,7 +731,7 @@ fi:
       newsletters:
         create:
           error: Uutiskirjeen luonti epäonnistui.
-          success: Uutiskirje luotu onnistuneesti. Tarkasta se ennen lähetystä.
+          success: Uutiskirjeen luonti onnistui. Tarkasta se ennen lähetystä.
         deliver:
           error: Uutiskirjeen toimitus epäonnistui.
           success: Uutiskirjeen toimitus onnistui.
@@ -887,7 +889,7 @@ fi:
       participatory_space_private_users_csv_imports:
         create:
           invalid: CSV-tiedoston lukeminen epäonnistui. Tarkasta, että olet seurannut esitettyjä ohjeita.
-          success: CSV-tiedosto ladattu onnistuneesti. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
+          success: CSV-tiedoston lataus onnistui. Lähetämme kutsusähköpostin osallistujille. Tämä voi kestää hetken.
         new:
           csv_upload:
             title: Lataa CSV-tiedosto
@@ -1037,7 +1039,7 @@ fi:
       user_group:
         csv_verify:
           invalid: CSV-tiedoston käsittely epäonnistui.
-          success: CSV-tiedosto on ladattu onnistuneesti. Vahvistamme kriteerien mukaiset käyttäjäryhmät. Tämä voi kestää hetken.
+          success: CSV-tiedoston lataus onnistui. Vahvistamme kriteerien mukaiset käyttäjäryhmät. Tämä voi kestää hetken.
         reject:
           invalid: Käyttäjäryhmän hylkäys epäonnistui.
           success: Käyttäjäryhmän hylkäys onnistui.

data/config/locales/fr-CA.yml

@@ -351,6 +351,8 @@ fr-CA:
       conflicts:
         attempts: Tentatives
         'false': 'Non'
+        index:
+          text: Recherche par adresse e-mail, nom ou pseudonyme.
         managed_user_name: Utilisateur représenté
         solved: Résolu
         title: Conflits de vérification

data/config/locales/fr.yml

@@ -351,6 +351,8 @@ fr:
       conflicts:
         attempts: Tentatives
         'false': 'Non'
+        index:
+          text: Recherche par adresse e-mail, nom ou pseudonyme.
         managed_user_name: Utilisateur représenté
         solved: Résolu
         title: Conflits de vérification

data/config/locales/ja.yml

@@ -351,6 +351,8 @@ ja:
       conflicts:
         attempts: 試行回数
         'false': 'いいえ'
+        index:
+          text: 現在のユーザーのメールアドレス、名前、ニックネームで検索します。
         managed_user_name: 管理対象ユーザー
         solved: 解決済み
         title: 確認の競合
@@ -425,7 +427,7 @@ ja:
           reportable_type_string_eq:
             label: タイプ
         officialized_at_null:
-          label: 都道府県：
+          label: 状態
           values:
             'false': 公式化済み
             'true': 公式化されていない
@@ -461,7 +463,7 @@ ja:
           user_name_or_user_email_cont: '%{collection} を名前またはメールアドレスで検索します。'
           user_name_or_user_nickname_or_user_email_cont: '%{collection} をメール、表示名、アカウントIDで検索します。'
         state_eq:
-          label: 都道府県：
+          label: 状態
           values:
             all: すべて
             pending: 保留中

data/config/locales/pt-BR.yml

@@ -289,6 +289,7 @@ pt-BR:
       block_user:
         new:
           action: Bloquear conta e enviar justificativa
+          already_reported_html: Continuar com essa ação também resultará na ocultação o conteúdo de todos os participantes.
           description: Bloquear um usuário irá tornar sua conta inutilizável. Você pode fornecer em sua justificação quaisquer diretrizes sobre como você poderia considerar desbloquear o usuário.
           justification: Justificativa
           title: Bloquear usuário %{name}
@@ -350,6 +351,8 @@ pt-BR:
       conflicts:
         attempts: Tentativas
         'false': 'Não'
+        index:
+          text: Pesquisar por e-mail, nome ou apelido do usuário.
         managed_user_name: Usuário gerenciado
         solved: Resolvido
         title: Conflitos de verificação