decidim-forms 0.28.4 → 0.28.6

data/config/locales/sv.yml

@@ -4,8 +4,6 @@ sv:
     attributes:
       answer:
         body: Svar
-        choices: Alternativ
-        selected_choices: Valda alternativ
       question:
         max_choices: Högst antal alternativ
         question_type: Typ
@@ -16,12 +14,7 @@ sv:
       models:
         answer:
           attributes:
-            add_documents:
-              needs_to_be_reattached: Måste bifogas igen
-            body:
-              too_long: är för långt
             choices:
-              missing: är inte fullständiga
               too_many: är för många
         questionnaire:
           request_invalid: Det gick inte att hantera begäran. Försök igen.
@@ -38,24 +31,14 @@ sv:
             show: Visa svar
           answer_option:
             answer_option: Svarsalternativ
-            free_text: Fritext
             remove: Ta bort
             statement: Påstående
           answers:
             actions:
-              back: Tillbaka till svar
-              export: Exportera
-              next: Nästa ›
-              previous: "‹ Föregående"
               show: Visa svar
             empty: Inga svar ännu
-            export:
-              answer:
-                title: 'Svar #%{number}'
             export_response:
               title: survey_user_answers_%{token}
-            index:
-              title: "%{total} svar totalt"
             show:
               title: 'Svar #%{number}'
           display_condition:
@@ -81,14 +64,10 @@ sv:
             title: Redigera enkät
           form:
             add_question: Lägg till fråga
-            add_separator: Lägg till avgränsare
-            add_title_and_description: Lägg till titel och beskrivning
-            already_answered_warning: Frågeformuläret har redan besvarats av användare och du kan inte längre ändra frågorna.
             collapse: Dölj alla frågor
             expand: Visa alla frågor
             preview: Förhandsgranska
             title: Redigera formulär för %{questionnaire_for}
-            unpublished_warning: Formuläret har inte publicerats. Du kan ändra frågorna, men det kommer att göra att befintliga svar raderas.
           matrix_row:
             matrix_row: Rad
             remove: Ta bort
@@ -127,9 +106,6 @@ sv:
       admin_log:
         questionnaire:
           update: "%{user_name} uppdaterade enkäten %{resource_name}"
-      errors:
-        answer:
-          body: Innehåll kan inte vara tomt
       images:
         dimensions: "%{width} x %{height} px"
         processors:
@@ -145,21 +121,15 @@ sv:
         single_option: Ett alternativ
         sorting: Sortering
         title_and_description: Titel och beskrivning
-      questionnaire_answer_presenter:
-        download_attachment: Ladda ner bilaga
       questionnaires:
         answer:
           invalid: Det gick inte att besvara formuläret.
-          max_choices_alert: För många alternativ har valts
           success: Formuläret har besvarats.
         question:
           max_choices: 'Högst antal val: %{n}'
         show:
           answer_questionnaire:
-            already_have_an_account?: Har du redan ett konto?
-            are_you_new?: Ny användare?
             sign_in_description: Logga in för att fylla i enkäten
-            sign_up_description: Skapa ett konto för att göra enkäten
             title: Besvara formuläret
           current_step: Steg %{step}
           empty: Formuläret har inga frågor än.
@@ -181,18 +151,11 @@ sv:
           tos_agreement: Genom att delta godkänner du användarvillkoren
       step_navigation:
         show:
-          are_you_sure: Den här åtgärden kan inte ångras och du kommer inte att kunna redigera dina svar. Är du säker?
           back: Tillbaka
           continue: Fortsätt
           submit: Skicka in
       user_answers_serializer:
         body: Svar
-        completion: Slutfört
         created_at: Besvarad
         id: Svars-ID
-        ip_hash: IP Hash
         question: Fråga
-        registered: Registrerad
-        session_token: Identifierare för användare
-        unregistered: Ej registrerad
-        user_status: Användarstatus

data/config/locales/tr-TR.yml

@@ -4,8 +4,6 @@ tr:
     attributes:
       answer:
         body: Cevap
-        choices: Seçenekler
-        selected_choices: Seçilmiş seçenekler
       question:
         max_choices: Maksimum seçenek sayısı
         question_type: tip
@@ -16,7 +14,6 @@ tr:
         answer:
           attributes:
             choices:
-              missing: tamamlanmadı
               too_many: çok fazla
   decidim:
     forms:
@@ -31,22 +28,14 @@ tr:
             show: Yanıtları göster
           answer_option:
             answer_option: Cevap seçeneği
-            free_text: Ücretsiz Metin
             remove: Kaldır
             statement: Beyan
           answers:
             actions:
-              back: Yanıtlara dön
-              export: Dışa aktar
               show: Cevapları göster
             empty: Henüz cevap bulunmuyor
-            export:
-              answer:
-                title: '#%{number} yanıt'
             export_response:
               title: survey_user_answers _%{token}
-            index:
-              title: "%{total} toplam yanıt"
             show:
               title: '%{number} cevap'
           display_condition:
@@ -72,13 +61,10 @@ tr:
             title: Anketi düzenleyin
           form:
             add_question: Soru ekle
-            add_separator: Ayırıcı ekle
-            already_answered_warning: Form, bazı kullanıcılar tarafından zaten yanıtlandı, bu nedenle sorularını değiştiremezsiniz.
             collapse: Tüm soruları daraltın
             expand: Tüm soruları genişletin
             preview: Önizleme
             title: '%{questionnaire_for} için formu düzenleyin'
-            unpublished_warning: Form yayınlanmadı. Sorularını değiştirebilirsiniz, ancak bunu yapmak mevcut cevapları silecektir.
           matrix_row:
             matrix_row: Satır
             remove: Kaldır
@@ -118,7 +104,6 @@ tr:
       questionnaires:
         answer:
           invalid: Formu yanıtlarken bir sorun oluştu.
-          max_choices_alert: Çok fazla seçenek seçilmiş
           success: Form başarıyla cevaplandı.
         question:
           max_choices: 'Maksimum seçenek: %{n}'
@@ -145,18 +130,11 @@ tr:
           tos_agreement: Katılarak Hizmet Şartlarını kabul etmiş olursunuz.
       step_navigation:
         show:
-          are_you_sure: Bu işlem geri alınamaz ve cevaplarınızı düzenleyemezsiniz. Emin misiniz?
           back: Geri
           continue: Devam et
           submit: Gönder
       user_answers_serializer:
         body: Cevap
-        completion: Tamamlanma
         created_at: Yanıtlandı
         id: Cevap kimliği
-        ip_hash: IP Hash
         question: Soru
-        registered: Kayıtlı
-        session_token: Kullanıcı tanımlayıcı
-        unregistered: Kayıtlı değil
-        user_status: Kullanıcı durumu

data/config/locales/val-ES.yml

@@ -4,8 +4,6 @@ val:
     forms:
       admin:
         questionnaires:
-          form:
-            add_title_and_description: Afig títol i descripció
           title_and_description:
             collapse: Redueix
             description: Descripció

data/config/locales/zh-CN.yml

@@ -4,8 +4,6 @@ zh-CN:
     attributes:
       answer:
         body: 答案
-        choices: 选择
-        selected_choices: 选定的选择
       question:
         max_choices: 选择的最大数量
         question_type: 类型
@@ -16,7 +14,6 @@ zh-CN:
         answer:
           attributes:
             choices:
-              missing: 不完成
               too_many: 太多了
   decidim:
     forms:
@@ -31,22 +28,14 @@ zh-CN:
             show: 显示回复
           answer_option:
             answer_option: 答案选项
-            free_text: 免费文本
             remove: 删除
             statement: 声明
           answers:
             actions:
-              back: 回到回应
-              export: 导出
               show: 显示答案
             empty: 尚无答案
-            export:
-              answer:
-                title: '回复 #%{number}'
             export_response:
               title: survey_user_answers_%{token}
-            index:
-              title: "%{total} 个回复总数"
             show:
               title: '答案 #%{number}'
           display_condition:
@@ -72,12 +61,9 @@ zh-CN:
             title: 编辑问题单
           form:
             add_question: 添加问题
-            add_separator: 添加分隔符
-            already_answered_warning: 某些用户已经回答了表单，因此您不能修改其问题。
             collapse: 收起所有问题
             expand: 展开所有问题
             preview: 预览
-            unpublished_warning: 表单未发布。您可以修改它的问题，但这样做将删除当前答案。
           matrix_row:
             matrix_row: 行
             remove: 删除
@@ -117,7 +103,6 @@ zh-CN:
       questionnaires:
         answer:
           invalid: 回答表单时出现问题。
-          max_choices_alert: 选择了太多选项
           success: 表单回答成功。
         question:
           max_choices: '最大选择数: %{n}'
@@ -143,18 +128,11 @@ zh-CN:
           tos_agreement: 通过参与您接受其服务条款
       step_navigation:
         show:
-          are_you_sure: 此操作不能撤消，您将无法编辑您的答案。您确定吗？
           back: 后退
           continue: 继续
           submit: 提交
       user_answers_serializer:
         body: 答案
-        completion: 完成
         created_at: 回答于
         id: 答案 ID
-        ip_hash: IP哈希
         question: 问
-        registered: 已注册
-        session_token: 用户标识符
-        unregistered: 未注册
-        user_status: 用户状态

data/config/locales/zh-TW.yml

@@ -4,8 +4,6 @@ zh-TW:
     attributes:
       answer:
         body: 回答
-        choices: 選項
-        selected_choices: 已選擇的選項
       question:
         max_choices: 選擇的最大數量
         question_type: 類別
@@ -16,12 +14,7 @@ zh-TW:
       models:
         answer:
           attributes:
-            add_documents:
-              needs_to_be_reattached: 需要重新附加
-            body:
-              too_long: 太長
             choices:
-              missing: 尚未完成
               too_many: 太多了
         questionnaire:
           request_invalid: 處理請求時發生錯誤。請再試一次。
@@ -38,24 +31,14 @@ zh-TW:
             show: 顯示回應
           answer_option:
             answer_option: 答案選項：
-            free_text: 免費文字
             remove: 移除
             statement: 聲明
           answers:
             actions:
-              back: 返回回覆
-              export: 匯出
-              next: 下一個 ›
-              previous: "‹ 上一篇"
               show: 顯示答案
             empty: 目前尚未回答
-            export:
-              answer:
-                title: '回應 #%{number}'
             export_response:
               title: 調查問卷使用者回答_%{token}
-            index:
-              title: "%{total} 個回應總數"
             show:
               title: '回答#%{number}'
           display_condition:
@@ -81,14 +64,10 @@ zh-TW:
             title: 編輯問卷內容
           form:
             add_question: 新增問題
-            add_separator: 新增分隔線
-            add_title_and_description: 新增標題與描述
-            already_answered_warning: 已有使用者回答此表單，因此您無法修改問題。
             collapse: 收起所有問題
             expand: 展開所有問題
             preview: 預覽
             title: 編輯問卷表單%{questionnaire_for}
-            unpublished_warning: 此表單尚未發佈。您可以修改其問題，但這樣做將刪除目前的回答。
           matrix_row:
             matrix_row: 列
             remove: 移除
@@ -127,9 +106,6 @@ zh-TW:
       admin_log:
         questionnaire:
           update: "%{user_name} 更新了 %{resource_name} 問卷模板"
-      errors:
-        answer:
-          body: 內容不能為空
       images:
         dimensions: "%{width} x %{height} 像素"
         processors:
