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

[pull] dev from opf:dev #219

Merged
merged 11 commits into from
Nov 21, 2024
Merged

[pull] dev from opf:dev #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a9f243a
Prevent double concat
oliverguenther Nov 20, 2024
d6fbd6a
Fix mobile provider label
oliverguenther Nov 20, 2024
b7226b0
update locales from crowdin [ci skip]
openprojectci Nov 21, 2024
f9a72d3
update locales from crowdin [ci skip]
openprojectci Nov 21, 2024
db1e67c
Merge branch 'release/15.0' into dev
openprojectci Nov 21, 2024
c096442
build(deps): bump oj from 3.16.6 to 3.16.7
dependabot[bot] Nov 21, 2024
a74b297
Do not treat HTML as inlinable
oliverguenther Nov 21, 2024
4833c16
Merge pull request #17244 from opf/dependabot/bundler/dev/oj-3.16.7
ulferts Nov 21, 2024
df6600d
Update spec/models/attachment_spec.rb
oliverguenther Nov 21, 2024
037c6cc
Merge pull request #17241 from opf/fix/duplicate-oidc-provider
oliverguenther Nov 21, 2024
568d468
Merge pull request #17245 from opf/fix/treat-html-non-inline
oliverguenther Nov 21, 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
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 @@ -793,7 +793,7 @@ GEM
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oj (3.16.6)
oj (3.16.7)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
okcomputer (1.18.5)
Expand Down Expand Up @@ -831,7 +831,7 @@ GEM
openssl (> 2.0)
optimist (3.1.0)
os (1.1.4)
ostruct (0.6.0)
ostruct (0.6.1)
ox (2.14.18)
paper_trail (15.2.0)
activerecord (>= 6.1)
Expand Down
6 changes: 5 additions & 1 deletion app/models/attachment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,12 @@ def is_pdf?
content_type == "application/pdf"
end

def is_html?
content_type == "text/html"
end

def is_text?
content_type.match?(/\Atext\/.+/)
content_type.match?(/\Atext\/.+/) && !is_html?
end

def is_diff?
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/af.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,23 @@ af:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/ar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1967,6 +1967,23 @@ ar:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/az.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,23 @@ az:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/be.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1895,6 +1895,23 @@ be:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/bg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,23 @@ bg:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/ca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,6 +1819,23 @@ ca:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext disponible (opcional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/ckb-IR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,23 @@ ckb-IR:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/cs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1895,6 +1895,23 @@ cs:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext k dispozici (volitelné)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/da.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,6 +1821,23 @@ da:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/de.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1816,6 +1816,23 @@ de:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext verfügbar (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/el.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,6 +1819,23 @@ el:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Το Pdftotext είναι διαθέσιμο (προαιρετικό)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/eo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,23 @@ eo:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdfaltekto disponebla (nedeviga)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1820,6 +1820,23 @@ es:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext disponible (opcional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/et.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,23 @@ et:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
17 changes: 17 additions & 0 deletions config/locales/crowdin/eu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,23 @@ eu:
units:
hours: h
days: d
pdf_generator:
page_nr_footer: "Page %{page} of %{total}"
dialog:
title: Generate PDF
submit: Generate
header_right:
label: Header right
caption: Text to be displayed in the right of the header
footer_center:
label: Footer center
caption: Text to be displayed in the center of the footer
hyphenation:
label: Hyphenation
caption: Break words between lines to improve text justification and readability.
paper_size:
label: Paper size
caption: The size of the paper to use for the PDF.
extraction:
available:
pdftotext: "Pdftotext available (optional)"
Expand Down
Loading