Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wicked_pdf version to 2.7.0 and more #34

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Fix wicked_pdf version to 2.7.0 and more #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b869925
Fix wicked_pdf version to 2.7.0
laurajaime Apr 16, 2024
fc5e2cf
Add webpacker initializer
laurajaime Apr 16, 2024
4ec9501
Add missing translations of surveys
laurajaime Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gem "decidim-idcat_mobil", "~> 0.3.0"
gem "decidim-cdtb"

gem "bootsnap", "~> 1.3"
gem "wicked_pdf", "~> 2.1"
gem "wicked_pdf", "~> 2.7.0"

# Blob storage in the cloud
gem "azure-storage-blob"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ GEM
websocket-extensions (0.1.5)
wicked (1.4.0)
railties (>= 3.0.7)
wicked_pdf (2.8.0)
wicked_pdf (2.7.0)
activesupport
wisper (2.0.1)
wisper-rspec (1.1.0)
Expand Down Expand Up @@ -953,7 +953,7 @@ DEPENDENCIES
spring (~> 2.0)
spring-watcher-listen (~> 2.0)
web-console (~> 4.0)
wicked_pdf (~> 2.1)
wicked_pdf (~> 2.7.0)

RUBY VERSION
ruby 3.0.2p107
Expand Down
4 changes: 4 additions & 0 deletions config/initializers/webpacker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# frozen_string_literal: true

# This is a fix when sending the customized survey answer confirmation email
require "webpacker/version"
10 changes: 10 additions & 0 deletions config/locales/ca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
ca:
# Remove when create the translations in Decidim
decidim:
surveys:
survey_confirmation_mailer:
confirmation:
body: Has respost correctament el qüestionari %{questionnaire_title} dins de %{participatory_space}
subject: Confirmació de resposta al qüestionari %{questionnaire_title}
export_name: Repostes del qüestionari
10 changes: 10 additions & 0 deletions config/locales/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
es:
# Remove when create the translations in Decidim
decidim:
surveys:
survey_confirmation_mailer:
confirmation:
body: Has contestado correctamente al cuestionario %{questionnaire_title} dentro de %{participatory_space}
subject: Confirmación de respuesta al cuestionario %{questionnaire_title}
export_name: Respuestas del cuestionario
1 change: 1 addition & 0 deletions spec/features/remove_overrides_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
RSpec.describe "Overrides" do
it "remove overrides after upgrading to v0.28" do
# - Check header and application overrides views to set Google Tag Manager (see #22 and "Add Google Tag Manager to admin backoffice" in the README)
# - Remove `survey_confirmation_mailer` translations when Decidim has them
expect(Decidim.version).to be < "0.28"
end
end
Loading