decidim-elections 0.25.1 → 0.26.0

data/app/presenters/decidim/votings/admin_log/polling_station_presenter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Votings::Voting`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    PollingStationPresenter.new(action_log, view_helpers).present
+      class PollingStationPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.votings.admin_log.polling_station.#{action}"
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/votings/admin_log/voting_presenter.rb

@@ -11,7 +11,7 @@ module Decidim
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views
-      #    ElectionPresenter.new(action_log, view_helpers).present
+      #    VotingPresenter.new(action_log, view_helpers).present
       class VotingPresenter < Decidim::Log::BasePresenter
         private
 

data/app/presenters/decidim/votings/census/admin_log/dataset_presenter.rb

@@ -16,12 +16,13 @@ module Decidim
         class DatasetPresenter < Decidim::Log::BasePresenter
           private
 
-          def i18n_params
-            {
-              user_name: user_presenter.present,
-              resource_name: Dataset.model_name.human,
-              space_name: space_presenter.present
-            }
+          def action_string
+            case action
+            when "create", "delete", "update"
+              "decidim.votings.admin_log.census.#{action}"
+            else
+              super
+            end
           end
         end
       end

data/app/services/decidim/votings/voting_search.rb

@@ -18,9 +18,9 @@ module Decidim
       # Handle the search_text filter
       def search_search_text
         query
-          .where("title->>'#{current_locale}' ILIKE ?", "%#{search_text}%")
+          .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
           .or(
-            query.where("description->>'#{current_locale}' ILIKE ?", "%#{search_text}%")
+            query.where(Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
           )
       end
 

data/app/views/decidim/elections/admin/steps/_create_election.html.erb

@@ -7,9 +7,9 @@
     <ul class="no-bullet-indented">
       <% form.messages.each do |key, value| %>
         <% if form.errors.include?(key) %>
-          <li><%= icon "x", role: "img", "aria-hidden": true %>&nbsp;<%= form.errors.messages[key][0].html_safe %></li>
+          <li><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %>&nbsp;<%= form.errors.messages[key][0].html_safe %></li>
         <% else %>
-          <li><%= icon "check", role: "img", "aria-hidden": true %>&nbsp;<%= value.html_safe %></li>
+          <li><%= icon "check", class: "text-success", role: "img", "aria-hidden": true %>&nbsp;<%= value.html_safe %></li>
         <% end %>
       <% end %>
     </ul>
@@ -24,7 +24,7 @@
                                           .sort_by {|trustee, used| used ? 0 : 1}
                                           .each do |trustee, used| %>
         <li <%= "class=text-muted" if !used %>>
-          <%= icon trustee.public_key ? "check" : "x", role: "img", "aria-hidden": true %>
+          <%= icon trustee.public_key ? "check" : "x", class: "text-#{trustee.public_key ? "success": "alert"}", role: "img", "aria-hidden": true %>
           <%= trustee.user.name || trustee.name %> <%= t(".public_key.#{used}").html_safe %>
           <% if used %>
             <%= f.hidden_field :trustee_ids, multiple: true, value: trustee.id %>

data/app/views/decidim/elections/admin/steps/_key_ceremony.html.erb

@@ -3,14 +3,49 @@
     <h2 class="card-title"><%= t(".title") %></h2>
   </div>
 
-  <div class="card-section">
-    <h4><%= t(".trustees") %></h4>
-    <ul>
-      <% election.trustees.each do |trustee| %>
-        <li>
-          <%= trustee.name %>
-        </li>
-      <% end %>
-    </ul>
+  <div id="trustees_process" class="card-section"
+        data-api-endpoint-url="<%= bulletin_board_server %>"
+        data-authority-public-key="<%= authority_public_key %>"
+        data-process-type="key_ceremony"
+        data-election-unique-id="<%= election_unique_id %>">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.trustees_participatory_space.fields.name", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.status", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.email", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.public_key", scope: "decidim.elections") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% election.trustees.each do |trustee| %>
+            <tr class="trustee loading" data-trustee-id="<%= trustee.id %>" data-trustee-slug="<%= trustee.slug %>">
+              <td>
+                <%= trustee.name %>
+              </td>
+              <td>
+                <div class="loading"><span class="loading-spinner"></span></div>
+                <div class="active hide"><%= icon "task", class: "text-success" %></div>
+              </td>
+              <td>
+                <%= trustee.user.email %>
+              </td>
+              <td>
+                <%= present(trustee).public_key_thumbprint %>
+              </td>
+              <td></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>
+
+<div class="button--double form-general-submit">
+  <%= link_to t("steps.key_ceremony.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
+</div>
+
+<%= javascript_pack_tag "decidim_elections_admin_trustees_process" %>

data/app/views/decidim/elections/admin/steps/_tally.html.erb

@@ -3,15 +3,65 @@
     <h2 class="card-title"><%= t(".title") %></h2>
   </div>
 
-  <div class="card-section">
-    <h4><%= t(".trustees") %></h4>
-    <ul>
-      <% election.trustees.each do |trustee| %>
-        <li>
-          <%= trustee.name %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
+  <div id="trustees_process" class="card-section"
+        data-api-endpoint-url="<%= bulletin_board_server %>"
+        data-authority-public-key="<%= authority_public_key %>"
+        data-process-type="tally"
+        data-election-unique-id="<%= election_unique_id %>"
+        data-missing-trustees-allowed="<%= missing_trustees_allowed %>"
+        data-check-pending-action-path="<%= election_step_path(election, current_step, check_pending_action: 1) %>">
+
+    <% if missing_trustees_allowed > 0 %>
+      <ul>
+        <%= content_tag :li, t(".mark_as_missing_description") %>
+        <%= content_tag :li, t(".tally_completion", quorum: quorum) %>
+        <%= content_tag :li, t(".undo_mark_as_missing") %>
+      </ul>
+    <% end %>
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.trustees_participatory_space.fields.name", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.status", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.email", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.public_key", scope: "decidim.elections") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% election.trustees.each do |trustee| %>
+            <tr class="trustee loading" data-trustee-id="<%= trustee.id %>" data-trustee-slug="<%= trustee.slug %>">
+              <td>
+                <%= trustee.name %>
+              </td>
+              <td>
+                <div class="loading"><span class="loading-spinner"></span></div>
+                <div class="active hide"><%= icon "task", class: "text-success" %></div>
+                <div class="missing hide"><%= icon "x", class: "text-alert" %></div>
+              </td>
+              <td>
+                <%= trustee.user.email %>
+              </td>
+              <td>
+                <%= present(trustee).public_key_thumbprint %>
+              </td>
+              <td class="table-list__actions">
+                <%= f.button type: :button, formaction: election_step_path(election, current_step, trustee_id: trustee.id),
+                             class: "button tiny alert hollow hide js-report-missing-trustee" do %>
+                  <%= icon "circle-x" %> <%= t(".mark_as_missing") %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>
+
+<div class="button--double form-general-submit">
+  <%= link_to t("steps.tally.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
+</div>
+
+<%= javascript_pack_tag "decidim_elections_admin_trustees_process" %>

data/app/views/decidim/elections/admin/steps/index.html.erb

@@ -17,23 +17,25 @@
   <%= decidim_form_for(@form, url: election_step_path(election, current_step), method: :patch, html: { class: "form step #{current_step}" }) do |f| %>
     <%= render partial: current_step.to_s, locals: { form: @form, f: f } %>
 
-    <div class="button--double form-general-submit">
-      <%= f.hidden_field :current_step %>
-      <%= f.button type: :submit, class: "button", disabled: @form.invalid? do %>
-        <% if @form.pending_action %>
-          <span class='loading-spinner'></span> <%= t("steps.processing", scope: "decidim.elections.admin") %>
-        <% else %>
-          <%= t("steps.#{current_step}.submit", scope: "decidim.elections.admin") %>
-        <% end %>
-      <% end %>
-    </div>
+    <%= f.hidden_field :current_step %>
 
-    <% if @form.pending_action %>
-      <div id="pending_action"
-           data-api-endpoint-url="<%= bulletin_board_server %>"
-           data-message-id="<%= @form.pending_action.message_id %>"></div>
+    <% if @form.main_button? %>
+      <div class="button--double form-general-submit">
+        <%= f.button type: :submit, class: "button", disabled: @form.invalid? do %>
+          <% if @form.pending_action %>
+            <span class='loading-spinner'></span> <%= t("steps.processing", scope: "decidim.elections.admin") %>
+          <% else %>
+            <%= t("steps.#{current_step}.submit", scope: "decidim.elections.admin") %>
+          <% end %>
+        <% end %>
+      </div>
+      <% if @form.pending_action %>
+        <div id="pending_action"
+            data-api-endpoint-url="<%= bulletin_board_server %>"
+            data-message-id="<%= @form.pending_action.message_id %>"></div>
 
-      <%= javascript_pack_tag "decidim_elections_admin_pending_action" %>
+        <%= javascript_pack_tag "decidim_elections_admin_pending_action" %>
+      <% end %>
     <% end %>
   <% end %>
 <% else %>

data/app/views/decidim/elections/elections/_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/elections/elections/election_log.html.erb

@@ -179,4 +179,4 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_election_log", integrity: true %>
+<%= javascript_pack_tag "decidim_elections_election_log" %>

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

@@ -45,7 +45,7 @@ edit_link(
   <% end %>
   <div class="columns medium-8 mediumlarge-7">
     <div class="section">
-      <p><%= decidim_sanitize(simple_format(translated_attribute(election.description)), strip_tags: true) %></p>
+      <p><%= decidim_sanitize_editor(simple_format(translated_attribute(election.description)), strip_tags: true) %></p>
 
       <%= cell("decidim/elections/election_vote_cta", election) %>
 

data/app/views/decidim/elections/trustee_zone/elections/show.html.erb

@@ -18,5 +18,5 @@
     <%= render("#{current_step}_steps") %>
   </div>
 
-  <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}", integrity: true %>
+  <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
 <% end %>

data/app/views/decidim/elections/trustee_zone/trustees/show.html.erb

@@ -99,4 +99,4 @@
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_trustee_trustee_zone", integrity: true %>
+<%= javascript_pack_tag "decidim_elections_trustee_trustee_zone" %>

data/app/views/decidim/elections/votes/_onboarding_modal.html.erb

@@ -20,4 +20,4 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_onboarding", integrity: true %>
+<%= javascript_pack_tag "decidim_elections_onboarding" %>

data/app/views/decidim/elections/votes/_show_casted.html.erb

@@ -8,7 +8,7 @@
 
     <h2 class="h4"><%= t("decidim.elections.votes.confirmed.lead") %></h2>
     <div class="evote__content">
-      <%= t("decidim.elections.votes.confirmed.text", e_vote_poll_id: params[:id]).html_safe %>
+      <%= t("decidim.elections.votes.confirmed.text", e_vote_poll_id: h(params[:id])).html_safe %>
       <p>
         <%= t("decidim.elections.votes.confirmed.verify_link", link: election_vote_verify_path(election, vote_id: params[:id])).html_safe %>
       </p>

data/app/views/decidim/elections/votes/_show_casting.html.erb

@@ -22,4 +22,4 @@
   <%= form_tag election_vote_path(election, id: vote.encrypted_vote_hash), method: :patch, class: "update_vote_status" %>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_voter_casting_vote", integrity: true %>
+<%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>

data/app/views/decidim/elections/votes/new.html.erb

@@ -58,8 +58,8 @@
 </div>
 
 <% if preview_mode? %>
-  <%= javascript_pack_tag "decidim_elections_voter_setup_preview", integrity: true %>
+  <%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
 <% else %>
-  <%= javascript_pack_tag "decidim_elections_voter_setup_vote", integrity: true %>
+  <%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
 <% end %>
-<%= javascript_pack_tag "decidim_elections_voter_new_vote", integrity: true %>
+<%= javascript_pack_tag "decidim_elections_voter_new_vote" %>

data/app/views/decidim/elections/votes/verify.html.erb

@@ -72,4 +72,4 @@
 
 </div>
 
-<%= javascript_pack_tag "decidim_elections_voter_verify_vote", integrity: true %>
+<%= javascript_pack_tag "decidim_elections_voter_verify_vote" %>

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

@@ -26,7 +26,7 @@
             <tr>
               <td>
                 <% if voting.promoted? %>
-                  <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.voting.fields.promoted", scope: "decidim.votings.admin") %>">
+                  <span data-tooltip class="icon-state icon-highlight" data-disable-hover="false" title="<%= t("models.voting.fields.promoted", scope: "decidim.votings.admin") %>">
                     <%= icon "star" %>
                   </span>
                 <% end %>

data/app/views/decidim/votings/polling_officer_zone/closures/_modal_ballots_count_error.html.erb

@@ -1,9 +1,10 @@
 <div id="wrapper-modal-closure-count-error">
-  <div class="reveal" data-reveal id="modal-closure-count-error" data-append-to="div#wrapper-modal-closure-count-error">
+  <div class="reveal" data-reveal id="modal-closure-count-error" data-append-to="div#wrapper-modal-closure-count-error" role="dialog" aria-modal="true" aria-labelledby="modal-closure-count-error-label">
     <div class="reveal__header">
       <%= content_tag :h3,
                       t("title", scope: "decidim.votings.polling_officer_zone.closures.new.modal_ballots_count_error"),
-                      class: "reveal__title" %>
+                      class: "reveal__title",
+                      id: "modal-closure-count-error-label" %>
 
       <button class="close-button" data-close aria-label="<%= t("close_modal", scope: "decidim.votings.polling_officer_zone.closures.new.modal_ballots_count_error") %>" type="button">
         <span aria-hidden="true">×</span>

data/app/views/decidim/votings/polling_officer_zone/closures/_modal_ballots_results_count_error.html.erb

@@ -1,8 +1,9 @@
-<div class="reveal" data-reveal id="modal-closure-results-count-error">
+<div class="reveal" data-reveal id="modal-closure-results-count-error" role="dialog" aria-modal="true" aria-labelledby="modal-closure-results-count-error-label">
   <div class="reveal__header">
     <%= content_tag :h3,
                     t("title", scope: "decidim.votings.polling_officer_zone.closures.edit.modal_ballots_results_count_error"),
-                    class: "reveal__title" %>
+                    class: "reveal__title",
+                    id: "modal-closure-results-count-error-label" %>
 
     <button class="close-button" data-close aria-label="<%= t("close_modal", scope: "decidim.votings.polling_officer_zone.closures.edit.modal_ballots_results_count_error") %>" type="button">
       <span aria-hidden="true">×</span>

data/app/views/decidim/votings/polling_officer_zone/closures/_sign_form.html.erb

@@ -15,17 +15,18 @@
                   data: { open: "modal-closure-sign" },
                   aria: {
                     controls: "modal-closure-sign",
-                    haspopup: true
+                    haspopup: "dialog"
                   },
                   disabled: true,
                   tabindex: "0" %>
 
   <div id="wrapper-modal-closure-sign">
-    <div class="reveal" data-reveal id="modal-closure-sign" data-append-to="div#wrapper-modal-closure-sign">
+    <div class="reveal" data-reveal id="modal-closure-sign" data-append-to="div#wrapper-modal-closure-sign" role="dialog" aria-modal="true" aria-labelledby="modal-closure-sign-label">
       <div class="reveal__header">
         <%= content_tag :h3,
                         t("title", scope: "decidim.votings.polling_officer_zone.closures.sign"),
-                        class: "reveal__title" %>
+                        class: "reveal__title",
+                        id: "modal-closure-sign-label" %>
 
         <button class="close-button" data-close aria-label="<%= t("close_modal", scope: "decidim.votings.polling_officer_zone.closures.sign") %>" type="button">
           <span aria-hidden="true">×</span>

data/app/views/decidim/votings/polling_officer_zone/closures/edit.html.erb

@@ -39,7 +39,7 @@
                   data: { open: "modal-closure-results-count-error" },
                   aria: {
                           controls:"modal-closure-results-count-error",
-                          haspopup: "true"
+                          haspopup: "dialog"
                         } %>
 <% end %>
 

data/app/views/decidim/votings/polling_officer_zone/closures/new.html.erb

@@ -48,7 +48,7 @@
 
               <%= render "modal_ballots_count_error", form: form %>
 
-              <button id="btn-modal-closure-count-error" class="button button--sc expanded mt-sm mb-none hide" data-open="modal-closure-count-error" aria-controls="modal-closure-count-error" aria-haspopup="true" tabindex="0">
+              <button id="btn-modal-closure-count-error" class="button button--sc expanded mt-sm mb-none hide" data-open="modal-closure-count-error" aria-controls="modal-closure-count-error" aria-haspopup="dialog" tabindex="0">
                 <%= t(".submit") %>
               </button>
             <% end %>

data/app/views/decidim/votings/polling_officer_zone/in_person_votes/new.html.erb

@@ -18,4 +18,4 @@
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_in_person_vote", integrity: true %>
+<%= javascript_pack_tag "decidim_votings_in_person_vote" %>

data/app/views/decidim/votings/polling_officer_zone/in_person_votes/show.html.erb

@@ -22,4 +22,4 @@
   <%= form_tag polling_officer_election_in_person_vote_path(polling_officer, election, in_person_vote), method: :patch, class: "update_vote_status" %>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_in_person_vote", integrity: true %>
+<%= javascript_pack_tag "decidim_votings_in_person_vote" %>

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

@@ -1,5 +1,5 @@
 <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",
@@ -8,9 +8,9 @@
   </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">

data/app/views/decidim/votings/votings/_promoted_voting.html.erb

@@ -5,7 +5,7 @@
         <%= link_to voting_path(promoted_voting), class: "card__link" do %>
           <h2 class="card__title"><%= translated_attribute promoted_voting.title %></h2>
         <% end %>
-        <%= decidim_sanitize html_truncate(translated_attribute(promoted_voting.description), length: 630, separator: "...") %>
+        <%= decidim_sanitize_editor html_truncate(translated_attribute(promoted_voting.description), length: 630, separator: "...") %>
         <%= link_to voting_path(promoted_voting), class: "button small hollow card__button" do %>
           <%= t("votings.promoted_voting.more_info", scope: "layouts.decidim") %>
         <% end %>

data/config/assets.rb

@@ -8,6 +8,7 @@ Decidim::Webpacker.register_entrypoints(
   decidim_elections_election_log: "#{base_path}/app/packs/entrypoints/decidim_elections_election_log.js",
   decidim_elections_onboarding: "#{base_path}/app/packs/entrypoints/decidim_elections_onboarding.js",
   decidim_elections_admin_pending_action: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_pending_action.js",
+  decidim_elections_admin_trustees_process: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_trustees_process.js",
   decidim_elections_admin_vote_statistics: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_vote_statistics.js",
   decidim_elections_trustee_key_ceremony: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_key_ceremony.js",
   decidim_elections_trustee_tally: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_tally.js",

data/config/locales/ar.yml

@@ -1 +1,13 @@
 ar:
+  decidim:
+    elections:
+      trustee_zone:
+        trustees:
+          show:
+            identification_keys:
+              cancel: إلغاء
+    votings:
+      polling_officer_zone:
+        closures:
+          sign:
+            cancel: إلغاء

data/config/locales/ca.yml

@@ -253,8 +253,8 @@ ca:
             title: Elecció creada
             trustees: Garants
           key_ceremony:
+            continue: Continuar
             title: Cerimònia de claus
-            trustees: Garants
           key_ceremony_ended:
             errors:
               time_before: L'elecció està llesta per començar. Has d'esperar fins a %{hours} hores abans de l'hora d'inici (%{start_time}) per iniciar el període de votació.
@@ -274,8 +274,14 @@ ca:
             submit: Enviar
             title: Resultats publicats
           tally:
+            continue: Continuar
+            invalid: S'ha produït un error en notificar l'absència de la garant
+            mark_as_missing: Marcar com absent
+            mark_as_missing_description: Totes les garants haurien de participar en aquest procés, però si una garant no en pot prendre part, la pots marcar com a absent.
+            success: La notificació d'absència de la garant ha estat enviada correctament
+            tally_completion: El procés es completarà quan totes les garants estiguin actives o marcades com a absents. Fan falta com un mínim de %{quorum} garant per a completar el procés.
             title: Procés de recompte
-            trustees: Garants
+            undo_mark_as_missing: Una garant marcada com a absent per error podrà participar abans de la finalització del procés. Pot actuar com de costum i la seva absència serà ignorada.
           tally_ended:
             answer: Resposta
             not_selected: No seleccionat
@@ -328,14 +334,20 @@ ca:
             success: El garant %{trustee} s'ha actualitzat correctament
       admin_log:
         election:
-          end_vote: "%{user_name} ha finalittzat el període de votació per l'elecció %{resource_name} al Bulletin Board"
-          publish: "%{user_name} ha publicat la votació %{resource_name}"
-          publish_results: "%{user_name} ha publicat els resultats de l'elecció %{resource_name} al Bulletin Board"
-          setup: "%{user_name} ha creat l'elecció %{resource_name} al Bulletin Board"
-          start_key_ceremony: "%{user_name} va començar la cerimònia de claus per l'elecció %{resource_name} al Bulletin Board"
-          start_tally: "%{user_name} ha iniciat el recompte per a l'elecció %{resource_name} al Bulletin Board"
-          start_vote: "%{user_name} ha iniciat el període de votació per a l'elecció %{resource_name} al Bulletin Board"
-          unpublish: "%{user_name} ha despublicat la votació %{resource_name}"
+          create: "%{user_name} ha creat l'elecció %{resource_name} a %{space_name}"
+          delete: "%{user_name} ha eliminat l'elecció %{resource_name} a %{space_name}"
+          end_vote: "%{user_name} ha tancat el període de votació per a l'elecció %{resource_name} a %{space_name}"
+          publish: "%{user_name} ha publicat l'elecció %{resource_name} a %{space_name}"
+          publish_results: "%{user_name} ha publicat els resultats de l'elecció %{resource_name} a %{space_name}"
+          report_missing_trustee: "%{user_name} ha notificat %{trustee_name} com a absent durant el recompte de les eleccions %{resource_name} a %{space_name}"
+          setup: "%{user_name} ha creat l'elecció %{resource_name} a %{space_name}"
+          start_key_ceremony: "%{user_name} ha iniciat la cerimònia de claus per l'elecció %{resource_name} a %{space_name}"
+          start_tally: "%{user_name} ha iniciat el recompte de l'elecció %{resource_name} a %{space_name}"
+          start_vote: "%{user_name} ha iniciat el període de votació per a l'elecció %{resource_name} a %{space_name}"
+          unpublish: "%{user_name} ha despublicat l'elecció %{resource_name} a %{space_name}"
+          update: "%{user_name} ha actualitzat l'elecció %{resource_name} a %{space_name}"
+        trustee:
+          create: "%{user_name} ha assignat a la usuària %{trustee_user} com a garant"
       election_m:
         badge_name:
           finished: Acabada
@@ -343,6 +355,10 @@ ca:
           upcoming: Properes
         end_date: Finalitza
         footer:
+          remaining_time:
+            one: "Queden <strong>%{count} hora %{minutes} minuts</strong> per votar."
+            other: "Queden <strong>%{count} hores %{minutes} minuts</strong> per votar."
+            zero: "Queden <strong>%{minutes} minuts</strong> per votar."
           view: Veure
           vote: Votar
         label:
@@ -988,6 +1004,24 @@ ca:
             invalid: S'ha produït un error en actualitzar aquesta votació
             success: La votació s'ha actualitzat correctament
       admin_log:
+        ballot_style:
+          create: "%{user_name} ha creat un estil de papereta amb codi %{ballot_style_code} a l'espai %{space_name}"
+          delete: "%{user_name} ha eliminat l'estil de papereta amb codi %{ballot_style_code} a l'espai %{space_name}"
+          update: "%{user_name} ha actualitzat l'estil de papereta amb codi %{ballot_style_code} a l'espai %{space_name}"
+        census:
+          create: "%{user_name} ha creat el cens per l'espai %{space_name}"
+          delete: "%{user_name} ha eliminat el cens per l'espai %{space_name}"
+          update: "%{user_name} ha actualitzat el cens per l'espai %{space_name}"
+        monitoring_committee_member:
+          create: "%{user_name} ha assignat a la usuària %{monitoring_committee_member_user} com a membre de la comissió de seguiment a l'espai %{space_name}"
+          delete: "%{user_name} desassignat a la usuària %{monitoring_committee_member_user} com a membre de la comissió de seguiment a l'espai %{space_name}"
+        polling_officer:
+          create: "%{user_name} ha assignat a la usuària %{polling_officer_user} com a gestora de mesa a l'espai %{space_name}"
+          delete: "%{user_name} ha desassignat a la usuària %{polling_officer_user} com a gestora de mesa a l'espai %{space_name}"
+        polling_station:
+          create: "%{user_name} ha creat el punt de votació %{resource_name} a l'espai %{space_name}"
+          delete: "%{user_name} ha eliminat el punt de votació %{resource_name} a l'espai %{space_name}"
+          update: "%{user_name} ha actualitzat el punt de votació %{resource_name} a l'espai %{space_name}"
         voting:
           create: "%{user_name} ha creat la votació %{resource_name}"
           publish: "%{user_name} ha publicat la votació %{resource_name}"
@@ -997,7 +1031,7 @@ ca:
           census:
             create:
               invalid: Hi ha hagut un error en pujar el cens, prova-ho de nou més tard.
-              invalid_csv_header: La capçalera CSV no té el nombre correcte de camps. Consulta les instruccions amb atenció
+              invalid_csv_header: Les capçaleres al CSV manquen o no son correctes. Si us plau, rellegeix atentament les instruccions
             creating_data:
               info_message: "<strong>Si us plau espera</strong>, processades %{processed_count} de %{raw_count} fileres al fitxer de %{file}."
             delete: