decidim-elections 0.26.2 → 0.26.4

data/config/locales/lv.yml

@@ -12,7 +12,6 @@ lv:
         start_time: Balsošanas sākas plkst.
         title: Nosaukums
       question:
-        description: Apraksts
         max_selections: Maksimālais izvēļu skaits
         title: Nosaukums
     errors:

data/config/locales/nl.yml

@@ -12,7 +12,6 @@ nl:
         start_time: Stemming begint om
         title: Aanspreektitel
       question:
-        description: Beschrijving
         max_selections: Maximum aantal selecties
         title: Aanspreektitel
       voting:
@@ -205,7 +204,6 @@ nl:
               minimum_answers: Vragen moeten <strong>minstens twee antwoorden</strong> hebben.
               minimum_questions: De stemronde <strong>moet ten minste één vraag</strong> hebben.
               published: De stemronde is <strong>niet gepubliceerd</strong>.
-              time_before: De starttijd van de stemronde is over <strong>minder dan 3 uur</strong>.
               trustees_number: De participatieve ruimte <strong>moet ten minste %{number} trustees met publieke sleutel</strong> hebben.
             invalid: Er is een fout opgetreden bij het aanmaken van deze stemronde
             no_trustees: Er zijn geen Trustees geconfigureerd voor deze participatieve ruimte
@@ -540,6 +538,8 @@ nl:
         failed:
           header: Stem mislukt
           lead: Je stem is niet uitgebracht!
+          modal:
+            close: Afsluiten
           text: Er is iets mis gegaan, probeer het alsjeblief nog een keer.
           try_again: Probeer opnieuw
         header:

data/config/locales/no.yml

@@ -12,7 +12,6 @@
         start_time: Stemmegivning starter
         title: Tittel
       question:
-        description: Beskrivelse
         max_selections: Maksimalt antall valg
         min_selections: Ingen av valgene over
         title: Tittel
@@ -227,7 +226,6 @@
               minimum_answers: Spørsmål må ha <strong>minst to svar</strong>.
               minimum_questions: Valget <strong>må ha minst ett spørsmål</strong>.
               published: Valget er <strong>og ikke publisert</strong>.
-              time_before: Starttiden er <strong>mindre enn 3 timer</strong> før valget starter.
               trustees_number: Deltakerområdet <strong>må ha minst %{number} tillitsmenn med offentlig nøkkel</strong>.
             invalid: Det oppstod et problem med opprettelsen av dette valget
             no_trustees: Det er ikke satt opp noen tillitsmenn for dette deltakelsesrommet
@@ -537,6 +535,9 @@
           feedback: Gi oss en tilbakemelding
           header: Avstemning bekreftet
           text: 'Du kan sjekke at stemmen din har blitt lagt til i stemmeboksen med følgende identifikator: <strong class="evote__poll-id">%{e_vote_poll_id}</strong>'
+        failed:
+          modal:
+            close: Lukk
         header:
           confirm: Bekreft stemmen din
           confirmed: Avstemning bekreftet

data/config/locales/oc-FR.yml

@@ -0,0 +1 @@
+oc:

data/config/locales/pl.yml

@@ -12,7 +12,6 @@ pl:
         start_time: Głosowanie rozpoczyna się o
         title: Tytuł
       question:
-        description: Opis
         max_selections: Maksymalna liczba opcji do wybrania
         min_selections: Żadna z powyższych opcji
         title: Tytuł
@@ -243,7 +242,6 @@ pl:
               minimum_answers: Pytania muszą mieć <strong>co najmniej dwie odpowiedzi</strong>.
               minimum_questions: Wybory <strong>muszą mieć co najmniej jedno pytanie</strong>.
               published: Wybory <strong>nie zostały opublikowane</strong>.
-              time_before: Godzina rozpoczęcia jest <strong>mniej niż 3 godziny</strong> przed rozpoczęciem wyborów.
               trustees_number: Przestrzeń partycypacyjna <strong>musi mieć co najmniej %{number} mężów (osób) zaufania z kluczem publicznym</strong>.
             invalid: Wystąpił problem z konfiguracją tych wyborów
             no_trustees: Nie skonfigurowano mężów (osób) zaufania dla tej przestrzeni partycypacyjnej
