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.

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

website/docs: fix email template formatting #9330

Merged
merged 1 commit into from
Apr 18, 2024

Conversation

Zapfmeister
Copy link
Contributor

@Zapfmeister Zapfmeister commented Apr 18, 2024

Fixes:
django.template.exceptions.TemplateSyntaxError: 'blocktrans' doesn't allow other block tags (seen "trans 'You recently requested to change your password for you authentik account. Use the button below to set a new password.'") inside it

Details

Fixes an issue in the documentation, which made the example code fail to run.
The newline caused the template not to work and cause the mentioned error.


Checklist

  • Local tests pass (ak test authentik/)
  • The code has been formatted (make lint-fix)

If an API change has been made

  • The API schema has been updated (make gen-build)

If changes to the frontend have been made

  • The code has been formatted (make web)

If applicable

  • The documentation has been updated
  • The documentation has been formatted (make website)

Fixes:
django.template.exceptions.TemplateSyntaxError: 'blocktrans' doesn't allow other block tags (seen "trans 'You recently requested to change your password for you authentik account. Use the button below to set a new password.'") inside it

Signed-off-by: Zapfmeister <zapfmeister@gmail.com>
@Zapfmeister Zapfmeister requested a review from a team as a code owner April 18, 2024 08:34
Copy link

netlify bot commented Apr 18, 2024

Deploy Preview for authentik-docs ready!

Name Link
🔨 Latest commit 68320fe
🔍 Latest deploy log https://app.netlify.com/sites/authentik-docs/deploys/6620db0220d1c5000854b0ba
😎 Deploy Preview https://deploy-preview-9330--authentik-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

netlify bot commented Apr 18, 2024

Deploy Preview for authentik-storybook ready!

Name Link
🔨 Latest commit 68320fe
🔍 Latest deploy log https://app.netlify.com/sites/authentik-storybook/deploys/6620db01d9b9f40008b2a3e8
😎 Deploy Preview https://deploy-preview-9330--authentik-storybook.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@BeryJu BeryJu changed the title fix formating issue website/docs: fix email template formatting Apr 18, 2024
Copy link

codecov bot commented Apr 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.41%. Comparing base (8c687d8) to head (68320fe).
Report is 4 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9330      +/-   ##
==========================================
- Coverage   92.42%   92.41%   -0.01%     
==========================================
  Files         667      667              
  Lines       32630    32630              
==========================================
- Hits        30158    30156       -2     
- Misses       2472     2474       +2     
Flag Coverage Δ
e2e 50.70% <ø> (-0.08%) ⬇️
integration 26.03% <ø> (ø)
unit 89.68% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@BeryJu BeryJu merged commit d7b872c into goauthentik:main Apr 18, 2024
60 of 66 checks passed
kensternberg-authentik added a commit that referenced this pull request Apr 18, 2024
…rities' into web/bug/locale-priorities

* refs/remotes/origin/web/bug/locale-priorities:
  web: fix locale prioritization scheme
  core: bump aiohttp from 3.9.2 to 3.9.4 (#9339)
  stages/prompt: fix username field throwing error with existing user (#9342)
  root: expose session storage configuration (#9337)
  website/integrations: fix typo (#9340)
  root: fix go.mod for codeql checking (#9338)
  root: make redis settings more consistent (#9335)
  web/admin: fix error in admin interface due to un-hydrated context (#9336)
  web: bump API Client version (#9334)
  stages/authenticator_webauthn: fix attestation value (#9333)
  website/docs: fix SECRET_KEY length (#9328)
  website/docs: fix email template formatting (#9330)
  core, web: update translations (#9323)
  web: bump @patternfly/elements from 3.0.0 to 3.0.1 in /web (#9324)
  core: bump celery from 5.3.6 to 5.4.0 (#9325)
  core: bump goauthentik.io/api/v3 from 3.2024022.12 to 3.2024023.1 (#9327)
  sources/scim: service account should be internal (#9321)
  web: bump the storybook group in /web with 8 updates (#9266)
  sources/scim: cleanup service account when source is deleted (#9319)
kensternberg-authentik added a commit that referenced this pull request Apr 19, 2024
* main:
  stages/prompt: fix username field throwing error with existing user (#9342)
  root: expose session storage configuration (#9337)
  website/integrations: fix typo (#9340)
  root: fix go.mod for codeql checking (#9338)
  root: make redis settings more consistent (#9335)
  web/admin: fix error in admin interface due to un-hydrated context (#9336)
  web: bump API Client version (#9334)
  stages/authenticator_webauthn: fix attestation value (#9333)
  website/docs: fix SECRET_KEY length (#9328)
  website/docs: fix email template formatting (#9330)
  core, web: update translations (#9323)
  web: bump @patternfly/elements from 3.0.0 to 3.0.1 in /web (#9324)
  core: bump celery from 5.3.6 to 5.4.0 (#9325)
  core: bump goauthentik.io/api/v3 from 3.2024022.12 to 3.2024023.1 (#9327)
  sources/scim: service account should be internal (#9321)
  web: bump the storybook group in /web with 8 updates (#9266)
  sources/scim: cleanup service account when source is deleted (#9319)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants