decidim-elections 0.31.0.rc1 → 0.31.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964c1cb8bdbc697caa2249a77c682922a0f86c40991fdb82764a87aab5571e5d
-  data.tar.gz: 3c70711e52d4da42332d93dc788169af7da4c7c8881fe00745a9510320a8a590
+  metadata.gz: 1350982617f9cf2b5417179740fe67d319fd01e74c85fbcc823f092d78b23923
+  data.tar.gz: 29788cfe9ee20c68fbbd6739baee65968c98c1ed3daf344e11634ba3f458687e
 SHA512:
-  metadata.gz: 10695624537f8c405989c17ded7f678af45980ee351bacf122e642a8bcad349927be80af7beb03908d363c9652b946722c2314e8419d35797dd45e7bedf1809d
-  data.tar.gz: ee3232a438080cc45f64b6c563f5121d8495812f9cad611fde725429ac8a67e7a239edace584bce7fc03c3ad26a552b37b1f91b7cdd8afbb1984dbac5db8bee9
+  metadata.gz: 3535497567d41f0d365331a63ffb3aa2f751bcef39460de3f9c3ab377f64e0be9011f85748b819f4910141bdcfbd5ff506b96d11ba3d52d71175571381b80f91
+  data.tar.gz: 07cfca093845a3378687f949072ac9a16fcace3ce766e1bbe6be70922db0dc04b8380c3c44fa67d867802766ef5cf1800dd164d9937889ec8c375be1140e3526

data/app/cells/decidim/elections/election_card_metadata_cell.rb

@@ -6,6 +6,7 @@ module Decidim
     class ElectionCardMetadataCell < Decidim::CardMetadataCell
       include Decidim::LayoutHelper
       include ActionView::Helpers::DateHelper
+      include Decidim::Elections::LabelHelper
 
       alias election model
 
@@ -22,9 +23,7 @@ module Decidim
       end
 
       def label
-        {
-          text: content_tag("span", t(election.status, scope: "decidim.elections.status"), class: "#{election.status} label")
-        }
+        { text: election_status_with_label(election) }
       end
 
       def current_date

data/app/helpers/decidim/elections/admin/elections_helper.rb

@@ -5,6 +5,7 @@ module Decidim
     module Admin
       module ElectionsHelper
         include Decidim::ApplicationHelper
+        include Decidim::Elections::LabelHelper
 
         def census_count(election)
           election.census&.count(election).to_i
@@ -24,12 +25,6 @@ module Decidim
           election.census.user_presenter.constantize.new(user)
         end
 
