decidim-admin 0.31.8 → 0.32.0.rc1

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

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.area_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="area-types">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.area_types" %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :area_type %>
         <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :area_type], class: "button button__sm button__secondary new" %>
       <% end %>

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

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("areas", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="areas">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.areas" %>
+      <%= t ".title" %>
       <% if allowed_to? :create, :area %>
         <%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button button__sm button__secondary new" %>
       <% end %>

data/app/views/decidim/admin/attachment_collections/edit.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("attachment_collections.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("attachment_collections.edit.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

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

@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="card" id="attachment_collections">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :attachment_collection %>
         <%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>
@@ -51,7 +51,7 @@
                           <% end %>
                         <% else %>
                           <div class="dropdown__button-disabled">
-                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin"), class: :left do %>
+                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin") do %>
                               <%= icon "delete-bin-line", class: "text-gray" %>
                               <span>
                                 <%= t("actions.destroy", scope: "decidim.admin") %>

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

@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("attachment_collections.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("attachment_collections.new.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

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

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t(".attachments_title")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card" id="attachments">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t(".attachments_title") %>
+      <%= t(".title") %>
       <% if allowed_to? :create, :attachment %>
         <%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>

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

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("authorization_workflows", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("authorization_workflows", scope: "decidim.admin.titles") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

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

@@ -1,4 +1,5 @@
 <% add_decidim_page_title(t(".title", name: user.name)) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <%= t(".title", name: user.name) %>

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

@@ -98,7 +98,7 @@
           <hr>
           <li class="dropdown__item">
             <div class="dropdown__button-disabled">
-              <%= with_tooltip t("tooltips.deleted_component_info", scope: "decidim.admin"), class: :left do %>
+              <%= with_tooltip t("tooltips.deleted_component_info", scope: "decidim.admin") do %>
                 <%= icon "delete-bin-line", class: "text-gray" %>
                 <span>
                   <%= t("actions.soft_delete", scope: "decidim.admin") %>

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

@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="card">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t("components.title", scope: "decidim.admin") %>
+      <%= t(".title") %>
 
       <% if allowed_to?(:create, :component) %>
       <div class="relative">

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

@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="card">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+      <%= t(".title") %>
     </h1>
   </div>
 </div>

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

@@ -1,6 +1,8 @@
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card">
   <div class="card-divider">
-    <div class="card-title">Transfer User</div>
+    <div class="card-title"><%= t(".title") %></div>
   </div>
   <div class="table-scroll">
     <table class="table-list">

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

@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("title", scope: "decidim.admin.conflicts") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/admin/dashboard/show.html.erb

@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-  <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
+  <%= t(".title") %> <%= current_organization_name %>
   </h1>
 </div>
 
@@ -14,7 +14,7 @@
   <% if count_pending_moderations.positive? && allowed_to?(:read, :global_moderation) %>
     <div class="grid-x grid-margin-x">
       <div class="cell small-6 medium-6 large-6">
-        <%= render "pending_moderations" %>
+        <%= render "decidim/admin/dashboard/pending_moderations" %>
       </div>
     </div>
   <% end %>
@@ -46,6 +46,6 @@
     <% end %>
 
   <% if current_user.admin_terms_accepted? %>
-    <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
+    <%= link_to( t("title", scope: "decidim.admin.admin_terms.show"), admin_terms_show_path, class: "button button__text-secondary") %>
   <% end %>
 </div>

data/app/views/decidim/admin/help_sections/update.html.erb

@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
 <%= render partial: "form", object: @form %>

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

@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <% if current_organization.available_authorizations.empty? %>
   <div>
     <%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
@@ -7,7 +8,7 @@
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t "decidim.admin.titles.impersonatable_users" %>
+    <%= t ".title" %>
     <% if allowed_to? :impersonate, :impersonatable_user, user: new_managed_user %>
       <%= link_to t(".impersonate_new_managed_user"), new_impersonatable_user_impersonation_path(:new_managed_user), class: "button button__sm button__secondary #{"disabled" if current_organization.available_authorizations.empty?}" %>
     <% end %>

data/app/views/decidim/admin/impersonations/_form.html.erb

@@ -28,7 +28,7 @@
         <div class="row column">
           <div id="authorization-handler-<%= f.object.handler_name %>"
                  class="authorization-handler">
-            <%= render "handler_form", handler_form: f %>
+            <%= render "decidim/admin/impersonations/handler_form", handler_form: f %>
           </div>
         </div>
       <% end %>
@@ -40,7 +40,7 @@
               <div id="authorization-handler-<%= authorization.handler_name %>"
                    class="authorization-handler"
                    style="display:none">
-                <%= render "handler_form", handler_form: f %>
+                <%= render "decidim/admin/impersonations/handler_form", handler_form: f %>
               </div>
             </div>
           <% end %>

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

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <% if creating_managed_user? %>
-      <%= t(".impersonate_new_managed_user") %>
+      <%= t(".title") %>
     <% else %>
       <% if @form.user.managed? %>
         <%= t(".impersonate_existing_managed_user", name: @form.user.name) %>

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

@@ -1,4 +1,5 @@
 <% add_decidim_page_title(import_manifest.message(:title, self)) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <%= import_manifest.message(:title, self) %>

data/app/views/decidim/admin/logs/_logs_list.html.erb

@@ -1,7 +1,7 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t "decidim.admin.titles.admin_log" %>
+      <%= t "decidim.admin.logs.index.title" %>
     </h2>
   </div>
   <%= render partial: "decidim/admin/logs/filters" if defined?(display_filters) && display_filters %>

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

@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("admin_log", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
 
 <%= render partial: "decidim/admin/logs/logs_list", locals: { logs:, empty_logs: no_logs_available?, display_filters: true } %>
 <%= decidim_paginate logs %>

data/app/views/decidim/admin/managed_users/impersonation_logs/index.html.erb

@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.impersonations")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="card">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= t "decidim.admin.titles.impersonations" %>
+      <%= t ".title" %>
     </h1>
   </div>
   <div class="table-scroll">
@@ -23,9 +24,9 @@
             <td><%= impersonation_log.admin.name %></td>
             <td><%= impersonation_log.user.name %></td>
             <td><%= impersonation_log.reason %></td>
-            <td><%= impersonation_log.started_at ? l(impersonation_log.started_at, format: :long) : nil %></td>
-            <td><%= impersonation_log.ended_at ? l(impersonation_log.ended_at, format: :long) : nil %></td>
-            <td><%= impersonation_log.expired_at ? l(impersonation_log.expired_at, format: :long) : nil %></td>
+            <td><%= impersonation_log.started_at ? l(impersonation_log.started_at, format: :decidim_short) : nil %></td>
+            <td><%= impersonation_log.ended_at ? l(impersonation_log.ended_at, format: :decidim_short) : nil %></td>
+            <td><%= impersonation_log.expired_at ? l(impersonation_log.expired_at, format: :decidim_short) : nil %></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/decidim/admin/managed_users/promotions/new.html.erb

@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".new_managed_user_promotion")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t(".new_managed_user_promotion") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/admin/{participatory_space_private_users → members}/edit.html.erb

@@ -7,8 +7,8 @@
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <%= decidim_form_for(@form, url: participatory_space_private_user_path(current_participatory_space, @private_user), html: { class: "form-defaults form edit_participatory_space_private_user" }) do |f| %>
-      <%= render partial: "decidim/admin/participatory_space_private_users/form", object: f %>
+    <%= decidim_form_for(@form, url: member_path(current_participatory_space, @member), html: { class: "form-defaults form edit_member" }) do |f| %>
+      <%= render partial: "decidim/admin/members/form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".update"), class: "button button__sm button__secondary" %>

data/app/views/decidim/admin/{participatory_space_private_users → members}/index.html.erb

@@ -1,18 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card" id="private_users">
+<div class="card" id="members">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
       <%= t(".title") %>
-      <% if allowed_to? :create, :space_private_user %>
-        <%= link_to t(".publish_all"), publish_all_participatory_space_private_users_path(current_participatory_space), class: "button button__sm button__transparent-secondary publish-all", method: :post %>
-        <%= link_to t(".unpublish_all"), unpublish_all_participatory_space_private_users_path(current_participatory_space), class: "button button__sm button__transparent-secondary unpublish-all", method: :post %>
-        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_imports_path, class: "button button__sm button__transparent-secondary import" %>
-        <%= link_to t("actions.participatory_space_private_user.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
+      <% if allowed_to? :create, :space_member %>
+        <%= link_to t(".publish_all"), publish_all_members_path(current_participatory_space), class: "button button__sm button__transparent-secondary publish-all", method: :post %>
+        <%= link_to t(".unpublish_all"), unpublish_all_members_path(current_participatory_space), class: "button button__sm button__transparent-secondary unpublish-all", method: :post %>
+        <%= link_to t(".import_via_csv"), new_members_csv_imports_path, class: "button button__sm button__transparent-secondary import" %>
+        <%= link_to t("actions.member.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>
     </h1>
   </div>
-  <%= admin_filter_selector(:participatory_space_private_users) %>
-  <% if participatory_space_private_users.any? %>
+  <%= admin_filter_selector(:members) %>
+  <% if members.any? %>
     <div class="table-stacked mt-4">
       <table class="table-list">
         <thead>
@@ -36,39 +36,39 @@
           </tr>
         </thead>
         <tbody>
-          <% participatory_space_private_users.each do |private_user| %>
+          <% members.each do |member| %>
             <tr>
               <td data-label="<%= t("models.user.fields.name", scope: "decidim.admin") %>">
-                <%= private_user.user.name %>
+                <%= member.user.name %>
               </td>
               <td data-label="<%= t("models.user.fields.email", scope: "decidim.admin") %>">
-                <%= private_user.user.email %>
+                <%= member.user.email %>
               </td>
               <td data-label="<%= t("models.user.fields.published", scope: "decidim.admin") %>">
-                <% if private_user.published %>
+                <% if member.published %>
                   <%= icon "check-line", class: "text-success" %>
                 <% end %>
               </td>
               <td data-label="<%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %>">
-                <% if private_user.user.invitation_sent_at %>
-                  <%= l private_user.user.invitation_sent_at, format: :short %>
+                <% if member.user.invitation_sent_at %>
+                  <%= l member.user.invitation_sent_at, format: :short %>
                 <% end %>
               </td>
               <td data-label="<%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %>">
-                <% if private_user.user.invitation_accepted_at %>
-                  <%= l private_user.user.invitation_accepted_at, format: :short %>
+                <% if member.user.invitation_accepted_at %>
+                  <%= l member.user.invitation_accepted_at, format: :short %>
                 <% end %>
               </td>
               <td data-label="<%= t("decidim.admin.actions.actions") %>" class="table-list__actions">
-                <button type="button" data-controller="dropdown" data-target="actions-private-user-<%= private_user.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: private_user.user.name) %>">
+                <button type="button" data-controller="dropdown" data-target="actions-private-user-<%= member.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: member.user.name) %>">
                   <%= icon "more-fill", class: "text-secondary" %>
                 </button>
 
                 <div class="inline-block relative">
-                  <ul id="actions-private-user-<%= private_user.id %>" class="dropdown dropdown__action" aria-hidden="true">
-                    <% if allowed_to?(:edit, :space_private_user, private_user: private_user) %>
+                  <ul id="actions-private-user-<%= member.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                    <% if allowed_to?(:edit, :space_member, member: member) %>
                       <li class="dropdown__item">
-                        <%= link_to edit_participatory_space_private_user_path(current_participatory_space, private_user), class: "dropdown__button" do %>
+                        <%= link_to edit_member_path(current_participatory_space, member), class: "dropdown__button" do %>
                           <%= icon "pencil-line" %>
                           <%= t("actions.edit", scope: "decidim.admin") %>
                         <% end %>
@@ -77,9 +77,9 @@
                       <hr>
                     <% end %>
 
-                    <% if allowed_to?(:invite, :space_private_user, private_user: private_user) && private_user.user.invited_to_sign_up? %>
+                    <% if allowed_to?(:invite, :space_member, member: member) && member.user.invited_to_sign_up? %>
                       <li class="dropdown__item">
-                        <%= link_to resend_invitation_participatory_space_private_user_path(current_participatory_space, private_user), method: :post, class: "dropdown__button" do %>
+                        <%= link_to resend_invitation_member_path(current_participatory_space, member), method: :post, class: "dropdown__button" do %>
                           <%= icon "refresh-line" %>
                           <%= t("actions.resend_invitation", scope: "decidim.admin") %>
                         <% end %>
@@ -88,9 +88,9 @@
                       <hr>
                     <% end %>
 
-                    <% if allowed_to?(:destroy, :space_private_user, private_user: private_user) %>
+                    <% if allowed_to?(:destroy, :space_member, member: member) %>
                       <li class="dropdown__item">
-                        <%= link_to participatory_space_private_user_path(current_participatory_space, private_user), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
+                        <%= link_to member_path(current_participatory_space, member), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
                           <%= icon "delete-bin-line" %>
                           <%= t("actions.destroy", scope: "decidim.admin") %>
                         <% end %>
@@ -104,6 +104,6 @@
         </tbody>
       </table>
     </div>
-    <%= decidim_paginate participatory_space_private_users %>
+    <%= decidim_paginate members %>
   <% end %>
 </div>

data/app/views/decidim/admin/{participatory_space_private_users → members}/new.html.erb

@@ -7,8 +7,8 @@
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_path(current_participatory_space), html: { class: "form-defaults form new_participatory_space_private_user" }) do |f| %>
-      <%= render partial: "decidim/admin/participatory_space_private_users/form", object: f %>
+    <%= decidim_form_for(@form, url: members_path(current_participatory_space), html: { class: "form-defaults form new_member" }) do |f| %>
+      <%= render partial: "decidim/admin/members/form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t(".create"), class: "button button__sm button__secondary" %>

data/app/views/decidim/admin/{participatory_space_private_users_csv_imports → members_csv_imports}/new.html.erb

@@ -18,7 +18,7 @@
     <% if @count != 0 %>
       <p><%= t(".destroy.explanation", count: @count) %></p>
       <%= link_to t(".destroy.button"),
-                  destroy_all_participatory_space_private_users_csv_imports_path,
+                  destroy_all_members_csv_imports_path,
                   method: :delete,
                   class: "button button__sm button__secondary alert",
                   data: { confirm: t(".destroy.confirm") } %>
@@ -35,7 +35,7 @@
     </h2>
   </div>
   <div class="card-section p-4">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_imports_path, html: { class: "form form-defaults" }) do |form| %>
+    <%= decidim_form_for(@form, url: members_csv_imports_path, html: { class: "form form-defaults" }) do |form| %>
       <div>
         <p><%= t(".explanation") %></p>
         <p><%= t(".example_file") %></p>

data/app/views/decidim/admin/moderations/_moderation-tr.html.erb

@@ -3,10 +3,6 @@
     <%= check_box_tag "moderation_ids_s[]", moderation.id, false, class: "js-check-all-moderations js-moderation-list-check js-moderation-id-#{moderation.id}" %>
   </td>
 
-  <td data-label="<%= t("models.moderation.fields.reportable_id", scope: "decidim.moderations") %>">
-    <%= moderation.reportable.id %>
-  </td>
-
   <td data-label="<%= t("models.moderation.fields.reportable_type", scope: "decidim.moderations") %>">
     <%= moderation.reportable.class.model_name.human %>
   </td>
@@ -33,7 +29,7 @@
   </td>
 
   <td data-label="<%= t("models.moderation.fields.created_at", scope: "decidim.moderations") %>">
-    <%= l moderation.created_at, format: :long %>
+    <%= l moderation.created_at, format: :decidim_short %>
   </td>
 
   <td data-label="<%= t("models.moderation.fields.report_count", scope: "decidim.moderations") %>">
@@ -42,7 +38,7 @@
 
   <% if params[:hidden] %>
     <td data-label="<%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %>">
-      <%= l(moderation.hidden_at, format: :long) if moderation.hidden_at.present? %>
+      <%= l(moderation.hidden_at, format: :decidim_short) if moderation.hidden_at.present? %>
     </td>
   <% end %>
 
@@ -89,7 +85,7 @@
           <li class="dropdown__item">
             <% if moderation.reportable.respond_to?(:commentable) && moderation.reportable.commentable.try(:hidden?) %>
               <div class="dropdown__button-disabled">
-                <%= with_tooltip(t("actions.parent_hidden", scope: "decidim.moderations"), title: t("actions.parent_hidden", scope: "decidim.moderations"), class: :left) do %>
+                <%= with_tooltip(t("actions.parent_hidden", scope: "decidim.moderations"), title: t("actions.parent_hidden", scope: "decidim.moderations")) do %>
                   <%= icon "eye-line", class: "text-gray" %>
                   <span><%= t("actions.unhide", scope: "decidim.moderations") %></span>
                 <% end %>

data/app/views/decidim/admin/moderations/_moderations-thead.html.erb

@@ -1,7 +1,6 @@
 <thead>
   <tr>
     <th><%= check_box_tag "moderations_bulk", "all", false, class: "js-check-all" %></th>
-    <th><%= t("models.moderation.fields.reportable_id", scope: "decidim.moderations") %></th>
     <th><%= t("models.moderation.fields.reportable_type", scope: "decidim.moderations") %></th>
     <% if !respond_to?(:current_participatory_space) %>
       <th><%= t("models.moderation.fields.participatory_space", scope: "decidim.moderations") %></th>

data/app/views/decidim/admin/moderations/reports/index.html.erb

@@ -57,7 +57,7 @@
     <dd><%= moderation.reportable.class.name.demodulize %></dd>
 
     <dt><%= t("models.moderation.fields.created_at", scope: "decidim.moderations") %></dt>
-    <dd><%= l(moderation.created_at, format: :long) %></dd>
+    <dd><%= l(moderation.created_at, format: :decidim_short) %></dd>
 
     <dt><%= t(".participatory_space") %></dt>
     <dd><%= translated_attribute moderation.participatory_space.title %></dd>

data/app/views/decidim/admin/newsletter_templates/show.html.erb

@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview", template_name: t(template_manifest.public_name_key))) %>
+<% add_decidim_page_title(t(".title", template_name: t(template_manifest.public_name_key))) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t ".preview", template_name: t(template_manifest.public_name_key) %>
+    <%= t ".title", template_name: t(template_manifest.public_name_key) %>
   </h1>
 </div>
 <div class="item__edit-form">

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

@@ -37,14 +37,12 @@
             <%= hidden_field_tag "newsletter[send_to_verified_users]", params.dig(:newsletter, :send_to_verified_users) %>
             <%= hidden_field_tag "newsletter[send_to_participants]", params.dig(:newsletter, :send_to_participants) %>
             <%= hidden_field_tag "newsletter[send_to_followers]", params.dig(:newsletter, :send_to_followers) %>
-            <%= hidden_field_tag "newsletter[send_to_private_members]", params.dig(:newsletter, :send_to_private_members) %>
+            <%= hidden_field_tag "newsletter[send_to_members]", params.dig(:newsletter, :send_to_members) %>
 
             <% @form.participatory_space_types.each do |space_type| %>
-              <%= f.fields_for "newsletter[participatory_space_types][#{space_type.manifest_name}]", space_type do |ff| %>
-                <%= ff.hidden_field :manifest_name, value: space_type.manifest_name %>
-                <% space_type.ids.each do |id| %>
-                  <%= hidden_field_tag "newsletter[participatory_space_types][#{space_type.manifest_name}][ids][]", id %>
-                <% end %>
+              <%= hidden_field_tag "newsletter[participatory_space_types][#{space_type.manifest_name}][manifest_name]", space_type.manifest_name %>
+              <% space_type.ids.each do |id| %>
+                <%= hidden_field_tag "newsletter[participatory_space_types][#{space_type.manifest_name}][ids][]", id %>
               <% end %>
             <% end %>
 

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

@@ -36,11 +36,11 @@
             </td>
 
             <td data-label="<%= t("models.newsletter.fields.created_at", scope: "decidim.admin") %>">
-              <%= l(newsletter.created_at, format: :long) if newsletter.created_at %>
+              <%= l(newsletter.created_at, format: :decidim_short) if newsletter.created_at %>
             </td>
 
             <td data-label="<%= t("models.newsletter.fields.sent_at", scope: "decidim.admin") %>">
-              <%= l(newsletter.sent_at, format: :long) if newsletter.sent_at %>
+              <%= l(newsletter.sent_at, format: :decidim_short) if newsletter.sent_at %>
             </td>
 
             <td data-label="<%= t("models.newsletter.fields.sent_to", scope: "decidim.admin") %>">

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

@@ -68,8 +68,8 @@
                   <%= f.check_box :send_to_followers, help_text: t(".followers_help") %>
                 </div>
 
-                <div class="cell small-12 medium-6" id="send_newsletter_to_private_members">
-                  <%= f.check_box :send_to_private_members, help_text: t(".private_members_help") %>
+                <div class="cell small-12 medium-6" id="send_newsletter_to_members">
+                  <%= f.check_box :send_to_members, help_text: t(".members_help") %>
                 </div>
               </div>
             </div>

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

@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview")) %>
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title !w-1/2">
-    <%= t ".preview" %>
+    <%= t ".title" %>
   </h1>
   <div class="flex ml-auto items-center gap-x-4">
     <% if allowed_to?(:update, :newsletter, newsletter: @newsletter) %>

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

@@ -1,8 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
+<% add_decidim_page_title(t(".title")) %>
 
-<div class="card" id="user-groups">
+<div class="card">
   <div class="item_show__header">
-    <h1 class="item_show__header-title"><%= t "decidim.admin.titles.participants" %></h1>
+    <h1 class="item_show__header-title">
+      <%= t ".title" %>
+    </h1>
   </div>
   <%= admin_filter_selector %>
   <div class="table-stacked">
@@ -128,4 +130,4 @@
   </div>
 </div>
 <%= decidim_paginate @users %>
-<%= render "show_email_modal" %>
+<%= render "decidim/admin/officializations/show_email_modal" %>