@@ -291,8 +289,13 @@ pl:
             title: Opublikowano wyniki
           tally:
             continue: Dalej
+            invalid: Wystąpił błąd podczas usuwania męża (osoby) zaufania
             mark_as_missing: Oznacz jako brakujący
+            mark_as_missing_description: Wszyscy mężowie zaufania powinni uczestniczyć w tym procesie, ale jeśli nie może wziąć udziału w tym procesie, możesz oznaczyć go jako brakujący.
+            success: Brakująca uwaga męża zaufania została pomyślnie wysłana do Tablicy
+            tally_completion: 'Proces zostanie zakończony, gdy wszyscy mężowie zaufania będą aktywni lub zostaną oznaczeni jako brakujący. Wymagana ilość mężów zaufania: %{quorum}.'
             title: Proces ustalania wyniku głosowania
+            undo_mark_as_missing: Przed zakończeniem procesu będzie mógł uczestniczyć mąż zaufania oznaczony jako brakujący omyłkowo. Mężowie zaufania mogą postępować jak zwykle, a oznaczenie jako "brakujący" zostanie zignorowane.
           tally_ended:
             answer: Odpowiedź
             not_selected: Nie wybrano
@@ -627,6 +630,8 @@ pl:
         failed:
           header: Oddanie głosu nie powiodło się
           lead: Twój głos nie został oddany!
+          modal:
+            close: Zamknij
           text: Coś poszło nie tak. Spróbuj ponownie.
           try_again: Spróbuj ponownie
         header:

data/config/locales/pt-BR.yml

@@ -12,7 +12,6 @@ pt-BR:
         start_time: Votação começa às
         title: Título
       question:
-        description: Descrição
         max_selections: Número máximo de seleções
         min_selections: Nenhuma das opções acima
         title: Título
@@ -227,7 +226,6 @@ pt-BR:
               minimum_answers: As perguntas devem ter <strong>pelo menos duas respostas</strong>.
               minimum_questions: A eleição <strong>deve ter pelo menos uma questão</strong>.
               published: A eleição <strong>não está publicada</strong>.
-              time_before: O horário de início é em <strong>menos de 3 horas</strong> antes do início da eleição.
               trustees_number: O espaço participativo <strong>deve ter pelo menos %{number} administradores com chave pública</strong>.
             invalid: Houve um problema ao configurar essa eleição
             no_trustees: Não há Agentes fiduciários configurados para este espaço participativo
@@ -601,6 +599,8 @@ pt-BR:
         failed:
           header: Votação falhou
           lead: Seu voto não foi transmitido!
+          modal:
+            close: Fechado
           text: Algo deu errado, por favor, tente novamente.
           try_again: Tente novamente
         header:

data/config/locales/pt.yml

@@ -12,7 +12,6 @@ pt:
         start_time: Votação inicia-se às
         title: Título
       question:
-        description: Descrição
         max_selections: Número máximo de seleções
         min_selections: Nenhuma das opções acima
         title: Título
@@ -227,7 +226,6 @@ pt:
               minimum_answers: As perguntas devem ter <strong>pelo menos duas respostas</strong>.
               minimum_questions: A eleição <strong>deve ter pelo menos uma pergunta</strong>.
               published: A eleição <strong>não está publicada</strong>.
-              time_before: A hora de início é <strong>menos de 3 horas</strong> antes do início da eleição.
               trustees_number: O espaço participativo <strong>deve ter pelo menos %{número} curadores com chave pública</strong>.
             invalid: Houve um problema ao configurar esta eleição.
             no_trustees: Não há curadores configurados para este espaço participativo
@@ -624,6 +622,8 @@ pt:
         failed:
           header: Votação falhou
           lead: O seu voto não foi registado!
+          modal:
+            close: Fechar
           text: Algo correu mal, por favor tente de novo.
           try_again: Tente de novo
         header:

data/config/locales/ro-RO.yml

@@ -12,7 +12,6 @@ ro:
         start_time: Votarea începe la
         title: Titlu
       question:
-        description: Descriere
         max_selections: Numărul maxim de selecții
         min_selections: Niciuna dintre opțiunile de mai sus
         title: Titlu
@@ -227,7 +226,6 @@ ro:
               minimum_answers: Întrebările trebuie să aibă <strong>cel puţin două răspunsuri</strong>.
               minimum_questions: Alegerile <strong>trebuie să aibă cel puţin o întrebare</strong>.
               published: Aceste alegerile <strong>nu sunt publicate</strong>.
-              time_before: Timpul de începere este în <strong>mai puţin de 3 ore</strong> înainte de începerea alegerilor.
               trustees_number: Spațiul participativ <strong>trebuie să aibă cel puțin %{number} împuterniciți cu cheie publică</strong>.
             invalid: A apărut o eroare la organizarea acestor alegeri
             no_trustees: Nu există împuterniciți configurați pentru acest spațiu participativ
@@ -551,6 +549,8 @@ ro:
           verify_link: Pentru a verifica, copiați identificatorul și lipiți-l pe pagina <a href="%{link}">pentru verificarea votului</a>
         failed:
           header: Vot eșuat
+          modal:
+            close: Inchide
         header:
           confirm: Confirmă votul tău
           confirmed: Votare confirmată

data/config/locales/sv.yml

@@ -12,7 +12,6 @@ sv:
         start_time: Röstningsstart vid
         title: Titel
       question:
-        description: Beskrivning
         max_selections: Maximalt antal val
         title: Titel
       voting:
@@ -45,12 +44,18 @@ sv:
       decidim/elections/question:
         one: Fråga
         other: Frågor
+      decidim/voting:
+        one: Omröstning
+        other: Omröstningar
       decidim/votings/census/dataset:
         one: Datamängd
         other: Datamängder
       decidim/votings/census/datum:
         one: Datum
         other: Datum
+      decidim/votings/polling_officer:
+        one: Röstmottagare
+        other: Röstmottagare
       decidim/votings/polling_station:
         one: Vallokal
         other: Vallokaler
@@ -80,6 +85,7 @@ sv:
           label: Bekräftad
           values:
             'false': Bekräftad
+            'true': Ej Validerad
     components:
       elections:
         actions:
@@ -96,6 +102,7 @@ sv:
         destroy: Förstör
         edit: Redigera
         import: Importera förslag till svar
+        manage_answers: Hantera svar
         manage_questions: Hantera frågor
         manage_steps: Hanterade steg
         new: Ny %{name}
@@ -120,6 +127,8 @@ sv:
             create: Skapa svar
             title: Nytt svar
           not_selected: Inte vald
+          select:
+            disable: Avmarkera svar
           selected: Valda
           update:
             invalid: Det gick inte att uppdatera svaret
@@ -195,6 +204,8 @@ sv:
           key_ceremony:
             continue: Fortsätt
             title: Nyckelceremoni
+          key_ceremony_ended:
+            title: Redo att börja
           processing: Bearbetar...
           results_published:
             answer: Svar
@@ -262,6 +273,7 @@ sv:
           results_title: Resultat
           started: Startad
           title: Omröstningslogg
+          vote_title: Omröstningsprocess
         filters:
           active: Aktiv
           all: Allt
@@ -278,6 +290,10 @@ sv:
           percentage: "%{count}%"
           selected: Valda
           title: Omröstningsresultat
+          votes:
+            one: "%{count} röster"
+            other: "%{count} röster"
+            zero: "%{count} röster"
         show:
           action_button:
             change_vote: Ändra din röst
@@ -285,6 +301,8 @@ sv:
             vote_again: Rösta om
           election_log: Omröstningslogg
           preview: Förhandsgranska
+          verify:
+            already_voted: Redan röstat?
           voting_period_status:
             finished: Omröstningen började den %{start_time} och slutade den %{end_time}
             upcoming: Omröstningen börjar den %{start_time}
@@ -350,6 +368,7 @@ sv:
                 action_required:
                   'false': 'Nej'
                   name: Åtgärd krävs?