-        def election_status_with_label(election)
-          content_tag(:span,
-                      I18n.t("decidim.elections.status.#{election.status}"),
-                      class: "#{election.status} label")
-        end
-
         def election_status_action_data(election)
           if election.scheduled? && election.manual_start?
             {

data/app/helpers/decidim/elections/label_helper.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # Helpers to render the states as labels on Elections (ongoing, finished, unpublished)
+    module LabelHelper
+      def election_status_with_label(election)
+        css_class = case election.status
+                    when :ongoing
+                      "warning"
+                    when :finished
+                      "success"
+                    when :unpublished
+                      "alert"
+                    else
+                      "reverse"
+                    end
+
+        content_tag(:span,
+                    I18n.t("decidim.elections.status.#{election.status}"),
+                    class: "#{css_class} label")
+      end
+    end
+  end
+end

data/app/packs/entrypoints/decidim_elections.scss

@@ -1,3 +1,2 @@
 @import "stylesheets/decidim/elections/elections.scss";
-@import "stylesheets/decidim/elections/labels.scss";
 @import "stylesheets/decidim/elections/live_results_update.scss";

data/app/packs/entrypoints/decidim_elections_admin.scss

@@ -1,2 +1 @@
-@import "stylesheets/decidim/elections/labels.scss";
 @import "stylesheets/decidim/elections/live_results_update.scss";

data/app/views/decidim/elections/admin/census/edit.html.erb

@@ -1,10 +1,6 @@
 <%= append_javascript_pack_tag "decidim_elections_admin" %>
 
-<%= render "decidim/elections/admin/elections/tabs_menu" do %>
-  <%= button_tag t("save", scope: "decidim.elections.admin.elections.form"), class: "main-tabs-menu__cta-button #{"hide" unless election.census}", form: "census-election-form" %>
-<% end %>
-
-<div class="item_show__header form-defaults">
+<div class="item_show__header form-defaults border-none">
   <h1 class="item_show__header-title">
     <%= t(".title") %>
   </h1>
@@ -14,6 +10,9 @@
                  id: "census-manifest-selector" %>
 
 </div>
+
+<%= render "decidim/elections/admin/elections/tabs_menu" %>
+
   <% if election.census_ready? %>
    <%
     census_ready = t("decidim.elections.censuses.census_ready_html", election_title: decidim_sanitize_translated(election.title))
@@ -21,7 +20,7 @@
    %>
     <%= cell "decidim/announcement", "#{census_ready}<br>#{census_count}", callout_class: "success" %>
    <% end %>
-<div class="card-section census-form form-defaults">
+<div class="card-section census-form form-defaults 2xl:mr-80">
   <% if @form && election.census&.admin_form_partial %>
     <%= decidim_form_for(@form, url: election_census_path(election, manifest: election.census&.name), method: :patch, multipart: true, html: { id: "census-election-form" }) do |f| %>
       <%= render partial: election.census.admin_form_partial, locals: { form: f } %>
@@ -31,3 +30,9 @@
     <%= render partial: "decidim/elections/admin/census/preview", locals: { election: } if preview_users(election).present? %>
   </div>
 </div>
+
+<div class="item__edit-sticky">
+  <div class="item__edit-sticky-container">
+    <%= button_tag t("save", scope: "decidim.elections.admin.elections.form"), class: "button button__sm button__secondary #{"hide" unless election.census}", form: "census-election-form" %>
+  </div>
+</div>

data/app/views/decidim/elections/admin/dashboard/_calendar.html.erb

@@ -2,12 +2,6 @@
   <div class="card-divider">
     <h2 class="card-title justify-between">
         <span class="text-black font-bold"><%= t("decidim.elections.admin.dashboard.calendar.title") %></span>
-      <% if (action_data = election_status_action_data(election)) %>
-        <%= form_with url: update_status_election_path(election), method: :put, local: true do %>
-          <%= hidden_field_tag :status_action, action_data[:status_action] %>
-          <%= button_tag action_data[:label], class: "button button__xs button__secondary small" %>
-        <% end %>
-      <% end %>
     </h2>
   </div>
 
@@ -30,3 +24,13 @@
     </div>
   </div>
 </div>
+<div class="item__edit-sticky">
+  <div class="item__edit-sticky-container">
+    <% if (action_data = election_status_action_data(election)) %>
+      <%= form_with url: update_status_election_path(election), method: :put, local: true do %>
+        <%= hidden_field_tag :status_action, action_data[:status_action] %>
+        <%= button_tag action_data[:label], class: "button button__sm button__secondary" %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -3,17 +3,12 @@
 <% append_javascript_pack_tag "decidim_elections_admin" %>
 <% append_stylesheet_pack_tag "decidim_elections_admin" %>
 
-<%= render "decidim/elections/admin/elections/tabs_menu" do %>
+<div class="item_show__header" style="border-bottom: none;">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+
   <div>
-    <% if allowed_to?(:publish, :election, election:) %>
-      <%= link_to publish_election_path(election),
-                  method: :put,
-                  class: "button button__xs button__secondary",
-                  data: { confirm: t("publish_confirm", scope: "decidim.elections.admin.dashboard") } do %>
-                  <%= icon "check-line" %>
-                  <%= t("publish", scope: "decidim.elections.admin.elections.form") %>
-      <% end %>
-    <% end %>
     <%= link_to resource_locator(election).path, class: "button button__xs button__transparent-secondary", target: :blank, data: { "external-link": false } do %>
       <%= icon "eye-line" %>
       <%# i18n-tasks-use t("decidim.elections.actions.view") %>
@@ -21,9 +16,11 @@
       <%= t(election.published? ? "view" : "preview", scope: "decidim.elections.actions") %>
     <% end %>
   </div>
-<% end %>
+</div>
 
-<div class="item__edit-form">
+<%= render "decidim/elections/admin/elections/tabs_menu" %>
+
+<div class="item__edit-form 2xl:mr-80">
   <% if election.published? %>
     <div class="flex flex-col md:flex-row gap-4 w-full mb-10">
       <div class="flex-1"><%= render partial: "decidim/elections/admin/dashboard/status" %></div>
@@ -37,3 +34,18 @@
     <%= render partial: "decidim/elections/admin/dashboard/census" %>
   <% end %>
 </div>
+<% unless election.published? %>
+  <div class="item__edit-sticky">
+    <div class="item__edit-sticky-container">
+      <% if allowed_to?(:publish, :election, election:) %>
+        <%= link_to publish_election_path(election),
+                    method: :put,
+                    class: "button button__sm button__secondary",
+                    data: { confirm: t("publish_confirm", scope: "decidim.elections.admin.dashboard") } do %>
+                    <%= icon "check-line" %>
+                    <%= t("publish", scope: "decidim.elections.admin.elections.form") %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -3,9 +3,13 @@
 <% append_javascript_pack_tag "decidim_elections_admin" %>
 <% append_stylesheet_pack_tag "decidim_elections_admin" %>
 
-<%= render "decidim/elections/admin/elections/tabs_menu" do %>
-  <%= button_tag t("save", scope: "decidim.elections.admin.elections.form"), class: "main-tabs-menu__cta-button", form: "basic-election-form-edit" %>
-<% end %>
+<div class="item_show__header" style="border-bottom: none;">
+    <h1 class="item_show__header-title">
+      <%= t(".title") %>
+    </h1>
+</div>
+
+<%= render "decidim/elections/admin/elections/tabs_menu" %>
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
@@ -13,4 +17,10 @@
       <%= render partial: "form", object: f %>
     <% end %>
   </div>
+
+  <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <%= button_tag t("save", scope: "decidim.elections.admin.elections.form"), class: "button button__sm button__secondary", form: "basic-election-form-edit" %>
+      </div>
+    </div>
 </div>

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

@@ -3,19 +3,24 @@
 <% append_javascript_pack_tag "decidim_elections_admin" %>
 <% append_stylesheet_pack_tag "decidim_elections_admin" %>
 
-<%= render "decidim/elections/admin/elections/tabs_menu" do %>
-  <%= button_tag t("save", scope: "decidim.elections.admin.elections.form"), class: "main-tabs-menu__cta-button", form: "basic-election-form-new" %>
-<% end %>
-
 <div class="item_show__header">
   <h1 class="item_show__header-title">
     <%= t(".title") %>
   </h1>
 </div>
+
+<%= render "decidim/elections/admin/elections/tabs_menu" %>
+
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, html: { id: "basic-election-form-new", class: "form-defaults form new_election" }) do |f| %>
       <%= render partial: "form", object: f %>
     <% end %>