@@ -145,21 +121,15 @@ zh-TW:
         single_option: 單選
         sorting: 排序中
         title_and_description: 標題和描述
-      questionnaire_answer_presenter:
-        download_attachment: 下載附件
       questionnaires:
         answer:
           invalid: 回答表單時出現問題
-          max_choices_alert: 選擇的項目太多了
           success: 表單已成功回答
         question:
           max_choices: '最多選擇數量： %{n}'
         show:
           answer_questionnaire:
-            already_have_an_account?: 已經有帳號了嗎？
-            are_you_new?: 新用戶?
             sign_in_description: 登入以填寫問卷
-            sign_up_description: 建立參與者帳號以填寫問卷
             title: 回答表單 
           current_step: 步驟%{step}
           of_total_steps: 的%{total_steps}
@@ -180,18 +150,11 @@ zh-TW:
           tos_agreement: 透過參與，您同意其服務條款
       step_navigation:
         show:
-          are_you_sure: 此操作無法撤消，您將無法編輯您的答案。您確定嗎？
           back: 返回
           continue: 繼續
           submit: 提交
       user_answers_serializer:
         body: 回答
-        completion: 完成
         created_at: 回答時間
         id: 回答 ID
-        ip_hash: IP Hash
         question: 問題
-        registered: 已註冊
-        session_token: 使用者識別碼
-        unregistered: 未註冊
-        user_status: 用戶狀態

data/decidim-forms.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Forms.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva", "Rubén González Valero"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "rbngzlv@gmail.com"]
-  s.license = "AGPL-3.0"
+  s.license = "AGPL-3.0-or-later"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-core", Decidim::Forms.version
   s.add_dependency "wicked_pdf", "~> 2.1"
-  s.add_dependency "wkhtmltopdf-binary", "~> 0.12"
 
   s.add_development_dependency "decidim-admin", Decidim::Forms.version
   s.add_development_dependency "decidim-dev", Decidim::Forms.version

data/lib/decidim/forms/test/shared_examples/has_questionnaire.rb

@@ -57,6 +57,32 @@ shared_examples_for "has questionnaire" do
       expect(page).to have_no_i18n_content(question.body)
     end
 
+    context "and there is a mandatory question" do
+      let!(:question) do
+        create(
+          :questionnaire_question,
+          questionnaire:,
+          question_type: "short_answer",
+          position: 0,
+          mandatory: true
+        )
+      end
+
+      before do
+        visit questionnaire_public_path
+      end
+
+      it "it renders the asterisk as a separated element" do
+        within "label.answer-questionnaire__question-label" do
+          expect(page).to have_content(translated_attribute(question.body).to_s)
+          within "span.label-required.has-tip" do
+            expect(page).to have_content("*")
+            expect(page).to have_content("Required field")
+          end
+        end
+      end
+    end
+
     context "with multiple steps" do
       let!(:separator) { create(:questionnaire_question, questionnaire:, position: 1, question_type: :separator) }
       let!(:question2) { create(:questionnaire_question, questionnaire:, position: 2) }

data/lib/decidim/forms/user_answers_serializer.rb

@@ -42,7 +42,7 @@ module Decidim
         questionnaire_id = @answers.first&.decidim_questionnaire_id
         return {} unless questionnaire_id
 
-        questions = Decidim::Forms::Question.where(decidim_questionnaire_id: questionnaire_id)
+        questions = Decidim::Forms::Question.where(decidim_questionnaire_id: questionnaire_id).order(:position)
         return {} if questions.none?
 
         questions.each.inject({}) do |serialized, question|

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.28.4"
+      "0.28.6"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.28.4
+  version: 0.28.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -41,48 +41,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: wkhtmltopdf-binary
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.6
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -194,6 +180,9 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
+- config/locales/bn-BD.yml
+- config/locales/bs-BA.yml
+- config/locales/ca-IT.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -308,7 +297,7 @@ files:
 - lib/decidim/forms/version.rb
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0
+- AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/