+                  'true': Utför åtgärd
                 bb_status: Status
                 election: Val
                 voting_period: Röstningsperiod
@@ -378,6 +397,8 @@ sv:
           text: 'Du kan kontrollera att din röst har lagts till i röstsedeln med följande identifierare: <strong class="evote__poll-id">%{e_vote_poll_id}</strong>'
         failed:
           header: Röst ej framgångsrik
+          modal:
+            close: Stäng
           try_again: Försök igen
         header:
           ballot_decision: Lägg eller granska din röst
@@ -397,10 +418,13 @@ sv:
           selections: "%{selected} av %{max_selections}<br> val"
         onboarding_modal:
           close: Stäng fönstret
+          create_account: Skapa konto
           no_account: Nej tack.
         verify:
           content:
             heading: Verifiera din röst
+          error:
+            header: Hittade inga omröstningar!
           form:
             back: Tillbaka till Decidim
             submit: Kontrollera
@@ -440,6 +464,12 @@ sv:
               title: Åtgärder
           new:
             create: Skapa
+        content_blocks:
+          landing_page:
+            metrics:
+              name: Omröstningsmetrik
+            timeline:
+              name: Omröstningstidslinje
         index:
           not_published: Ej publicerade
           published: Publicerad
@@ -474,12 +504,14 @@ sv:
             fields:
               email: E-post
               name: Namn
+            name: Röstmottagare
           polling_station:
             fields:
               address: Adress
               polling_station_managers: Koordinatorer
               polling_station_president: Ordförande
               title: Titel
+            name: Röststation
           voting:
             fields:
               created_at: Skapad den
@@ -491,6 +523,11 @@ sv:
             title: Åtgärder
             view: Visa
           results:
+            result_types:
+              blank_answers: Tomma svar
+              blank_ballots: Tomma röstsedlar
+              total_ballots: Totalt antal röstsedlar
+              valid_ballots: Giltiga röstsedlar
             selected: Valda
             totals: Totalt
           show:
@@ -544,6 +581,8 @@ sv:
           edit:
             update: Uppdatera
           form:
+            promoted: Annonserad
+            slug: Slug
             title: Titel
             voting_type:
               hybrid: Hybrid
@@ -577,6 +616,7 @@ sv:
       pages:
         home:
           highlighted_votings:
+            active_votings: Activa omröstningar
             see_all_votings: Se alla omröstningar
       polling_officer_zone:
         closures:
@@ -591,6 +631,7 @@ sv:
             heading: Omräkning
             modal_ballots_count_error:
               close_modal: Stäng
+              total_people: 'Totala människor:'
             polling_station: 'Vallokal:'
           show:
             heading: Omräkning
@@ -600,6 +641,7 @@ sv:
             confirm: Fortsätt
         in_person_votes:
           in_person_form:
+            date_of_birth: Födelsedatum
             day: Dag
             day_placeholder: DD
             document_number: Dokumentnummer
@@ -633,6 +675,7 @@ sv:
           unassigned: Otilldelad
       polling_station_closure_recount:
         signed: Signerat
+        total_ballots: 'Totalt antal röstsedlar:'
       polling_stations:
         actions:
           confirm_destroy: Är du säker?
@@ -641,6 +684,8 @@ sv:
           new: Ny
           title: Åtgärder
       votings:
+        access_code_modal:
+          title: Få behörighetskod
         check_census:
           check_status: Kontrollera status
           title: Kan jag rösta?
@@ -650,11 +695,16 @@ sv:
           day_placeholder: DD
           document_number: Dokumentnummer
           document_number_placeholder: ID-nummer
+          document_type: Dokumenttyp
           month: Månad
           month_placeholder: MM
           postal_code: Postnummer
           year: År
           year_placeholder: ÅÅÅÅ
+        count:
+          title:
+            one: "%{count} omröstning"
+            other: "%{count} omröstningar"
         elections_log:
           election_log: Omröstningslogg
           title: Omröstningslogg
@@ -676,6 +726,7 @@ sv:
           access_code: Behörighetskod
           access_code_placeholder: Behörighetskod
           start_voting: Starta omröstningen