+
+    <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <%= button_tag t("save", scope: "decidim.elections.admin.elections.form"), class: "button button__sm button__secondary", form: "basic-election-form-new" %>
+      </div>
+    </div>
   </div>
 </div>

data/app/views/decidim/elections/admin/questions/_form.html.erb

@@ -16,7 +16,7 @@
     <%= render "decidim/elections/admin/questions/response_option_template", form: question_form, editable: true, template_id: "response-option-template-dummy" %>
   <% end %>
 
-  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0">
+  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0" data-draggable-table data-sort-url="#" id="questionnaire-questions-list">
     <% @form.questions.each_with_index do |question, index| %>
       <%= fields_for "questions[]", question do |question_form| %>
         <%= render "decidim/elections/admin/questions/question",
@@ -35,5 +35,34 @@
 <script>
   document.addEventListener("turbo:load", function () {
     window.Decidim.createEditableForm();
+
+    // Function to initialize the sortable functionality
+    function initializeSortable() {
+      const container = document.querySelector("#questionnaire-questions-list");
+      const questionCards = container?.querySelectorAll(".card.questionnaire-question");
+
+      if (!container || !questionCards?.length) return;
+
+      questionCards.forEach(card => {
+        card.setAttribute("draggable", "true");
+        card.setAttribute("role", "option");
+        card.setAttribute("aria-grabbed", "false");
+      });
+
+      window.Decidim?.createSortableList?.("#questionnaire-questions-list");
+    }
+
+    // Initialize on load and when new options such as questions etc are added
+    initializeSortable();
+
+    const observer = new MutationObserver(() => {
+      clearTimeout(observer.timer);
+      observer.timer = setTimeout(initializeSortable, 500);
+    });
+
+    const container = document.querySelector("#questionnaire-questions-list");
+    if (container) {
+      observer.observe(container, { childList: true, subtree: true });
+    }
   });
 </script>

