From a0f607b5acdf37c34260a30eab424dd272b897f0 Mon Sep 17 00:00:00 2001 From: Jens L Date: Tue, 3 Oct 2023 14:10:10 +0200 Subject: [PATCH] web/flows: bottom-align about text on flows page (#7051) * web/flows: bottom-align about text on flows page Signed-off-by: Jens Langhammer * fix a bunch of typos Signed-off-by: Jens Langhammer --------- Signed-off-by: Jens Langhammer --- authentik/lib/expression/evaluator.py | 2 +- authentik/outposts/models.py | 2 +- authentik/sources/oauth/types/okta.py | 2 +- authentik/sources/oauth/types/twitter.py | 2 +- .../0004_authenticatorsmsstage_verify_only_and_more.py | 2 +- authentik/stages/authenticator_sms/models.py | 2 +- blueprints/schema.json | 2 +- cmd/server/server.go | 2 +- lifecycle/gunicorn.conf.py | 6 +++--- locale/en/LC_MESSAGES/django.po | 2 +- locale/fr/LC_MESSAGES/django.po | 6 +++--- locale/nl/LC_MESSAGES/django.po | 6 +++--- locale/zh-Hans/LC_MESSAGES/django.po | 6 +++--- locale/zh_CN/LC_MESSAGES/django.po | 6 +++--- schema.yml | 6 +++--- web/src/admin/providers/proxy/ProxyProviderForm.ts | 2 +- web/src/common/styles/authentik.css | 2 +- .../item.md | 2 +- website/developer-docs/blueprints/v1/structure.md | 2 +- website/developer-docs/docs/templates/index.md | 2 +- website/docs/releases/2021/v2021.8.md | 2 +- website/docs/releases/2022/v2022.9.md | 2 +- .../integrations/services/github-enterprise-cloud/index.md | 2 +- website/integrations/services/github-organization/index.md | 2 +- website/integrations/services/organizr/index.md | 2 +- website/integrations/services/proftpd/index.md | 2 +- 26 files changed, 38 insertions(+), 38 deletions(-) diff --git a/authentik/lib/expression/evaluator.py b/authentik/lib/expression/evaluator.py index 7163dbf74..22c6532da 100644 --- a/authentik/lib/expression/evaluator.py +++ b/authentik/lib/expression/evaluator.py @@ -141,7 +141,7 @@ class BaseEvaluator: """Create event with supplied data and try to extract as much relevant data from the context""" context = self._context.copy() - # If the result was a complex variable, we don't want to re-use it + # If the result was a complex variable, we don't want to reuse it context.pop("result", None) context.pop("handler", None) event_kwargs = context diff --git a/authentik/outposts/models.py b/authentik/outposts/models.py index 20ffa10a0..3caae7e73 100644 --- a/authentik/outposts/models.py +++ b/authentik/outposts/models.py @@ -380,7 +380,7 @@ class Outpost(SerializerModel, ManagedModel): managed=managed, ) except IntegrityError: - # Integrity error happens mostly when managed is re-used + # Integrity error happens mostly when managed is reused Token.objects.filter(managed=managed).delete() Token.objects.filter(identifier=self.token_identifier).delete() return self.token diff --git a/authentik/sources/oauth/types/okta.py b/authentik/sources/oauth/types/okta.py index c1aa3880a..8a305bce7 100644 --- a/authentik/sources/oauth/types/okta.py +++ b/authentik/sources/oauth/types/okta.py @@ -21,7 +21,7 @@ class OktaOAuth2Callback(OAuthCallback): """Okta OAuth2 Callback""" # Okta has the same quirk as azure and throws an error if the access token - # is set via query parameter, so we re-use the azure client + # is set via query parameter, so we reuse the azure client # see https://github.com/goauthentik/authentik/issues/1910 client_class = UserprofileHeaderAuthClient diff --git a/authentik/sources/oauth/types/twitter.py b/authentik/sources/oauth/types/twitter.py index da1d306da..dc9909adb 100644 --- a/authentik/sources/oauth/types/twitter.py +++ b/authentik/sources/oauth/types/twitter.py @@ -16,7 +16,7 @@ class TwitterClient(UserprofileHeaderAuthClient): the access token endpoint for some reason.""" # Twitter has the same quirk as azure and throws an error if the access token - # is set via query parameter, so we re-use the azure client + # is set via query parameter, so we reuse the azure client # see https://github.com/goauthentik/authentik/issues/1910 def get_access_token(self, **request_kwargs) -> Optional[dict[str, Any]]: diff --git a/authentik/stages/authenticator_sms/migrations/0004_authenticatorsmsstage_verify_only_and_more.py b/authentik/stages/authenticator_sms/migrations/0004_authenticatorsmsstage_verify_only_and_more.py index fd4af87cd..233765044 100644 --- a/authentik/stages/authenticator_sms/migrations/0004_authenticatorsmsstage_verify_only_and_more.py +++ b/authentik/stages/authenticator_sms/migrations/0004_authenticatorsmsstage_verify_only_and_more.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): help_text=( "When enabled, the Phone number is only used during enrollment to verify the" " users authenticity. Only a hash of the phone number is saved to ensure it is" - " not re-used in the future." + " not reused in the future." ), ), ), diff --git a/authentik/stages/authenticator_sms/models.py b/authentik/stages/authenticator_sms/models.py index 7a9658964..042cbd698 100644 --- a/authentik/stages/authenticator_sms/models.py +++ b/authentik/stages/authenticator_sms/models.py @@ -56,7 +56,7 @@ class AuthenticatorSMSStage(ConfigurableStage, FriendlyNamedStage, Stage): help_text=_( "When enabled, the Phone number is only used during enrollment to verify the " "users authenticity. Only a hash of the phone number is saved to ensure it is " - "not re-used in the future." + "not reused in the future." ), ) diff --git a/blueprints/schema.json b/blueprints/schema.json index 2ddec653d..7f7757a28 100644 --- a/blueprints/schema.json +++ b/blueprints/schema.json @@ -5884,7 +5884,7 @@ "verify_only": { "type": "boolean", "title": "Verify only", - "description": "When enabled, the Phone number is only used during enrollment to verify the users authenticity. Only a hash of the phone number is saved to ensure it is not re-used in the future." + "description": "When enabled, the Phone number is only used during enrollment to verify the users authenticity. Only a hash of the phone number is saved to ensure it is not reused in the future." }, "mapping": { "type": "integer", diff --git a/cmd/server/server.go b/cmd/server/server.go index 8e3c3f28b..f12629190 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -96,7 +96,7 @@ func attemptProxyStart(ws *web.WebServer, u *url.URL) { continue } // Init tenant_tls here too since it requires an API Client, - // so we just re-use the same one as the outpost uses + // so we just reuse the same one as the outpost uses tw := tenant_tls.NewWatcher(ac.Client) go tw.Start() ws.TenantTLS = tw diff --git a/lifecycle/gunicorn.conf.py b/lifecycle/gunicorn.conf.py index b26e23fb0..2ae3d8ca8 100644 --- a/lifecycle/gunicorn.conf.py +++ b/lifecycle/gunicorn.conf.py @@ -65,7 +65,7 @@ def worker_exit(server: "Arbiter", worker: DjangoUvicornWorker): def on_starting(server: "Arbiter"): - """Attach a set of IDs that can be temporarily re-used. + """Attach a set of IDs that can be temporarily reused. Used on reloads when each worker exists twice.""" server._worker_id_overload = set() @@ -79,7 +79,7 @@ def nworkers_changed(server: "Arbiter", new_value, old_value): def _next_worker_id(server: "Arbiter"): - """If there are IDs open for re-use, take one. Else look for a free one.""" + """If there are IDs open for reuse, take one. Else look for a free one.""" if server._worker_id_overload: return server._worker_id_overload.pop() @@ -90,7 +90,7 @@ def _next_worker_id(server: "Arbiter"): def on_reload(server: "Arbiter"): - """Add a full set of ids into overload so it can be re-used once.""" + """Add a full set of ids into overload so it can be reused once.""" server._worker_id_overload = set(range(1, server.cfg.workers + 1)) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index b3f311e51..597f17cc9 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -1857,7 +1857,7 @@ msgstr "" msgid "" "When enabled, the Phone number is only used during enrollment to verify the " "users authenticity. Only a hash of the phone number is saved to ensure it is " -"not re-used in the future." +"not reused in the future." msgstr "" #: authentik/stages/authenticator_sms/models.py:68 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index a9ea8f75d..06b76119d 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Bastien Germond, 2022 # Phorcys, 2022 @@ -12,7 +12,7 @@ # Kyllian Delaye-Maillot, 2023 # Manuel Viens, 2023 # Marc Schmitt, 2023 -# +# #, fuzzy msgid "" msgstr "" @@ -2074,7 +2074,7 @@ msgstr "Appareils Duo" msgid "" "When enabled, the Phone number is only used during enrollment to verify the " "users authenticity. Only a hash of the phone number is saved to ensure it is" -" not re-used in the future." +" not reused in the future." msgstr "" "Si activé, le numéro de téléphone n'est utilisé que durant l'inscription " "pour vérifier l'authenticité de l'utilisateur. Seul un hachage du numéro de " diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index d4bdf371a..4047b1c06 100644 --- a/locale/nl/LC_MESSAGES/django.po +++ b/locale/nl/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Dany Sluijk, 2022 # Alex Kruidenberg , 2022 # Melvin Snijders , 2023 # Michel Heusschen, 2023 # ServusNL, 2023 -# +# #, fuzzy msgid "" msgstr "" @@ -2057,7 +2057,7 @@ msgstr "Duo-apparaten" msgid "" "When enabled, the Phone number is only used during enrollment to verify the " "users authenticity. Only a hash of the phone number is saved to ensure it is" -" not re-used in the future." +" not reused in the future." msgstr "" "Indien ingeschakeld, wordt het telefoonnummer alleen gebruikt tijdens " "inschrijving om de authenticiteit van de gebruiker te verifiëren. Alleen een" diff --git a/locale/zh-Hans/LC_MESSAGES/django.po b/locale/zh-Hans/LC_MESSAGES/django.po index 65ef83e07..3985e4664 100644 --- a/locale/zh-Hans/LC_MESSAGES/django.po +++ b/locale/zh-Hans/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Chen Zhikai, 2022 # 刘松, 2022 # Jens L. , 2023 # deluxghost, 2023 -# +# #, fuzzy msgid "" msgstr "" @@ -1893,7 +1893,7 @@ msgstr "Duo 设备" msgid "" "When enabled, the Phone number is only used during enrollment to verify the " "users authenticity. Only a hash of the phone number is saved to ensure it is" -" not re-used in the future." +" not reused in the future." msgstr "启用时，电话号码仅在注册期间用于验证用户的真实性。仅保存电话号码的哈希，以确保将来不会重复使用。" #: authentik/stages/authenticator_sms/models.py:68 diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 2aeca0eda..43bfab52c 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Chen Zhikai, 2022 # 刘松, 2022 # Jens L. , 2023 # deluxghost, 2023 -# +# #, fuzzy msgid "" msgstr "" @@ -1893,7 +1893,7 @@ msgstr "Duo 设备" msgid "" "When enabled, the Phone number is only used during enrollment to verify the " "users authenticity. Only a hash of the phone number is saved to ensure it is" -" not re-used in the future." +" not reused in the future." msgstr "启用时，电话号码仅在注册期间用于验证用户的真实性。仅保存电话号码的哈希，以确保将来不会重复使用。" #: authentik/stages/authenticator_sms/models.py:68 diff --git a/schema.yml b/schema.yml index 616397b3e..5b682a7ff 100644 --- a/schema.yml +++ b/schema.yml @@ -27436,7 +27436,7 @@ components: type: boolean description: When enabled, the Phone number is only used during enrollment to verify the users authenticity. Only a hash of the phone number is saved - to ensure it is not re-used in the future. + to ensure it is not reused in the future. mapping: type: string format: uuid @@ -27493,7 +27493,7 @@ components: type: boolean description: When enabled, the Phone number is only used during enrollment to verify the users authenticity. Only a hash of the phone number is saved - to ensure it is not re-used in the future. + to ensure it is not reused in the future. mapping: type: string format: uuid @@ -34530,7 +34530,7 @@ components: type: boolean description: When enabled, the Phone number is only used during enrollment to verify the users authenticity. Only a hash of the phone number is saved - to ensure it is not re-used in the future. + to ensure it is not reused in the future. mapping: type: string format: uuid diff --git a/web/src/admin/providers/proxy/ProxyProviderForm.ts b/web/src/admin/providers/proxy/ProxyProviderForm.ts index 89bbc61af..891731e77 100644 --- a/web/src/admin/providers/proxy/ProxyProviderForm.ts +++ b/web/src/admin/providers/proxy/ProxyProviderForm.ts @@ -202,7 +202,7 @@ export class ProxyProviderFormPage extends ModelForm { case ProxyMode.ForwardSingle: return html`

${msg( - "Use this provider with nginx's auth_request or traefik's forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a manged outpost, this is done for you).", + "Use this provider with nginx's auth_request or traefik's forwardAuth. Each application/domain needs its own provider. Additionally, on each domain, /outpost.goauthentik.io must be routed to the outpost (when using a managed outpost, this is done for you).", )}

form > input { .pf-c-login__footer { flex-grow: 2; display: flex; - justify-content: start; + justify-content: end; flex-direction: column; } .pf-c-login__footer ul.pf-c-list.pf-m-inline { diff --git a/website/blog/2023-03-16-authentik-on-django-500-slower-to-run-but-200-faster-to-build/item.md b/website/blog/2023-03-16-authentik-on-django-500-slower-to-run-but-200-faster-to-build/item.md index 45e0814b9..06ecc03fc 100644 --- a/website/blog/2023-03-16-authentik-on-django-500-slower-to-run-but-200-faster-to-build/item.md +++ b/website/blog/2023-03-16-authentik-on-django-500-slower-to-run-but-200-faster-to-build/item.md @@ -155,7 +155,7 @@ According to the Microsoft team [contributing to Python](https://devblogs.micros I know migration isn’t fun but when you’re making tradeoffs, it’s worth keeping it in mind as a future option. If the choice is to build now and migrate later instead of never building at all, I’m going to choose migration every time. -If we start running into truly significant performance issues – and I emphasize _if_ – we can always migrate critical parts of the application to a different language. This will of course be fully transparent to anyone running authentik, and I’d like to think of it as a last-resort, if we’ve already done all the opitmization possible. +If we start running into truly significant performance issues – and I emphasize _if_ – we can always migrate critical parts of the application to a different language. This will of course be fully transparent to anyone running authentik, and I’d like to think of it as a last-resort, if we’ve already done all the optimization possible. ### Architect your application well diff --git a/website/developer-docs/blueprints/v1/structure.md b/website/developer-docs/blueprints/v1/structure.md index c05a0a9a7..ee2f3e74b 100644 --- a/website/developer-docs/blueprints/v1/structure.md +++ b/website/developer-docs/blueprints/v1/structure.md @@ -37,7 +37,7 @@ entries: # delete the object state: present # An optional list of boolean-like conditions. If all conditions match (or - # no condiitons are provided) the entry will be evaluated and acted upon + # no conditions are provided) the entry will be evaluated and acted upon # as normal. Otherwise, the entry is skipped as if not defined at all. # Each condition will be evaluated in Python to its boolean representation # bool(). Furthermore, complex conditions can be built using diff --git a/website/developer-docs/docs/templates/index.md b/website/developer-docs/docs/templates/index.md index 661e3d87f..97dcfec5b 100644 --- a/website/developer-docs/docs/templates/index.md +++ b/website/developer-docs/docs/templates/index.md @@ -2,7 +2,7 @@ title: "Templates" --- -In technical docuemntation, there are document "types" (similar to how there are data types). +In technical documentation, there are document "types" (similar to how there are data types). The most common types are: diff --git a/website/docs/releases/2021/v2021.8.md b/website/docs/releases/2021/v2021.8.md index f2663276e..6885ce930 100644 --- a/website/docs/releases/2021/v2021.8.md +++ b/website/docs/releases/2021/v2021.8.md @@ -43,7 +43,7 @@ slug: "/releases/2021.8" - core: add new token intent and auth backend (#1284) - core: add token tests for invalid intent and token auth - core: fix token intent not defaulting correctly -- core: handle error when ?for_user is not numberical +- core: handle error when ?for_user is not numerical - lib: move id and key generators to lib (#1286) - lifecycle: rename to ak - outpost: handle non-existent permission diff --git a/website/docs/releases/2022/v2022.9.md b/website/docs/releases/2022/v2022.9.md index bb538f941..ba9c6bd9a 100644 --- a/website/docs/releases/2022/v2022.9.md +++ b/website/docs/releases/2022/v2022.9.md @@ -244,7 +244,7 @@ Changed response : **200 OK** - providers/oauth2: add x5c (#3556) - providers/proxy: fix routing based on signature in traefik and caddy - root: make redis persistent in docker-compose -- root: re-use custom log helper from config and cleanup duplicate functions +- root: reuse custom log helper from config and cleanup duplicate functions - root: shorten outpost docker healthcheck intervals - sources/ldap: start_tls before binding but without reading server info - sources/oauth: use GitHub's dedicated email API when no public email address is configured diff --git a/website/integrations/services/github-enterprise-cloud/index.md b/website/integrations/services/github-enterprise-cloud/index.md index 972968f82..bb8bb52d4 100644 --- a/website/integrations/services/github-enterprise-cloud/index.md +++ b/website/integrations/services/github-enterprise-cloud/index.md @@ -48,6 +48,6 @@ On this page: ![Screenshot showing populated GitHub enterprise SAML settings](ghec_saml_settings.png) -Once these fields are populated, you can use the `Test SAML configuation` button to test the authentication flow. If the flow completes successfully, you will see a green tick next to the Test button. +Once these fields are populated, you can use the `Test SAML configuration` button to test the authentication flow. If the flow completes successfully, you will see a green tick next to the Test button. Scroll down to hit the `Save` button below. diff --git a/website/integrations/services/github-organization/index.md b/website/integrations/services/github-organization/index.md index edaf83c39..3dee1f00d 100644 --- a/website/integrations/services/github-organization/index.md +++ b/website/integrations/services/github-organization/index.md @@ -42,7 +42,7 @@ On this page: - For `Public certificate`, paste the _full_ signing certificate into this field. - Verify that the `Signature method` and `Digest method` match your SAML provider settings in authentik. -Once these fields are populated, you can use the `Test SAML configuation` button to test the authentication flow. If the flow completes successfully, you will see a green tick next to the Test button. +Once these fields are populated, you can use the `Test SAML configuration` button to test the authentication flow. If the flow completes successfully, you will see a green tick next to the Test button. Scroll down to hit the `Save` button below. diff --git a/website/integrations/services/organizr/index.md b/website/integrations/services/organizr/index.md index 5b93dcf5a..6e94f2110 100644 --- a/website/integrations/services/organizr/index.md +++ b/website/integrations/services/organizr/index.md @@ -19,7 +19,7 @@ The following placeholders will be used: - `organizr.company` is the FQDN of the Service install. - `authentik.company` is the FQDN of the authentik install. -Create a new user account _(or re-use an existing)_ for organizr to use for LDAP bind under _Directory_ -> _Users_ -> _Create_, in this example called `ldapservice`. +Create a new user account _(or reuse an existing)_ for organizr to use for LDAP bind under _Directory_ -> _Users_ -> _Create_, in this example called `ldapservice`. Note the DN of this user will be `cn=ldapservice,ou=users,dc=ldap,dc=goauthentik,dc=io` diff --git a/website/integrations/services/proftpd/index.md b/website/integrations/services/proftpd/index.md index 1030d37cf..63bb10a04 100644 --- a/website/integrations/services/proftpd/index.md +++ b/website/integrations/services/proftpd/index.md @@ -22,7 +22,7 @@ The following placeholders will be used: ### Step 1 - Service account -Create a new user account _(or re-use an existing one)_ for ProFTPD to use for LDAP bind under _Directory_ -> _Users_ -> _Create_ and give the account a name, such as `ldapservice`. +Create a new user account _(or reuse an existing one)_ for ProFTPD to use for LDAP bind under _Directory_ -> _Users_ -> _Create_ and give the account a name, such as `ldapservice`. :::note On default provider settings, the DN of this user will be `cn=ldapservice,ou=users,dc=ldap,dc=goauthentik,dc=io`