diff --git a/authentik/core/templates/base/skeleton.html b/authentik/core/templates/base/skeleton.html index 89cc7a4c9e..f6bbec300b 100644 --- a/authentik/core/templates/base/skeleton.html +++ b/authentik/core/templates/base/skeleton.html @@ -12,7 +12,7 @@ - {# Darkreader breaks the site regardless of theme as its not compatible with webcomponents, and we default to a dark theme based on preferred colour-scheme #} + {# Darkreader breaks the site regardless of theme as its not compatible with webcomponents, and we default to a dark theme based on preferred color-scheme #} {% block title %}{% trans title|default:brand.branding_title %}{% endblock %} diff --git a/authentik/flows/views/executor.py b/authentik/flows/views/executor.py index 0b2ebdefdb..2aa4779b1f 100644 --- a/authentik/flows/views/executor.py +++ b/authentik/flows/views/executor.py @@ -196,7 +196,7 @@ class FlowExecutorView(APIView): return self.handle_invalid_flow(exc) except EmptyFlowException as exc: self._logger.warning("f(exec): Flow is empty", exc=exc) - # To match behaviour with loading an empty flow plan from cache, + # To match behavior with loading an empty flow plan from cache, # we don't show an error message here, but rather call _flow_done() return self._flow_done() # We don't save the Plan after getting the next stage diff --git a/authentik/lib/avatars.py b/authentik/lib/avatars.py index 735ef99626..74851d6eaf 100644 --- a/authentik/lib/avatars.py +++ b/authentik/lib/avatars.py @@ -59,7 +59,7 @@ def avatar_mode_gravatar(user: User, mode: str) -> str | None: def generate_colors(text: str) -> tuple[str, str]: - """Generate colours based on `text`""" + """Generate colors based on `text`""" color = ( int(md5(text.lower().encode("utf-8"), usedforsecurity=False).hexdigest(), 16) % 0xFFFFFF ) # nosec diff --git a/authentik/providers/ldap/api.py b/authentik/providers/ldap/api.py index 228a2b729e..5bcff04bc4 100644 --- a/authentik/providers/ldap/api.py +++ b/authentik/providers/ldap/api.py @@ -91,7 +91,7 @@ class LDAPOutpostConfigSerializer(ModelSerializer): unbind_flow_slug = SerializerMethodField() def get_application_slug(self, instance: LDAPProvider) -> str: - """Prioritise backchannel slug over direct application slug""" + """Prioritize backchannel slug over direct application slug""" if instance.backchannel_application: return instance.backchannel_application.slug return instance.application.slug diff --git a/authentik/rbac/permissions.py b/authentik/rbac/permissions.py index e86f9897a2..2e1cb905e2 100644 --- a/authentik/rbac/permissions.py +++ b/authentik/rbac/permissions.py @@ -22,7 +22,7 @@ class ObjectPermissions(DjangoObjectPermissions): lookup = getattr(view, "lookup_url_kwarg", None) or getattr(view, "lookup_field", None) if lookup and lookup in view.kwargs: return True - # Legacy behaviour: + # Legacy behavior: # Allow creation of objects even without explicit permission queryset = self._queryset(view) required_perms = self.get_required_permissions(request.method, queryset.model) diff --git a/authentik/sources/oauth/types/github.py b/authentik/sources/oauth/types/github.py index 92b32fdb12..3c951f7925 100644 --- a/authentik/sources/oauth/types/github.py +++ b/authentik/sources/oauth/types/github.py @@ -76,7 +76,7 @@ class GitHubType(SourceType): chosen_email = info.get("email") if not chosen_email: # The GitHub Userprofile API only returns an email address if the profile - # has a public email address set (despite us asking for user:email, this behaviour + # has a public email address set (despite us asking for user:email, this behavior # doesn't change.). So we fetch all the user's email addresses emails = client.get_github_emails(token) for email in emails: diff --git a/authentik/stages/authenticator/models.py b/authentik/stages/authenticator/models.py index 428623f4f0..ef4f4b34b0 100644 --- a/authentik/stages/authenticator/models.py +++ b/authentik/stages/authenticator/models.py @@ -291,7 +291,7 @@ class VerifyNotAllowed: class ThrottlingMixin(models.Model): """ - Mixin class for models that want throttling behaviour. + Mixin class for models that want throttling behavior. This implements exponential back-off for verifying tokens. Subclasses must implement :meth:`get_throttle_factor`, and must use the diff --git a/authentik/stages/authenticator_sms/tests.py b/authentik/stages/authenticator_sms/tests.py index b7c944e31f..15d2c7e4a6 100644 --- a/authentik/stages/authenticator_sms/tests.py +++ b/authentik/stages/authenticator_sms/tests.py @@ -362,7 +362,7 @@ class AuthenticatorSMSStageTests(FlowTestCase): class TestSMSDeviceThrottling(ThrottlingTestMixin, TestCase): - """Test ThrottlingMixin behaviour on SMSDevice.verify_token""" + """Test ThrottlingMixin behavior on SMSDevice.verify_token""" def setUp(self): super().setUp() diff --git a/authentik/stages/invitation/stage.py b/authentik/stages/invitation/stage.py index 451840bd3a..fc1bf082ef 100644 --- a/authentik/stages/invitation/stage.py +++ b/authentik/stages/invitation/stage.py @@ -18,7 +18,7 @@ PLAN_CONTEXT_INVITATION = "invitation" class InvitationStageView(StageView): - """Finalise Authentication flow by logging the user in""" + """Finalize Authentication flow by logging the user in""" def get_token(self) -> str | None: """Get token from saved get-arguments or prompt_data""" diff --git a/authentik/stages/user_delete/stage.py b/authentik/stages/user_delete/stage.py index 3ea73f1268..5feb96c422 100644 --- a/authentik/stages/user_delete/stage.py +++ b/authentik/stages/user_delete/stage.py @@ -10,7 +10,7 @@ from authentik.flows.stage import StageView class UserDeleteStageView(StageView): - """Finalise unenrollment flow by deleting the user object.""" + """Finalize unenrollment flow by deleting the user object.""" def dispatch(self, request: HttpRequest) -> HttpResponse: """Delete currently pending user""" diff --git a/authentik/stages/user_login/stage.py b/authentik/stages/user_login/stage.py index f379bbc594..4fa7b6dc72 100644 --- a/authentik/stages/user_login/stage.py +++ b/authentik/stages/user_login/stage.py @@ -50,7 +50,7 @@ class UserLoginChallengeResponse(ChallengeResponse): class UserLoginStageView(ChallengeStageView): - """Finalise Authentication flow by logging the user in""" + """Finalize Authentication flow by logging the user in""" response_class = UserLoginChallengeResponse diff --git a/authentik/stages/user_write/stage.py b/authentik/stages/user_write/stage.py index c21a85cf5f..04d718a6b0 100644 --- a/authentik/stages/user_write/stage.py +++ b/authentik/stages/user_write/stage.py @@ -30,7 +30,7 @@ PLAN_CONTEXT_USER_PATH = "user_path" class UserWriteStageView(StageView): - """Finalise Enrollment flow by creating a user object.""" + """Finalize Enrollment flow by creating a user object.""" def __init__(self, executor: FlowExecutorView, **kwargs): super().__init__(executor, **kwargs) diff --git a/internal/outpost/ak/api.go b/internal/outpost/ak/api.go index 083fd66c9c..fd3aed15a2 100644 --- a/internal/outpost/ak/api.go +++ b/internal/outpost/ak/api.go @@ -55,7 +55,7 @@ type APIController struct { instanceUUID uuid.UUID } -// NewAPIController initialise new API Controller instance from URL and API token +// NewAPIController initialize new API Controller instance from URL and API token func NewAPIController(akURL url.URL, token string) *APIController { rsp := sentry.StartSpan(context.Background(), "authentik.outposts.init") log := log.WithField("logger", "authentik.outpost.ak-api-controller") diff --git a/internal/outpost/ak/global.go b/internal/outpost/ak/global.go index 0e211c412d..e3d7dcfae7 100644 --- a/internal/outpost/ak/global.go +++ b/internal/outpost/ak/global.go @@ -60,7 +60,7 @@ func doGlobalSetup(outpost api.Outpost, globalConfig *api.Config) { }, }) if err != nil { - l.WithField("env", globalConfig.ErrorReporting.Environment).WithError(err).Warning("Failed to initialise sentry") + l.WithField("env", globalConfig.ErrorReporting.Environment).WithError(err).Warning("Failed to initialize sentry") } } } diff --git a/internal/outpost/ldap/bind/direct/direct.go b/internal/outpost/ldap/bind/direct/direct.go index e678df4bba..1e2022c649 100644 --- a/internal/outpost/ldap/bind/direct/direct.go +++ b/internal/outpost/ldap/bind/direct/direct.go @@ -24,7 +24,7 @@ func NewDirectBinder(si server.LDAPServerInstance) *DirectBinder { si: si, log: log.WithField("logger", "authentik.outpost.ldap.binder.direct"), } - db.log.Info("initialised direct binder") + db.log.Info("initialized direct binder") return db } diff --git a/internal/outpost/ldap/bind/memory/memory.go b/internal/outpost/ldap/bind/memory/memory.go index ef8b691d2b..8a8208d3ed 100644 --- a/internal/outpost/ldap/bind/memory/memory.go +++ b/internal/outpost/ldap/bind/memory/memory.go @@ -32,14 +32,14 @@ func NewSessionBinder(si server.LDAPServerInstance, oldBinder bind.Binder) *Sess if oldSb, ok := oldBinder.(*SessionBinder); ok { sb.DirectBinder = oldSb.DirectBinder sb.sessions = oldSb.sessions - sb.log.Debug("re-initialised session binder") + sb.log.Debug("re-initialized session binder") return sb } } sb.sessions = ttlcache.New(ttlcache.WithDisableTouchOnHit[Credentials, ldap.LDAPResultCode]()) sb.DirectBinder = *direct.NewDirectBinder(si) go sb.sessions.Start() - sb.log.Debug("initialised session binder") + sb.log.Debug("initialized session binder") return sb } diff --git a/internal/outpost/ldap/search/memory/memory.go b/internal/outpost/ldap/search/memory/memory.go index 7d46a66d9f..ee57fd9c7f 100644 --- a/internal/outpost/ldap/search/memory/memory.go +++ b/internal/outpost/ldap/search/memory/memory.go @@ -42,12 +42,12 @@ func NewMemorySearcher(si server.LDAPServerInstance, existing search.Searcher) * if ems, ok := existing.(*MemorySearcher); ok { ems.si = si ems.fetch() - ems.log.Debug("re-initialised memory searcher") + ems.log.Debug("re-initialized memory searcher") return ems } } ms.fetch() - ms.log.Debug("initialised memory searcher") + ms.log.Debug("initialized memory searcher") return ms } diff --git a/packages/ak-common/src/arbiter.rs b/packages/ak-common/src/arbiter.rs index 1e92e20dcf..9f4c0a4d6c 100644 --- a/packages/ak-common/src/arbiter.rs +++ b/packages/ak-common/src/arbiter.rs @@ -210,7 +210,7 @@ impl Arbiter { /// Consumers listening on this must also listen on [`Arbiter::graceful_shutdown`], as only one /// of those is set upon shutdown. /// - /// It is also possible to use [`Arbiter::shutdown`] when the behaviour is the same between a + /// It is also possible to use [`Arbiter::shutdown`] when the behavior is the same between a /// fast and a graceful shutdown. pub fn fast_shutdown(&self) -> WaitForCancellationFuture<'_> { self.fast_shutdown.cancelled() @@ -221,7 +221,7 @@ impl Arbiter { /// Consumers listening on this must also listen on [`Arbiter::fast_shutdown`], as only one /// of those is set upon shutdown. /// - /// It is also possible to use [`Arbiter::shutdown`] when the behaviour is the same between a + /// It is also possible to use [`Arbiter::shutdown`] when the behavior is the same between a /// fast and a graceful shutdown. pub fn graceful_shutdown(&self) -> WaitForCancellationFuture<'_> { self.graceful_shutdown.cancelled() diff --git a/packages/client-go/model_ldap_outpost_config.go b/packages/client-go/model_ldap_outpost_config.go index 5999a1d89c..73eee24804 100644 --- a/packages/client-go/model_ldap_outpost_config.go +++ b/packages/client-go/model_ldap_outpost_config.go @@ -28,7 +28,7 @@ type LDAPOutpostConfig struct { BindFlowSlug string `json:"bind_flow_slug"` // Get slug for unbind flow, defaulting to brand's default flow. UnbindFlowSlug NullableString `json:"unbind_flow_slug"` - // Prioritise backchannel slug over direct application slug + // Prioritize backchannel slug over direct application slug ApplicationSlug string `json:"application_slug"` Certificate NullableString `json:"certificate,omitempty"` TlsServerName *string `json:"tls_server_name,omitempty"` diff --git a/packages/client-rust/src/models/ldap_outpost_config.rs b/packages/client-rust/src/models/ldap_outpost_config.rs index cae97c78c7..b97e9f96ca 100644 --- a/packages/client-rust/src/models/ldap_outpost_config.rs +++ b/packages/client-rust/src/models/ldap_outpost_config.rs @@ -25,7 +25,7 @@ pub struct LdapOutpostConfig { /// Get slug for unbind flow, defaulting to brand's default flow. #[serde(rename = "unbind_flow_slug", deserialize_with = "Option::deserialize")] pub unbind_flow_slug: Option, - /// Prioritise backchannel slug over direct application slug + /// Prioritize backchannel slug over direct application slug #[serde(rename = "application_slug")] pub application_slug: String, #[serde( diff --git a/packages/client-ts/src/models/LDAPOutpostConfig.ts b/packages/client-ts/src/models/LDAPOutpostConfig.ts index 0ca156ee92..3cb967deeb 100644 --- a/packages/client-ts/src/models/LDAPOutpostConfig.ts +++ b/packages/client-ts/src/models/LDAPOutpostConfig.ts @@ -52,7 +52,7 @@ export interface LDAPOutpostConfig { */ readonly unbindFlowSlug: string | null; /** - * Prioritise backchannel slug over direct application slug + * Prioritize backchannel slug over direct application slug * @type {string} * @memberof LDAPOutpostConfig */ diff --git a/schema.yml b/schema.yml index e024c64ea8..37e0cf251f 100644 --- a/schema.yml +++ b/schema.yml @@ -41922,7 +41922,7 @@ components: readOnly: true application_slug: type: string - description: Prioritise backchannel slug over direct application slug + description: Prioritize backchannel slug over direct application slug readOnly: true certificate: type: string