data/app/views/decidim/elections/admin/questions/_question.html.erb

@@ -25,16 +25,6 @@
           </button>
 
           <% if editable %>
-            <button class="button button__xs button__transparent-secondary small alert move-up-question button--title">
-              <%= icon("arrow-up-line") %>
-              <span class="hidden md:block"><%= t("up", scope: "decidim.forms.admin.questionnaires.question") %></span>
-            </button>
-
-            <button class="button button__xs button__transparent-secondary small alert move-down-question button--title">
-              <%= icon("arrow-down-line") %>
-              <span class="hidden md:block"><%= t("down", scope: "decidim.forms.admin.questionnaires.question") %></span>
-            </button>
-
             <button class="button button__xs button__transparent-secondary small alert remove-question button--title" data-confirm="<%= t("remove_question_confirm", scope: "decidim.elections.admin.questions.edit_questions") %>">
               <%= icon "delete-bin-line" %>
               <span class="hidden md:block"><%= t("remove", scope: "decidim.forms.admin.questionnaires.question") %></span>

data/app/views/decidim/elections/admin/questions/edit_questions.html.erb

@@ -1,22 +1,29 @@
 <% add_decidim_page_title(t(".title")) %>
 
-<%= render "decidim/elections/admin/elections/tabs_menu" do %>
-  <%= button_tag t("save", scope: "decidim.elections.admin.elections.form"), class: "main-tabs-menu__cta-button", form: "questions-election-form" %>
-<% end %>
-
 <div class="questionnaire-questions">
+  <div class="item_show__header" style="border-bottom: none;">
+    <h1 class="item_show__header-title">
+      <%= t(".title") %>
+      <button class="button button__sm button__transparent-secondary add-question"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.form") %></button>
+    </h1>
+  </div>
+
   <div class="row column">
     <%= cell "decidim/announcement", t("decidim.elections.admin.questions.form.form_description") %>
   </div>
 
-    <div class="grid-cols-1">
-      <div class="item__edit-form">
+  <%= render "decidim/elections/admin/elections/tabs_menu" %>
+
+  <div class="grid-cols-1 2xl:mr-80">
+    <div class="item__edit-form">
       <%= decidim_form_for(@form, url: update_url, method: :put, html: { id: "questions-election-form", class: "form-defaults form edit_questions" }) do |form| %>
         <%= render partial: "decidim/elections/admin/questions/form", object: form %>
       <% end %>
 
-      <div class="mt-2">
-        <button class="button button__sm button__transparent-secondary add-question"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.form") %></button>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= button_tag t("save", scope: "decidim.elections.admin.elections.form"), class: "button button__sm button__secondary", form: "questions-election-form" %>
+        </div>
       </div>
     </div>
   </div>

data/config/locales/ca-IT.yml

@@ -22,7 +22,7 @@ ca-IT:
           create: Crear
           destroy: Destruir
           update: Actualitzar
-        name: Votacions
+        name: Eleccions
         settings:
           global:
             announcement: Avís
@@ -132,7 +132,7 @@ ca-IT:
             save: Desa i continua
             start_at: Dia i hora d'inici
           index:
-            title: Votacions
+            title: Eleccions
           manage_trash:
             title: Eleccions eliminades
           new:

