Skip to content

root: fix override locale only if it is not empty#12283

Merged
BeryJu merged 2 commits intogoauthentik:mainfrom
j-z10:j-z10-patch-1
Dec 6, 2024
Merged

root: fix override locale only if it is not empty#12283
BeryJu merged 2 commits intogoauthentik:mainfrom
j-z10:j-z10-patch-1

Conversation

@j-z10
Copy link
Contributor

@j-z10 j-z10 commented Dec 6, 2024

ImpersonateMiddleware may override the BrandMiddleware's language

part of #12088

j-z10 added 2 commits December 6, 2024 15:00
override language only if it's not empty

Signed-off-by: Zhang Jie <13131481+j-z10@users.noreply.github.com>
Signed-off-by: Zhang Jie <13131481+j-z10@users.noreply.github.com>
@j-z10 j-z10 requested a review from a team as a code owner December 6, 2024 07:07
@netlify
Copy link

netlify bot commented Dec 6, 2024

Deploy Preview for authentik-docs canceled.

Name Link
🔨 Latest commit 8fe21d1
🔍 Latest deploy log https://app.netlify.com/sites/authentik-docs/deploys/6752a2aee49ccd00086e793a

@netlify
Copy link

netlify bot commented Dec 6, 2024

Deploy Preview for authentik-storybook canceled.

Name Link
🔨 Latest commit 8fe21d1
🔍 Latest deploy log https://app.netlify.com/sites/authentik-storybook/deploys/6752a2aeda13bf0008cb57b8

@codecov
Copy link

codecov bot commented Dec 6, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 4 lines in your changes missing coverage. Please review.

Project coverage is 92.67%. Comparing base (242546e) to head (8fe21d1).
Report is 8 commits behind head on main.

Files with missing lines Patch % Lines
authentik/brands/middleware.py 50.00% 2 Missing ⚠️
authentik/core/middleware.py 50.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #12283      +/-   ##
==========================================
- Coverage   92.71%   92.67%   -0.04%     
==========================================
  Files         762      762              
  Lines       38152    38156       +4     
==========================================
- Hits        35372    35362      -10     
- Misses       2780     2794      +14     
Flag Coverage Δ
e2e 49.09% <50.00%> (-0.08%) ⬇️
integration 24.76% <0.00%> (-0.01%) ⬇️
unit 90.21% <50.00%> (-0.02%) ⬇️

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 98c4344 into goauthentik:main Dec 6, 2024
kensternberg-authentik added a commit that referenced this pull request Dec 9, 2024
[Merge note: The two strings that were manually updated translate to, according to Google Translate:
"Evaluate the policies once the stage is presented to the user." (note the past tense)
"Evaluate the policies when the level is visible to the user." (note the ambiguous tense)

* main: (226 commits)
  website/docs: add page about the Cobalt pentest (#12249)
  core: bump aws-cdk-lib from 2.171.1 to 2.172.0 (#12296)
  website: bump aws-cdk from 2.171.1 to 2.172.0 in /website (#12295)
  core: bump sentry-sdk from 2.19.1 to 2.19.2 (#12297)
  core: bump coverage from 7.6.8 to 7.6.9 (#12299)
  core, web: update translations (#12290)
  root: fix override locale only if it is not empty (#12283)
  translate: Updates for file web/xliff/en.xlf in fr (#12276)
  core: bump twilio from 9.3.7 to 9.3.8 (#12282)
  website: bump path-to-regexp and express in /website (#12279)
  core: bump sentry-sdk from 2.19.0 to 2.19.1 (#12280)
  core: bump ruff from 0.8.1 to 0.8.2 (#12281)
  website/docs: fix lint (#12287)
  website/integrations: netbird: fix redirect URI regex (#12284)
  web: simplify `?inline` handler for Storybook (#12246)
  website/docs: Update Traefik middleware example to reflect latest version of Traefik (#12267)
  website/docs: add . in https://netbird.company* (#12166)
  core: bump goauthentik.io/api/v3 from 3.2024104.1 to 3.2024104.2 (#12263)
  core: bump pydantic from 2.10.2 to 2.10.3 (#12262)
  core: bump github.com/getsentry/sentry-go from 0.29.1 to 0.30.0 (#12264)
  ...
kensternberg-authentik added a commit that referenced this pull request Dec 10, 2024
* main: (93 commits)
  flows: better test stage's challenge responses (#12316)
  enterprise/stages/authenticator_endpoint_gdtc: don't set frame options globally (#12311)
  stages/identification: fix invalid challenge warning when no captcha stage is set (#12312)
  website/docs: prepare 2024.10.5 release notes (#12309)
  website: bump nanoid from 3.3.7 to 3.3.8 in /website (#12307)
  flows: silent authz flow (#12213)
  root:  use healthcheck in depends_on for postgres and redis (#12301)
  ci: ensure mark jobs always run and reflect correct status (#12288)
  enterprise: allow deletion/modification of users when in read-only mode (#12289)
  web/flows: resize captcha iframes (#12260)
  website/docs: add page about the Cobalt pentest (#12249)
  core: bump aws-cdk-lib from 2.171.1 to 2.172.0 (#12296)
  website: bump aws-cdk from 2.171.1 to 2.172.0 in /website (#12295)
  core: bump sentry-sdk from 2.19.1 to 2.19.2 (#12297)
  core: bump coverage from 7.6.8 to 7.6.9 (#12299)
  core, web: update translations (#12290)
  root: fix override locale only if it is not empty (#12283)
  translate: Updates for file web/xliff/en.xlf in fr (#12276)
  core: bump twilio from 9.3.7 to 9.3.8 (#12282)
  website: bump path-to-regexp and express in /website (#12279)
  ...

Integration of the change from jwksSources -> (jwtFederatedSources, jwtFederatedProviders) by
hand, and necessitated an update of Wdio to 9.4.

All tests passing (thank Gnu).
kensternberg-authentik added a commit that referenced this pull request Jan 8, 2025
* main:
  website/docs: add page about the Cobalt pentest (#12249)
  core: bump aws-cdk-lib from 2.171.1 to 2.172.0 (#12296)
  website: bump aws-cdk from 2.171.1 to 2.172.0 in /website (#12295)
  core: bump sentry-sdk from 2.19.1 to 2.19.2 (#12297)
  core: bump coverage from 7.6.8 to 7.6.9 (#12299)
  core, web: update translations (#12290)
  root: fix override locale only if it is not empty (#12283)
  translate: Updates for file web/xliff/en.xlf in fr (#12276)
  core: bump twilio from 9.3.7 to 9.3.8 (#12282)
  website: bump path-to-regexp and express in /website (#12279)
  core: bump sentry-sdk from 2.19.0 to 2.19.1 (#12280)
  core: bump ruff from 0.8.1 to 0.8.2 (#12281)
  website/docs: fix lint (#12287)
  website/integrations: netbird: fix redirect URI regex (#12284)
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