+          step: Identifikation
         orders:
           label: 'Sortera omröstningar efter:'
           random: Slumpmässig

data/config/locales/tr-TR.yml

@@ -12,7 +12,6 @@ tr:
         start_time: Oylama başlangıcı
         title: Başlık
       question:
-        description: Açıklama
         max_selections: Maksimum seçim sayısı
         min_selections: Yukarıdakilerden hiçbiri
         title: Başlık
@@ -307,6 +306,9 @@ tr:
           feedback: Bize geri bildirim verin
           header: Oy onaylandı
           text: 'Aşağıdaki tanımlayıcıyla oyunuzun başarıyla oy sandığına eklenip eklenmediğini kontrol edebilirsiniz: <strong class = "evote__poll-id">%{e_vote_poll_id} </strong>'
+        failed:
+          modal:
+            close: Kapat
         header:
           confirm: Oyunu onayla
           confirmed: Oy onaylandı

data/config/locales/zh-CN.yml

@@ -12,7 +12,6 @@ zh-CN:
         start_time: 投票开始于
         title: 标题
       question:
-        description: 描述
         max_selections: 最大选择数
         min_selections: 上面没有一个选项
         title: 标题
@@ -205,6 +204,9 @@ zh-CN:
           feedback: 给我们一些反馈
           header: 已确认投票
           text: '您可以检查您的投票是否已成功地添加到选票箱，其标识符如下： <strong class="evote__poll-id">%{e_vote_poll_id}</strong>'
+        failed:
+          modal:
+            close: 关闭
         header:
           confirm: 确认您的投票
           confirmed: 已确认投票

data/db/migrate/20220615102642_remove_description_from_elections_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveDescriptionFromElectionsQuestions < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :decidim_elections_questions, :description, :jsonb
+  end
+end

data/lib/decidim/api/election_question_type.rb

@@ -11,7 +11,6 @@ module Decidim
 
       field :id, GraphQL::Types::ID, "The internal ID of this question", null: false
       field :title, Decidim::Core::TranslatedFieldType, "The title for this question", null: false
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this question", null: false
       field :max_selections, GraphQL::Types::Int, "The maximum number of possible selections for this question", null: false
       field :weight, GraphQL::Types::Int, "The ordering weight for this question", null: true
       field :random_answers_order, GraphQL::Types::Boolean, "Should this question order answers in random order?", null: true

data/lib/decidim/elections/component.rb

@@ -113,9 +113,6 @@ Decidim.register_component(:elections) do |component|
           {
             election: upcoming_election,
             title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end,
             max_selections: Faker::Number.between(from: 1, to: 3),
             weight: Faker::Number.number(digits: 1),
             random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
@@ -213,9 +210,6 @@ Decidim.register_component(:elections) do |component|
           {
             election: finished_election,
             title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end,
             max_selections: 2,
             weight: Faker::Number.number(digits: 1),
             random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
@@ -336,9 +330,6 @@ Decidim.register_component(:elections) do |component|
           {
             election: election_with_results,
             title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end,
             max_selections: 2,
             weight: Faker::Number.number(digits: 1),
             random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),
@@ -456,9 +447,6 @@ Decidim.register_component(:elections) do |component|
         {
           election: ongoing_election,
           title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(sentence_count: 3)
-          end,
           max_selections: 2,
           weight: Faker::Number.number(digits: 1),
           random_answers_order: Faker::Boolean.boolean(true_ratio: 0.5),

data/lib/decidim/elections/test/factories.rb

@@ -170,7 +170,6 @@ FactoryBot.define do
 
     election
     title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     min_selections { 1 }
     max_selections { 1 }
     weight { Faker::Number.number(digits: 1) }

data/lib/decidim/elections/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Elections
     def self.version
-      "0.26.2"
+      "0.26.4"
     end
   end
 end

data/lib/decidim/votings/admin_engine.rb

@@ -53,6 +53,9 @@ module Decidim
               get :share
             end
             resources :exports, only: :create
+            resources :imports, only: [:new, :create] do
+              get :example, on: :collection
+            end
           end
         end