data/config/locales/ca.yml

@@ -22,7 +22,7 @@ ca:
           create: Crear
           destroy: Destruir
           update: Actualitzar
-        name: Votacions
+        name: Eleccions
         settings:
           global:
             announcement: Avís
@@ -132,7 +132,7 @@ ca:
             save: Desa i continua
             start_at: Dia i hora d'inici
           index:
-            title: Votacions
+            title: Eleccions
           manage_trash:
             title: Eleccions eliminades
           new:

data/config/locales/cs.yml

@@ -8,6 +8,7 @@ cs:
     admin:
       menu:
         elections_menu:
+          basic_elections: Hlavní
           election_census: Seznam obyvatel
           election_dashboard: Ovládací panel
           election_questions: Otázky
@@ -39,7 +40,11 @@ cs:
         dashboard:
           calendar:
             end_at: 'Čas ukončení:'
+            end_election: Ukončit volby
+            manual_start: Ručně
+            published_results_at: Výsledky zveřejněny na
             start_at: 'Čas zahájení:'
+            start_election: Zahájit volbu
             title: Kalendář
           census:
             title: Seznam obyvatel
@@ -55,6 +60,7 @@ cs:
           questions:
             labels:
               answers: Odpovědi
+            limit_info: Tyto volby mají více otázek. Náhled je omezen na 3 otázky.
             title: Otázky
           questions_table:
             answer: Odpovědi
@@ -63,6 +69,7 @@ cs:
           results:
             not_started: Volba ještě nezačala.
             publish_button: Publikovat výsledky
+            start_question_button: Povolit hlasování
             title: Výsledky
           status:
             title: Stav voleb
@@ -85,7 +92,9 @@ cs:
             publish: Publikovat
             results_availability:
               after_end: Po ukončení voleb
+              real_time: V reálném čase
               title: Dostupnost výsledků
+            save: Uložit a pokračovat
             start_at: Čas zahájení
           index:
             title: Volby
@@ -119,6 +128,7 @@ cs:
         internal_users:
           already_have_an_account?: Již máte účet?
           are_you_new?: Nový účastník?
+          sign_in_description: Přihlaste se k hlasování v těchto volbách
         token_csv:
           upload_file: Nahrát soubor
           upload_new_census: Nahrát CSV soubor
@@ -143,8 +153,12 @@ cs:
           state_values:
             finished: Dokončeno
             ongoing: Probíhající
+            scheduled: Naplánováno
         orders:
+          end_at: Datum ukončení
+          label: Seřadit podle
           recent: Nedávné
+          start_at: Datum zahájení
         questions:
           title: Volební otázky
         show:
@@ -159,15 +173,29 @@ cs:
             start_at: Čas zahájení
             status: Stav
             title: Název
+      per_question_votes:
+        waiting:
+          edit_vote: Upravte svůj hlas
       status:
         active: Aktivní
         finished: Dokončeno
         not_started: Nezahájeno
         ongoing: Probíhající
+        scheduled: Naplánováno
         unpublished: Nezveřejněno
+        voting_enabled: Probíhá hlasování
       votes:
+        cast:
+          invalid: Při odesílání vašeho hlasu došlo k chybě. Zkontrolujte zadané údaje a zkuste to znovu.
+          success: Váš hlas byl úspěšně odeslán.
+        check_census:
+          access: Přístup
+          failed: Vaši identitu nelze ověřit. Zkontrolujte zadané informace a zkuste to znovu.
+          form_title: Ověřte svou identitu
         confirm:
+          not_answered: Na tuto otázku jste neodpověděl.
           title: Potvrďte svůj hlas
+        not_authorized: V těchto volbách nemáte oprávnění volit.
         question:
           back: Zpět
           next: Další

data/config/locales/es.yml

@@ -22,7 +22,7 @@ es:
           create: Crear
           destroy: Eliminar
           update: Actualizar
-        name: Votaciones
+        name: Elecciones
         settings:
           global:
             announcement: Aviso

data/config/locales/fr-CA.yml

@@ -43,6 +43,10 @@ fr-CA:
           edit:
             created_at: Créée le
             identifier: Identifiant de l'utilisateur
+          preview:
+            title:
+              one: La liste de prévisualisation est limitée à %{count} enregistrement.
+              other: La liste de prévisualisation est limitée à %{count} enregistrements.
           update:
             error: Il y a eu une erreur lors de la génération ou de l'enregistrement du recensement.
             success: Recensement mis à jour avec succès.

data/config/locales/fr.yml

@@ -43,6 +43,10 @@ fr:
           edit:
             created_at: Créée le
             identifier: Identifiant de l'utilisateur
+          preview:
+            title:
+              one: La liste de prévisualisation est limitée à %{count} enregistrement.
+              other: La liste de prévisualisation est limitée à %{count} enregistrements.
           update:
             error: Il y a eu une erreur lors de la génération ou de l'enregistrement du recensement.
             success: Recensement mis à jour avec succès.

data/config/locales/ja.yml

@@ -105,6 +105,7 @@ ja:
             invalid: 選挙の作成中に問題がありました。
             success: 選挙を作成しました。
           dashboard:
+            subtitle: '最終ステップ：入力内容を確認してください。公開前に修正を加えることが可能です。公開後も、選挙の説明内容を更新することができます。'
             title: ダッシュボード
           edit:
             title: 選挙を編集
@@ -184,8 +185,24 @@ ja:
         census_size_html:
           other: 現在、 <strong>%{count}</strong> の投票対象者がこの選挙に参加しています（センサスで変更される可能性があります）。
         internal_users:
+          already_have_an_account?: すでにアカウントをお持ちですか？
+          are_you_new?: 新しい参加者ですか？
+          info_html: |
+            選挙への参加を、認証済みの参加者のみに限定することができます。<br>
+            投票するには、参加者は選択した権限を満たす必要があります。すべてのチェックボックスを空のままにすると、登録済みの全員の投票が可能になります。
           internal_type_title: 投票するための追加の必要な権限 (任意)
           label: 登録済み参加者（動的）
+          sign_in_description: この選挙に投票するにはログインしてください
+          sign_up_description: この選挙に投票するアカウントを作成する
+        internal_users_form:
+          authorization_options_invalid: 残念ながら、必要なすべての権限を持っていても、今回の選挙では一部の権限が有効ではありません。
+          exit_button: 投票ブースを出る
+          invalid: この選挙で投票する権限がありません。
+          missing: ユーザーには必要な権限が逃しています。情報を確認してから、もう一度やり直してください。
+          not_authorized: '"%{adapter}" 認証が必要な条件に一致しません。'
+          not_granted: '"%{adapter}" 認証は許可されていません。'
+          resume_with_method: '%{name} で本人確認を再開'
+          verify_with_method: '%{name} で本人確認する'
         token_csv:
           example: |
             email;token
@@ -200,25 +217,44 @@ ja:
           upload_new_census: CSVファイルをアップロードする
         token_csv_form:
           email: Eメールアドレス
+          email_placeholder: 投票者のメールアドレスを入力してください
+          invalid: メールまたはトークンが無効です。詳細を確認して、もう一度お試しください。
+          token: トークン
+          token_placeholder: 投票者のトークンを入力してください
       elections:
         count:
           elections_count:
             other: "%{count} 選挙"
+        elections:
+          empty: 利用可能な選挙はありません。
+          empty_filters: フィルターに一致する選挙はありません。
         filters:
           all: 全て
           state: ステータス：
           state_values:
             finished: 完了
             ongoing: 進行中
+            scheduled: スケジュール済み
         orders:
+          end_at: 終了日
+          label: ソート順
           recent: 新しい
+          start_at: 開始日
         questions:
+          subtitle: 'この投票プロセスに関する質問です：'
           title: 選挙の質問
         show:
+          active_voting_until: '有効な投票まで: %{end_date}'
           vote_button: 投票
+          voted: すでに投票済みです。再度投票することは可能ですが、最後に投票した内容のみが集計対象となります。
           votes_count:
             other: "%{count}票"
+          voting_began: '%{start_date} に投票が開始します'
         vote_results:
+          subtitle:
+            after_end: 選挙は終了しました。結果を確認できます。
+            per_question: 結果は質問ごとに確認できます。投票が有効化され、結果が公開されると、各質問の結果を確認できるようになります。
+            real_time: 結果はリアルタイムで確認できます。投票が行われている間も結果を閲覧可能です。
           title: 結果
       models:
         election:
@@ -228,20 +264,48 @@ ja:
             start_at: 開始日時
             status: ステータス：
             title: タイトル
+      per_question_votes:
+        waiting:
+          description: 次の質問が利用可能になるまでここでお待ちいただけます。準備が整い次第、自動的に次の質問にリダイレクトされます。
+          edit_vote: 投票を編集
+          exit_button: 待合室を出る
+          title: 次の質問を待っています
       status:
         active: 有効
         finished: 完了
         not_started: 開始前
         ongoing: 進行中
+        published_results: 公開結果
         scheduled: スケジュール済み
         unpublished: 未公開
         voting_enabled: 投票中
       votes:
+        cast:
+          invalid: 投票時に問題が発生しました。入力した情報を確認して、もう一度お試しください。
+          success: 投票は正常に行われました。
+        check_census:
+          access: アクセス
+          election_not_open: 選挙はまだ開始されていません。日付を確認してから再度お試しください。
+          failed: 本人確認ができませんでした。入力した情報を確認して、もう一度お試しください。
+          form_title: 本人確認を行う
+          invalid: ユーザーがセンサスに見つかりません。
         confirm:
+          cast_vote: 投票
+          edit_vote: 投票を編集
+          not_answered: この質問に答えていません。
           title: 投票を確定
+        not_authorized: あなたはこの選挙に投票する権限がありません。
         question:
           back: 戻る
+          cast_vote: 投票
           next: 次へ
+        receipt:
+          description: 投票期間中はいつでも再投票が可能です。以前の投票結果は新しい投票結果で上書きされます。
+          exit_button: 投票ブースを出る
+          title: 投票は正常に行われました
+    metadata:
+      progress:
+        published_results: '結果が公開されました: %{end_date}'
     statistics:
       elections_count: 選挙
   layouts:

data/lib/decidim/elections/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     def self.version
-      "0.31.0.rc1"
+      "0.31.0.rc2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-elections
 version: !ruby/object:Gem::Version
-  version: 0.31.0.rc1
+  version: 0.31.0.rc2
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-25 00:00:00.000000000 Z
+date: 2025-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc1
+        version: 0.31.0.rc2
 description: A module that aims to provide a set of tools to create elections in Decidim.
 email:
 - ivan@pokecode.net
@@ -139,6 +139,7 @@ files:
 - app/forms/decidim/elections/censuses/token_csv_form.rb
 - app/helpers/decidim/elections/admin/elections_helper.rb
 - app/helpers/decidim/elections/application_helper.rb
+- app/helpers/decidim/elections/label_helper.rb
 - app/models/decidim/elections/application_record.rb
 - app/models/decidim/elections/csv_census/data.rb
 - app/models/decidim/elections/election.rb
@@ -156,7 +157,6 @@ files:
 - app/packs/src/decidim/elections/live_results_update.js
 - app/packs/src/decidim/elections/waiting_room.js
 - app/packs/stylesheets/decidim/elections/elections.scss
-- app/packs/stylesheets/decidim/elections/labels.scss
 - app/packs/stylesheets/decidim/elections/live_results_update.scss
 - app/permissions/decidim/elections/admin/permissions.rb
 - app/permissions/decidim/elections/permissions.rb

data/app/packs/stylesheets/decidim/elections/labels.scss

@@ -1,13 +0,0 @@
-.label {
-  &.finished {
-    @apply bg-[var(--bg-success)] text-[var(--success)];
-  }
-
-  &.ongoing {
-    @apply bg-[var(--bg-warning)] text-[var(--warning)];
-  }
-
-  &.scheduled {
-    @apply bg-neutral-200 text-neutral-900;
-  }
-}